From b52820ad1272f0f64746fd9d903e7d8375d977f7 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 20 Nov 2025 21:57:34 +0100 Subject: [PATCH 1/4] [RELEASE] Release opentelemetry-cpp 1.24.0 --- CMakeLists.txt | 2 +- MODULE.bazel | 2 +- api/include/opentelemetry/version.h | 2 +- functional/configuration/shelltests/kitchen-sink.test | 2 +- sdk/include/opentelemetry/sdk/version/version.h | 2 +- sdk/src/version/version.cc | 4 ++-- tbump.toml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1c05d9660..c682cadc17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0") endif() set(OPENTELEMETRY_VERSION_NUMBER "1.24.0") -set(OPENTELEMETRY_VERSION_SUFFIX "-dev") +set(OPENTELEMETRY_VERSION_SUFFIX "") set(OPENTELEMETRY_VERSION "${OPENTELEMETRY_VERSION_NUMBER}${OPENTELEMETRY_VERSION_SUFFIX}") diff --git a/MODULE.bazel b/MODULE.bazel index 854ec59498..5534a7cf34 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "opentelemetry-cpp", - version = "1.24.0-dev", + version = "1.24.0", compatibility_level = 0, repo_name = "io_opentelemetry_cpp", ) diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index 6a67883d92..4c901df0d8 100644 --- a/api/include/opentelemetry/version.h +++ b/api/include/opentelemetry/version.h @@ -10,7 +10,7 @@ # define OPENTELEMETRY_ABI_VERSION_NO 1 #endif -#define OPENTELEMETRY_VERSION "1.24.0-dev" +#define OPENTELEMETRY_VERSION "1.24.0" #define OPENTELEMETRY_VERSION_MAJOR 1 #define OPENTELEMETRY_VERSION_MINOR 24 #define OPENTELEMETRY_VERSION_PATCH 0 diff --git a/functional/configuration/shelltests/kitchen-sink.test b/functional/configuration/shelltests/kitchen-sink.test index 1b14dd2843..edf8ae24ce 100644 --- a/functional/configuration/shelltests/kitchen-sink.test +++ b/functional/configuration/shelltests/kitchen-sink.test @@ -20,7 +20,7 @@ SDK CREATED severity_text : DEBUG body : body resource : - telemetry.sdk.version: 1.24.0-dev + telemetry.sdk.version: 1.24.0 service.version: 1.0.0 double_array_key: [1.1,2.2] double_key: 1.1 diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h index 21ec411d4d..e52ffcfeb2 100644 --- a/sdk/include/opentelemetry/sdk/version/version.h +++ b/sdk/include/opentelemetry/sdk/version/version.h @@ -3,7 +3,7 @@ #pragma once -#define OPENTELEMETRY_SDK_VERSION "1.24.0-dev" +#define OPENTELEMETRY_SDK_VERSION "1.24.0" #include "opentelemetry/version.h" diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index df601e3818..9838720b0d 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -14,10 +14,10 @@ namespace version const int major_version = 1; const int minor_version = 24; const int patch_version = 0; -const char *pre_release = "dev"; +const char *pre_release = ""; const char *build_metadata = "none"; const char *short_version = "1.24.0"; -const char *full_version = "1.24.0-dev"; +const char *full_version = "1.24.0"; const char *build_date = "MAIN BRANCH"; } // namespace version } // namespace sdk diff --git a/tbump.toml b/tbump.toml index e7e9c47ef2..9c4096c3b8 100644 --- a/tbump.toml +++ b/tbump.toml @@ -21,7 +21,7 @@ github_url = "https://github.com/open-telemetry/opentelemetry-cpp" [version] -current = "1.24.0-dev" +current = "1.24.0" # Example of a semver regexp. # Make sure this matches current_version before From b3378cd0b21038e9dba95f9d847b525bbd665b43 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 20 Nov 2025 22:35:19 +0100 Subject: [PATCH 2/4] Changelog --- CHANGELOG.md | 154 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 150 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a10ab8c4d0..8e21104eea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,39 +15,185 @@ Increment the: ## [Unreleased] -* [METRICS] Add tag to AggregationConfig for aggregation type validation - [#3732](https://github.com/open-telemetry/opentelemetry-cpp/pull/3732) +## [1.24 2025-11-20] + +* [RELEASE] Bump main branch to 1.24-dev + [#3662](https://github.com/open-telemetry/opentelemetry-cpp/pull/3662) * [TEST] Remove workaround for metrics cardinality limit test [#3663](https://github.com/open-telemetry/opentelemetry-cpp/pull/3663) -* [METRICS] Allow registering one callback for multiple instruments - [#3667](https://github.com/open-telemetry/opentelemetry-cpp/pull/3667) +* Bump github/codeql-action from 3.30.3 to 3.30.4 + [#3664](https://github.com/open-telemetry/opentelemetry-cpp/pull/3664) + +* [CONFIGURATION] File configuration - semantic version + [#3629](https://github.com/open-telemetry/opentelemetry-cpp/pull/3629) + +* [BUILD] Fix MinGW GCC cross compilation build on Linux for Windows + [#3666](https://github.com/open-telemetry/opentelemetry-cpp/pull/3666) + +* [CONFIGURATION] File configuration - cmake build + [#3655](https://github.com/open-telemetry/opentelemetry-cpp/pull/3655) + +* [CONFIGURATION] File configuration - bazel build + [#3654](https://github.com/open-telemetry/opentelemetry-cpp/pull/3654) + +* Bump step-security/harden-runner from 2.12.2 to 2.13.1 + [#3671](https://github.com/open-telemetry/opentelemetry-cpp/pull/3671) + +* Bump github/codeql-action from 3.30.4 to 3.30.5 + [#3670](https://github.com/open-telemetry/opentelemetry-cpp/pull/3670) + +* Bump actions/checkout from 4.2.2 to 5.0.0 + [#3669](https://github.com/open-telemetry/opentelemetry-cpp/pull/3669) + +* [CMAKE] Only build and run the exemplar tests if the preview flag is set + [#3675](https://github.com/open-telemetry/opentelemetry-cpp/pull/3675) + +* [TEST] Update latest versions of protobuf, grpc, and curl for testing + [#3678](https://github.com/open-telemetry/opentelemetry-cpp/pull/3678) * [SDK] Fix typo in hashmap method GetEnteries [#3680](https://github.com/open-telemetry/opentelemetry-cpp/pull/3680) +* [TEST] add ryml to the conan files for install tests + [#3679](https://github.com/open-telemetry/opentelemetry-cpp/pull/3679) + +* [TRACE SDK] Batch span processor options now using env variables + [#3661](https://github.com/open-telemetry/opentelemetry-cpp/pull/3661) + +* Bump ossf/scorecard-action from 2.4.2 to 2.4.3 + [#3677](https://github.com/open-telemetry/opentelemetry-cpp/pull/3677) + +* [CONFIGURATION] File configuration - cmake install + [#3668](https://github.com/open-telemetry/opentelemetry-cpp/pull/3668) + +* Bump github/codeql-action from 3.30.5 to 3.30.6 + [#3683](https://github.com/open-telemetry/opentelemetry-cpp/pull/3683) + +* Bump peter-evans/create-or-update-comment from 4.0.0 to 5.0.0 + [#3682](https://github.com/open-telemetry/opentelemetry-cpp/pull/3682) + +* Bump actions/stale from 10.0.0 to 10.1.0 + [#3686](https://github.com/open-telemetry/opentelemetry-cpp/pull/3686) + +* [SDK] BatchLogRecordProcessorOptions from env variables + [#3687](https://github.com/open-telemetry/opentelemetry-cpp/pull/3687) + +* [BUILD] Upgrade third party versions to the latest + [#3685](https://github.com/open-telemetry/opentelemetry-cpp/pull/3685) + +* Bump github/codeql-action from 3.30.6 to 4.30.7 + [#3689](https://github.com/open-telemetry/opentelemetry-cpp/pull/3689) + +* Bump github/codeql-action from 4.30.7 to 4.30.8 + [#3692](https://github.com/open-telemetry/opentelemetry-cpp/pull/3692) + +* [Metrics] Allow registering one callback for multiple instruments + [#3667](https://github.com/open-telemetry/opentelemetry-cpp/pull/3667) + * [CI] Upgrade tools/vcpkg to 2025.09.17 [#3701](https://github.com/open-telemetry/opentelemetry-cpp/pull/3701) +* [CI] Upgrade to conan 2.21.0 for conanfile_latest + [#3703](https://github.com/open-telemetry/opentelemetry-cpp/pull/3703) + +* [bazel] Drop WORKSPACE support + [#3699](https://github.com/open-telemetry/opentelemetry-cpp/pull/3699) + +* Bump github/codeql-action from 4.30.8 to 4.30.9 + [#3707](https://github.com/open-telemetry/opentelemetry-cpp/pull/3707) + +* [BUILD] Add rules_cc load statements + [#3697](https://github.com/open-telemetry/opentelemetry-cpp/pull/3697) + +* [CONFIGURATION] File configuration - parser location + [#3705](https://github.com/open-telemetry/opentelemetry-cpp/pull/3705) + +* [API] Fix -Werror=alloc-size-larger-than= warning in runtime_context.h + [#3709](https://github.com/open-telemetry/opentelemetry-cpp/pull/3709) + +* Bump github/codeql-action from 4.30.9 to 4.31.0 + [#3720](https://github.com/open-telemetry/opentelemetry-cpp/pull/3720) + +* Bump actions/download-artifact from 5.0.0 to 6.0.0 + [#3719](https://github.com/open-telemetry/opentelemetry-cpp/pull/3719) + * [CONFIGURATION] File configuration - prometheus translation [#3715](https://github.com/open-telemetry/opentelemetry-cpp/pull/3715) +* [SDK] Misc cleanup in attribute_utils.h + [#3716](https://github.com/open-telemetry/opentelemetry-cpp/pull/3716) + +* [TEST] Disable test BasicCurlHttpTests.SendGetRequestAsync + [#3722](https://github.com/open-telemetry/opentelemetry-cpp/pull/3722) + +* [SDK] Add cardinality_limit to all derived classes of AggregationConfig + [#3728](https://github.com/open-telemetry/opentelemetry-cpp/pull/3728) + +* Bump github/codeql-action from 4.31.0 to 4.31.2 + [#3733](https://github.com/open-telemetry/opentelemetry-cpp/pull/3733) + * [BUILD] Upgrade to opentelemetry-proto 1.8.0 [#3730](https://github.com/open-telemetry/opentelemetry-cpp/pull/3730) +* [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.38.0 + [#3729](https://github.com/open-telemetry/opentelemetry-cpp/pull/3729) + +* [CONFIGURATION] Implement declarative configuration (config.yaml) + [#2518](https://github.com/open-telemetry/opentelemetry-cpp/pull/2518) + * [CONFIGURATION] File configuration - tls [#3726](https://github.com/open-telemetry/opentelemetry-cpp/pull/3726) * [CONFIGURATION] File configuration - console metric exporter [#3734](https://github.com/open-telemetry/opentelemetry-cpp/pull/3734) +* [DOCS] Remove out-of-date vcpkg docs + [#3735](https://github.com/open-telemetry/opentelemetry-cpp/pull/3735) + +* [DOCKER] Update docker files to build all third party dependencies from the tags file + [#3718](https://github.com/open-telemetry/opentelemetry-cpp/pull/3718) + +* Bump docker/setup-qemu-action from 3.6.0 to 3.7.0 + [#3739](https://github.com/open-telemetry/opentelemetry-cpp/pull/3739) + +* Bump step-security/harden-runner from 2.13.1 to 2.13.2 + [#3738](https://github.com/open-telemetry/opentelemetry-cpp/pull/3738) + +* [API] Make Request Context Token constructor public + [#3708](https://github.com/open-telemetry/opentelemetry-cpp/pull/3708) + +* [BUILD] Remove CMAKE POLICY CMP0092 + [#3741](https://github.com/open-telemetry/opentelemetry-cpp/pull/3741) + +* [DOCS] Fix code sample for setting CustomLogHandler + [#3736](https://github.com/open-telemetry/opentelemetry-cpp/pull/3736) + +* Bump github/codeql-action from 4.31.2 to 4.31.3 + [#3744](https://github.com/open-telemetry/opentelemetry-cpp/pull/3744) + +* [METRICS] Add tag to AggregationConfig for aggregation type validation + [#3732](https://github.com/open-telemetry/opentelemetry-cpp/pull/3732) + +* [BUILD] CMake install path with double slash + [#3747](https://github.com/open-telemetry/opentelemetry-cpp/pull/3747) + * [CI] Free disk space [#3749](https://github.com/open-telemetry/opentelemetry-cpp/pull/3749) * [SDK] Reset TraceFlags::IsSampled bit on sampler Decision::DROP [#3745](https://github.com/open-telemetry/opentelemetry-cpp/pull/3745) +* [CODE HEALTH] turn on the cppcoreguidelines-init-variables check and fix warnings + [#3751](https://github.com/open-telemetry/opentelemetry-cpp/pull/3751) + +* Bump actions/checkout from 5.0.0 to 5.0.1 + [#3753](https://github.com/open-telemetry/opentelemetry-cpp/pull/3753) + +* Bump github/codeql-action from 4.31.3 to 4.31.4 + [#3755](https://github.com/open-telemetry/opentelemetry-cpp/pull/3755) + New Features: * [CONFIGURATION] Implement declarative configuration (config.yaml) From 6e22531d219f6a5a1ca84557c337bb273f08e135 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 20 Nov 2025 22:39:28 +0100 Subject: [PATCH 3/4] cleanup --- CHANGELOG.md | 3 ++- sdk/src/version/version.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e21104eea..14d8df4acf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -152,7 +152,8 @@ Increment the: * [DOCS] Remove out-of-date vcpkg docs [#3735](https://github.com/open-telemetry/opentelemetry-cpp/pull/3735) -* [DOCKER] Update docker files to build all third party dependencies from the tags file +* [DOCKER] Update docker files to build all third party dependencies + from the tags file [#3718](https://github.com/open-telemetry/opentelemetry-cpp/pull/3718) * Bump docker/setup-qemu-action from 3.6.0 to 3.7.0 diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 9838720b0d..b66cbda267 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -18,7 +18,7 @@ const char *pre_release = ""; const char *build_metadata = "none"; const char *short_version = "1.24.0"; const char *full_version = "1.24.0"; -const char *build_date = "MAIN BRANCH"; +const char *build_date = "Thu Nov 20 09:38:52 PM UTC 2025"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE From d009b9e9da063c47b79a198b1e64079915c2135c Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Fri, 21 Nov 2025 09:08:25 +0100 Subject: [PATCH 4/4] Adjust changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14d8df4acf..254787e5aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -195,6 +195,9 @@ Increment the: * Bump github/codeql-action from 4.31.3 to 4.31.4 [#3755](https://github.com/open-telemetry/opentelemetry-cpp/pull/3755) +* Bump actions/checkout from 5.0.1 to 6.0.0 + [#3757](https://github.com/open-telemetry/opentelemetry-cpp/pull/3757) + New Features: * [CONFIGURATION] Implement declarative configuration (config.yaml)