Skip to content

Commit a125a52

Browse files
malkiamalkia
committed
merged from upstream. new version
2 parents 6848aa1 + 9ee0c27 commit a125a52

File tree

7 files changed

+156
-54
lines changed

7 files changed

+156
-54
lines changed

‎.github/repository-settings.md‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 147 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,176 @@ Increment the:
1515

1616
## [Unreleased]
1717

18-
* [TEST] Test examples in CI with CMake Part 1
18+
## [1.22 2025-07-11]
19+
20+
* [DOC] Udpate link to membership document
21+
[#3452](https://github.com/open-telemetry/opentelemetry-cpp/pull/3452)
22+
23+
* [CI] build examples with IWYU
24+
[#3450](https://github.com/open-telemetry/opentelemetry-cpp/pull/3450)
25+
26+
* Bump ossf/scorecard-action from 2.4.1 to 2.4.2
27+
[#3455](https://github.com/open-telemetry/opentelemetry-cpp/pull/3455)
28+
29+
* [SDK] Use shared_ptr internally for AttributesProcessor to prevent use-after-free
30+
[#3457](https://github.com/open-telemetry/opentelemetry-cpp/pull/3457)
31+
32+
* [CI] build iwyu
33+
[#3459](https://github.com/open-telemetry/opentelemetry-cpp/pull/3459)
34+
35+
* Bump github/codeql-action from 3.28.18 to 3.28.19
36+
[#3462](https://github.com/open-telemetry/opentelemetry-cpp/pull/3462)
37+
38+
* [DOC] Update doc comments to pass -WDocumention check
39+
[#3375](https://github.com/open-telemetry/opentelemetry-cpp/pull/3375)
40+
41+
* [TEST] test examples in CI with CMake Part 1
1942
[#3449](https://github.com/open-telemetry/opentelemetry-cpp/pull/3449)
2043

21-
* [EXPORTER] Add `credentials` option to OTLP Exporter’s gRPC Client
44+
* [BUILD] Allow compilation with CXX26
45+
[#3464](https://github.com/open-telemetry/opentelemetry-cpp/pull/3464)
46+
47+
* [SDK] Add credentials option to OTLP gRPC client
2248
[#3403](https://github.com/open-telemetry/opentelemetry-cpp/pull/3403)
2349

24-
* To enable with CMake: `-DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=ON`
25-
* To enable with Bazel: `--@io_opentelemetry_cpp//exporters/otlp:with_otlp_grpc_credential_preview=true`
50+
* [CI] Remove windows 2019
51+
[#3466](https://github.com/open-telemetry/opentelemetry-cpp/pull/3466)
2652

27-
* [BUILD] Upgrade opentelemetry-proto to 1.7.0
53+
* [CodeHealth] fix include-what-you-use, part 8
54+
[#3465](https://github.com/open-telemetry/opentelemetry-cpp/pull/3465)
55+
56+
* [BUILD] Upgrade to opentelemetry-proto 1.7.0
2857
[#3443](https://github.com/open-telemetry/opentelemetry-cpp/pull/3443)
2958

59+
* Bump github/codeql-action from 3.28.19 to 3.29.0
60+
[#3472](https://github.com/open-telemetry/opentelemetry-cpp/pull/3472)
61+
62+
* Bump step-security/harden-runner from 2.12.0 to 2.12.1
63+
[#3471](https://github.com/open-telemetry/opentelemetry-cpp/pull/3471)
64+
65+
* [SDK] BatchLogRecordProcessor::ForceFlush is not waking up bg thread
66+
[#3448](https://github.com/open-telemetry/opentelemetry-cpp/pull/3448)
67+
68+
* [CI] rely on github installed cmake for ci runners
69+
[#3482](https://github.com/open-telemetry/opentelemetry-cpp/pull/3482)
70+
71+
* [CI] Increase code coverage of iwyu and clang-tidy ci jobs
72+
[#3469](https://github.com/open-telemetry/opentelemetry-cpp/pull/3469)
73+
74+
* [REMOVAL] Remove CMake option WITH_REMOVE_METER_PREVIEW
75+
[#3476](https://github.com/open-telemetry/opentelemetry-cpp/pull/3476)
76+
3077
* [REMOVAL] Removed deprecated semantic convention header files
3178
[#3475](https://github.com/open-telemetry/opentelemetry-cpp/pull/3475)
3279

80+
* Bump docker/setup-buildx-action from 3.10.0 to 3.11.0
81+
[#3483](https://github.com/open-telemetry/opentelemetry-cpp/pull/3483)
82+
83+
* Bump docker/setup-buildx-action from 3.11.0 to 3.11.1
84+
[#3488](https://github.com/open-telemetry/opentelemetry-cpp/pull/3488)
85+
86+
* [Code Health] include-what-you-use cleanup, part 9
87+
[#3492](https://github.com/open-telemetry/opentelemetry-cpp/pull/3492)
88+
3389
* [CodeHealth] Fix clang-tidy warnings part 1
3490
[#3493](https://github.com/open-telemetry/opentelemetry-cpp/pull/3493)
3591

92+
* [CMAKE] Add thirdparty install cmake project and install bash script
93+
[#3486](https://github.com/open-telemetry/opentelemetry-cpp/pull/3486)
94+
95+
* [DOC] Update community member listings
96+
[#3499](https://github.com/open-telemetry/opentelemetry-cpp/pull/3499)
97+
3698
* [CodeHealth] Fix clang-tidy warnings part 2
3799
[#3496](https://github.com/open-telemetry/opentelemetry-cpp/pull/3496)
38100

39101
* [CodeHealth] Fix clang-tidy warnings part 3
40102
[#3498](https://github.com/open-telemetry/opentelemetry-cpp/pull/3498)
41103

42-
* [CodeHealth] Fix clang-tidy warnings part 4
104+
* [DOC] Fix outdated community membership link
105+
[#3500](https://github.com/open-telemetry/opentelemetry-cpp/pull/3500)
106+
107+
* [CONFIGURATION] File configuration - trace model
108+
[#3467](https://github.com/open-telemetry/opentelemetry-cpp/pull/3467)
109+
110+
* [CONFIGURATION] File configuration - sampler model
111+
[#3468](https://github.com/open-telemetry/opentelemetry-cpp/pull/3468)
112+
113+
* [BUILD] Fixes grpc linking for OTLP exporter's tests
114+
[#3435](https://github.com/open-telemetry/opentelemetry-cpp/pull/3435)
115+
116+
* [CONFIGURATION] File configuration - log model
117+
[#3473](https://github.com/open-telemetry/opentelemetry-cpp/pull/3473)
118+
119+
* [CONFIGURATION] File configuration - metric model
120+
[#3474](https://github.com/open-telemetry/opentelemetry-cpp/pull/3474)
121+
122+
* Bump github/codeql-action from 3.29.0 to 3.29.1
123+
[#3505](https://github.com/open-telemetry/opentelemetry-cpp/pull/3505)
124+
125+
* [EXPORTER] Add bytes support for OTLP recordables
126+
[#3495](https://github.com/open-telemetry/opentelemetry-cpp/pull/3495)
127+
128+
* [CodeHealth] Fix clang tidy warnings part 4
43129
[#3501](https://github.com/open-telemetry/opentelemetry-cpp/pull/3501)
44130

45-
* [CMAKE] Clean up googletest and benchmark dependency management
131+
* [CodeHealth] Fix clang-tidy warnings part 5
132+
[#3506](https://github.com/open-telemetry/opentelemetry-cpp/pull/3506)
133+
134+
* [CI] Add minimum token permissions for all github workflow files
135+
[#3508](https://github.com/open-telemetry/opentelemetry-cpp/pull/3508)
136+
137+
* Bump step-security/harden-runner from 2.12.1 to 2.12.2
138+
[#3509](https://github.com/open-telemetry/opentelemetry-cpp/pull/3509)
139+
140+
* Bump github/codeql-action from 3.29.1 to 3.29.2
141+
[#3510](https://github.com/open-telemetry/opentelemetry-cpp/pull/3510)
142+
143+
* [BUILD] Fixes compiling problems in NDK r27
144+
[#3517](https://github.com/open-telemetry/opentelemetry-cpp/pull/3517)
145+
146+
* [CMAKE] clean up googletest and benchmark dependency management
46147
[#3485](https://github.com/open-telemetry/opentelemetry-cpp/pull/3485)
47148

149+
* [CONFIGURATION] File configuration - extension model
150+
[#3503](https://github.com/open-telemetry/opentelemetry-cpp/pull/3503)
151+
152+
* [CONFIGURATION] File configuration - misc model
153+
[#3504](https://github.com/open-telemetry/opentelemetry-cpp/pull/3504)
154+
155+
* [CONFIGURATION] File configuration - metric aggregation model
156+
[#3502](https://github.com/open-telemetry/opentelemetry-cpp/pull/3502)
157+
158+
* [CMAKE] find or fetch nlohmann-json
159+
[#3523](https://github.com/open-telemetry/opentelemetry-cpp/pull/3523)
160+
161+
* [CMAKE] Address the vcpkg opentelemetry-cpp port CMake patches
162+
[#3518](https://github.com/open-telemetry/opentelemetry-cpp/pull/3518)
163+
164+
* [CMAKE] Add CMake script to find or fetch prometheus-cpp
165+
[#3522](https://github.com/open-telemetry/opentelemetry-cpp/pull/3522)
166+
167+
* [CMAKE] Switch opentelemetry-proto to use FetchContent
168+
[#3524](https://github.com/open-telemetry/opentelemetry-cpp/pull/3524)
169+
170+
* [CMAKE] Add CMake script to find or fetch Microsoft.GSL
171+
[#3521](https://github.com/open-telemetry/opentelemetry-cpp/pull/3521)
172+
173+
* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.36.0
174+
[#3527](https://github.com/open-telemetry/opentelemetry-cpp/pull/3527)
175+
176+
* [SDK] Fixes duration overflow
177+
[#3529](https://github.com/open-telemetry/opentelemetry-cpp/pull/3529)
178+
179+
* [CONFIGURATION] File configuration - yaml parser
180+
[#3519](https://github.com/open-telemetry/opentelemetry-cpp/pull/3519)
181+
182+
* [CONFIGURATION] File configuration - configuration parser
183+
[#3520](https://github.com/open-telemetry/opentelemetry-cpp/pull/3520)
184+
185+
* [ADMIN] Remove file .github/repository-settings.md
186+
[#3534](https://github.com/open-telemetry/opentelemetry-cpp/pull/3534)
187+
48188
Important changes:
49189

50190
* [REMOVAL] Removed deprecated semantic convention header files

‎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.21.1",
3+
version = "1.22.0",
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.21.0"
13+
#define OPENTELEMETRY_VERSION "1.22.0"
1414
#define OPENTELEMETRY_VERSION_MAJOR 1
15-
#define OPENTELEMETRY_VERSION_MINOR 21
15+
#define OPENTELEMETRY_VERSION_MINOR 22
1616
#define OPENTELEMETRY_VERSION_PATCH 0
1717

1818
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)

‎docs/public/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
author = 'OpenTelemetry authors'
2525

2626
# The full version, including alpha/beta/rc tags
27-
release = "1.21.0"
27+
release = "1.22.0"
2828

2929
# Run sphinx on subprojects and copy output
3030
# -----------------------------------------

‎sdk/include/opentelemetry/sdk/version/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#pragma once
55

6-
#define OPENTELEMETRY_SDK_VERSION "1.21.0"
6+
#define OPENTELEMETRY_SDK_VERSION "1.22.0"
77

88
#include "opentelemetry/version.h"
99

‎sdk/src/version/version.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ namespace sdk
1212
namespace version
1313
{
1414
const int major_version = 1;
15-
const int minor_version = 21;
15+
const int minor_version = 22;
1616
const int patch_version = 0;
1717
const char *pre_release = "NONE";
1818
const char *build_metadata = "NONE";
19-
const char *short_version = "1.21.0";
20-
const char *full_version = "1.21.0-NONE-NONE";
21-
const char *build_date = "Wed May 28 08:08:27 PM UTC 2025";
19+
const char *short_version = "1.22.0";
20+
const char *full_version = "1.22.0-NONE-NONE";
21+
const char *build_date = "Fri Jul 11 08:13:24 PM UTC 2025";
2222
} // namespace version
2323
} // namespace sdk
2424
OPENTELEMETRY_END_NAMESPACE

0 commit comments

Comments
 (0)