Skip to content

Commit 4116df7

Browse files
malkiamalkia
committed
Bumped version, upgraded from upstream
2 parents 09f288e + dc58584 commit 4116df7

File tree

13 files changed

+334
-55
lines changed

13 files changed

+334
-55
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
# The branches below must be a subset of the branches above
8+
branches: [main]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
CodeQL-Build:
15+
permissions:
16+
actions: read # for github/codeql-action/init to get workflow details
17+
contents: read # for actions/checkout to fetch code
18+
security-events: write # for github/codeql-action/autobuild to send a status report
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Harden the runner (Audit all outbound calls)
22+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
23+
with:
24+
egress-policy: audit
25+
26+
- name: Checkout repository
27+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
with:
29+
submodules: 'recursive'
30+
- name: Remove Third_party Modules from Code Scan
31+
run: |
32+
rm -rf third_party
33+
- name: Setup
34+
env:
35+
CC: /usr/bin/gcc-12
36+
CXX: /usr/bin/g++-12
37+
run: |
38+
sudo -E ./ci/setup_ci_environment.sh
39+
- name: Initialize CodeQL
40+
uses: github/codeql-action/init@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
41+
with:
42+
languages: cpp
43+
- name: Autobuild
44+
uses: github/codeql-action/autobuild@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
45+
- name: Perform CodeQL Analysis
46+
uses: github/codeql-action/analyze@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: OSSF Scorecard
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
schedule:
8+
- cron: "56 23 * * 6" # once a week
9+
workflow_dispatch:
10+
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
# Needed for Code scanning upload
18+
security-events: write
19+
# Needed for GitHub OIDC token if publish_results is true
20+
id-token: write
21+
steps:
22+
- name: Harden the runner (Audit all outbound calls)
23+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
24+
with:
25+
egress-policy: audit
26+
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
with:
29+
persist-credentials: false
30+
31+
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
32+
with:
33+
results_file: results.sarif
34+
results_format: sarif
35+
publish_results: true
36+
37+
# Upload the results as artifacts (optional). Commenting out will disable
38+
# uploads of run results in SARIF format to the repository Actions tab.
39+
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
40+
- name: "Upload artifact"
41+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
42+
with:
43+
name: SARIF file
44+
path: results.sarif
45+
retention-days: 5
46+
47+
# Upload the results to GitHub's code scanning dashboard (optional).
48+
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
49+
- name: "Upload to code-scanning"
50+
uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4
51+
with:
52+
sarif_file: results.sarif

‎BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ otel_cc_library(
4747
)
4848

4949
# TODO: Version needs to be updated better here.
50-
otel_sdk_prefix = "otel_sdk/" + "1.23.0" + "/"
50+
otel_sdk_prefix = "otel_sdk/" + "1.24.0" + "/"
5151

5252
# Build configuration settings mimicking MSVC: debug=dbg, release=opt, reldeb=fastbuild
5353
config_setting(

‎CHANGELOG.md‎

Lines changed: 183 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,32 @@ Increment the:
1515

1616
## [Unreleased]
1717

18+
* [TEST] Remove workaround for metrics cardinality limit test
19+
[#3663](https://github.com/open-telemetry/opentelemetry-cpp/pull/3663)
20+
21+
## [1.23 2025-09-25]
22+
23+
* [CodeHealth] Fix clang-tidy warnings part 6
24+
[#3507](https://github.com/open-telemetry/opentelemetry-cpp/pull/3507)
25+
26+
* [CMAKE] Add CMake scripts to find or fetch curl and find zlib
27+
[#3526](https://github.com/open-telemetry/opentelemetry-cpp/pull/3526)
28+
29+
* [REMOVAL] remove unused ci bash scripts
30+
[#3541](https://github.com/open-telemetry/opentelemetry-cpp/pull/3541)
31+
32+
* Bump step-security/harden-runner from 2.12.2 to 2.13.0
33+
[#3542](https://github.com/open-telemetry/opentelemetry-cpp/pull/3542)
34+
35+
* [SDK] Ensure TraceId is portable on big-endian architectures
36+
[#3543](https://github.com/open-telemetry/opentelemetry-cpp/pull/3543)
37+
1838
* [TEST] Shared otel-cpp libs linked to latest static protobuf and grpc
1939
[#3544](https://github.com/open-telemetry/opentelemetry-cpp/pull/3544)
2040

41+
* [CONFIGURATION] File configuration - component registry
42+
[#3537](https://github.com/open-telemetry/opentelemetry-cpp/pull/3537)
43+
2144
* [SDK] Implement env var configuration for PeriodicExportingMetricReader
2245
[#3549](https://github.com/open-telemetry/opentelemetry-cpp/pull/3549)
2346

@@ -27,15 +50,174 @@ Increment the:
2750
* [SDK] Implements options for the ParentBasedSampler with default values
2851
[#3553](https://github.com/open-telemetry/opentelemetry-cpp/pull/3553)
2952

53+
* Bump github/codeql-action from 3.29.2 to 3.29.3
54+
[#3556](https://github.com/open-telemetry/opentelemetry-cpp/pull/3556)
55+
56+
* [CMAKE] Add CMake scripts to find or fetch protobuf and grpc
57+
[#3533](https://github.com/open-telemetry/opentelemetry-cpp/pull/3533)
58+
59+
* [CONFIGURATION] File configuration - sdk builder
60+
[#3550](https://github.com/open-telemetry/opentelemetry-cpp/pull/3550)
61+
62+
* Bump github/codeql-action from 3.29.3 to 3.29.4
63+
[#3558](https://github.com/open-telemetry/opentelemetry-cpp/pull/3558)
64+
65+
* [CONFIGURATION] File configuration - spec version 1.0.0-rc1
66+
[#3557](https://github.com/open-telemetry/opentelemetry-cpp/pull/3557)
67+
68+
* [CONFIGURATION] File configuration - sdk resource
69+
[#3567](https://github.com/open-telemetry/opentelemetry-cpp/pull/3567)
70+
71+
* [CONFIGURATION] File configuration - ostream exporter builders
72+
[#3563](https://github.com/open-telemetry/opentelemetry-cpp/pull/3563)
73+
74+
* [CONFIGURATION] File configuration - prometheus exporter builder
75+
[#3564](https://github.com/open-telemetry/opentelemetry-cpp/pull/3564)
76+
77+
* [CONFIGURATION] File configuration - zipkin exporter builder
78+
[#3565](https://github.com/open-telemetry/opentelemetry-cpp/pull/3565)
79+
80+
* [CONFIGURATION] File configuration - otlp exporter builders
81+
[#3566](https://github.com/open-telemetry/opentelemetry-cpp/pull/3566)
82+
83+
* [CMAKE] Don't set iwyu and clang-tidy properties on nlohmann_json with cmake <3.19
84+
[#3568](https://github.com/open-telemetry/opentelemetry-cpp/pull/3568)
85+
3086
* [SDK] View should not have a unit
3187
[#3552](https://github.com/open-telemetry/opentelemetry-cpp/pull/3552)
3288

89+
* [EXPORTER] Fixes tsan warnings
90+
[#3531](https://github.com/open-telemetry/opentelemetry-cpp/pull/3531)
91+
92+
* [DOC] Document minimum required versions
93+
[#3562](https://github.com/open-telemetry/opentelemetry-cpp/pull/3562)
94+
95+
* Bump github/codeql-action from 3.29.4 to 3.29.5
96+
[#3574](https://github.com/open-telemetry/opentelemetry-cpp/pull/3574)
97+
98+
* Add subscript to issue templates
99+
[#3576](https://github.com/open-telemetry/opentelemetry-cpp/pull/3576)
100+
101+
* [CONFIGURATION] File configuration - configuration example
102+
[#3573](https://github.com/open-telemetry/opentelemetry-cpp/pull/3573)
103+
104+
* Bump actions/download-artifact from 4.3.0 to 5.0.0
105+
[#3578](https://github.com/open-telemetry/opentelemetry-cpp/pull/3578)
106+
107+
* Bump actions/cache from 4.2.3 to 4.2.4
108+
[#3580](https://github.com/open-telemetry/opentelemetry-cpp/pull/3580)
109+
110+
* [SDK] Implementation of container resource as per semconv
111+
[#3572](https://github.com/open-telemetry/opentelemetry-cpp/pull/3572)
112+
113+
* Bump github/codeql-action from 3.29.7 to 3.29.8
114+
[#3584](https://github.com/open-telemetry/opentelemetry-cpp/pull/3584)
115+
116+
* [CI] update do_ci scripts to use common cmake cache scripts
117+
[#3582](https://github.com/open-telemetry/opentelemetry-cpp/pull/3582)
118+
119+
* Bump actions/checkout from 4.2.2 to 5.0.0
120+
[#3587](https://github.com/open-telemetry/opentelemetry-cpp/pull/3587)
121+
122+
* Bump github/codeql-action from 3.29.8 to 3.29.9
123+
[#3589](https://github.com/open-telemetry/opentelemetry-cpp/pull/3589)
124+
125+
* [BUILD] Remove duplicated deprecated warnings in logs headers
126+
[#3592](https://github.com/open-telemetry/opentelemetry-cpp/pull/3592)
127+
128+
* Bump github/codeql-action from 3.29.9 to 3.29.10
129+
[#3595](https://github.com/open-telemetry/opentelemetry-cpp/pull/3595)
130+
131+
* [resource_detectors] implementation of process resource detector as per semconv
132+
[#3591](https://github.com/open-telemetry/opentelemetry-cpp/pull/3591)
133+
134+
* Bump codecov/codecov-action from 5.4.3 to 5.5.0
135+
[#3597](https://github.com/open-telemetry/opentelemetry-cpp/pull/3597)
136+
137+
* Bump github/codeql-action from 3.29.10 to 3.29.11
138+
[#3602](https://github.com/open-telemetry/opentelemetry-cpp/pull/3602)
139+
140+
* [BAZEL] Drop rules_foreign_cc as a dependency
141+
[#3601](https://github.com/open-telemetry/opentelemetry-cpp/pull/3601)
142+
143+
* [BUILD] Remove cmake support for thrift as Jaeger was removed
144+
[#3604](https://github.com/open-telemetry/opentelemetry-cpp/pull/3604)
145+
146+
* [CMAKE] upgrade cmake minimum version to 3.16
147+
[#3599](https://github.com/open-telemetry/opentelemetry-cpp/pull/3599)
148+
149+
* [CMAKE] Set the project version through the cmake project macro
150+
[#3605](https://github.com/open-telemetry/opentelemetry-cpp/pull/3605)
151+
152+
* [CONFIGURATION] File configuration - functional tests
153+
[#3606](https://github.com/open-telemetry/opentelemetry-cpp/pull/3606)
154+
155+
* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.37.0
156+
[#3615](https://github.com/open-telemetry/opentelemetry-cpp/pull/3615)
157+
33158
* [BUILD] Use -dev versions in main branch
34159
[#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609)
35160

36-
* [SDK] Implementing configurable aggregation cardinality limit
161+
* [BAZEL] Fix version warnings in MODULE.bazel
162+
[#3617](https://github.com/open-telemetry/opentelemetry-cpp/pull/3617)
163+
164+
* [Copilot] Add instructions for OpenTelemetry C++
165+
[#3614](https://github.com/open-telemetry/opentelemetry-cpp/pull/3614)
166+
167+
* [MAINTAINER] Maintain version numbers with tbump
168+
[#3616](https://github.com/open-telemetry/opentelemetry-cpp/pull/3616)
169+
170+
* Bump github/codeql-action from 3.29.11 to 3.30.0
171+
[#3621](https://github.com/open-telemetry/opentelemetry-cpp/pull/3621)
172+
173+
* Bump benchmark-action/github-action-benchmark from 1.20.4 to 1.20.5
174+
[#3623](https://github.com/open-telemetry/opentelemetry-cpp/pull/3623)
175+
176+
* [BUILD] Cleanup cppcheck warnings
177+
[#3619](https://github.com/open-telemetry/opentelemetry-cpp/pull/3619)
178+
179+
* Bump actions/stale from 9.1.0 to 10.0.0
180+
[#3626](https://github.com/open-telemetry/opentelemetry-cpp/pull/3626)
181+
182+
* Bump actions/github-script from 7.0.1 to 8.0.0
183+
[#3627](https://github.com/open-telemetry/opentelemetry-cpp/pull/3627)
184+
185+
* Bump codecov/codecov-action from 5.5.0 to 5.5.1
186+
[#3625](https://github.com/open-telemetry/opentelemetry-cpp/pull/3625)
187+
188+
* [resource_detectors] implementation of remaining process attributes
189+
[#3603](https://github.com/open-telemetry/opentelemetry-cpp/pull/3603)
190+
191+
* Bump benchmark-action/github-action-benchmark from 1.20.5 to 1.20.7
192+
[#3631](https://github.com/open-telemetry/opentelemetry-cpp/pull/3631)
193+
194+
* Bump github/codeql-action from 3.30.0 to 3.30.1
195+
[#3630](https://github.com/open-telemetry/opentelemetry-cpp/pull/3630)
196+
197+
* Bump github/codeql-action from 3.30.1 to 3.30.2
198+
[#3637](https://github.com/open-telemetry/opentelemetry-cpp/pull/3637)
199+
200+
* Bump step-security/harden-runner from 2.13.0 to 2.13.1
201+
[#3636](https://github.com/open-telemetry/opentelemetry-cpp/pull/3636)
202+
203+
* Bump github/codeql-action from 3.30.2 to 3.30.3
204+
[#3639](https://github.com/open-telemetry/opentelemetry-cpp/pull/3639)
205+
206+
* [Metrics] New Attribute Processor for Exclude list
207+
[#3633](https://github.com/open-telemetry/opentelemetry-cpp/pull/3633)
208+
209+
* Implementing configurable aggregation cardinality limit
37210
[#3624](https://github.com/open-telemetry/opentelemetry-cpp/pull/3624)
38211

212+
* [CMAKE] Fix CMake 4.x build error on MacOS runner and when building opentracing
213+
[#3649](https://github.com/open-telemetry/opentelemetry-cpp/pull/3649)
214+
215+
* [SDK] custom hash and equality for attribute processor
216+
[#3643](https://github.com/open-telemetry/opentelemetry-cpp/pull/3643)
217+
218+
* Bump actions/cache from 4.2.4 to 4.3.0
219+
[#3658](https://github.com/open-telemetry/opentelemetry-cpp/pull/3658)
220+
39221
* [SDK] Fix copying overflow attributes in metric AttributesHashMap
40222
[#3651](https://github.com/open-telemetry/opentelemetry-cpp/pull/3651)
41223

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
1515
cmake_policy(SET CMP0117 NEW)
1616
endif()
1717

18-
set(OPENTELEMETRY_VERSION_NUMBER "1.23.0")
18+
set(OPENTELEMETRY_VERSION_NUMBER "1.24.0")
1919
set(OPENTELEMETRY_VERSION_SUFFIX "-dev")
2020
set(OPENTELEMETRY_VERSION
2121
"${OPENTELEMETRY_VERSION_NUMBER}${OPENTELEMETRY_VERSION_SUFFIX}")

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "otel_sdk",
3-
version = "1.23.0-dev",
3+
version = "1.24.0-dev",
44
compatibility_level = 0,
55
)
66

‎api/include/opentelemetry/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# define OPENTELEMETRY_ABI_VERSION_NO 1
1111
#endif
1212

13-
#define OPENTELEMETRY_VERSION "1.23.0-dev"
13+
#define OPENTELEMETRY_VERSION "1.24.0-dev"
1414
#define OPENTELEMETRY_VERSION_MAJOR 1
15-
#define OPENTELEMETRY_VERSION_MINOR 23
15+
#define OPENTELEMETRY_VERSION_MINOR 24
1616
#define OPENTELEMETRY_VERSION_PATCH 0
1717

1818
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)

‎functional/configuration/shelltests/kitchen-sink.test‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SDK CREATED
1919
severity_text : DEBUG
2020
body : body
2121
resource :
22-
telemetry.sdk.version: 1.22.0
22+
telemetry.sdk.version: 1.24.0-dev
2323
service.version: 1.0.0
2424
double_array_key: [1.1,2.2]
2525
double_key: 1.1

0 commit comments

Comments
 (0)