diff --git a/CHANGELOG.md b/CHANGELOG.md index 416ee21a81..3b79f94cba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,11 +30,22 @@ Increment the: * [SDK] View should not have a unit [#3552](https://github.com/open-telemetry/opentelemetry-cpp/pull/3552) +* [BUILD] Use -dev versions in main branch + [#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609) + Important changes: * [CMAKE] Upgrade CMake minimum version to 3.16 [#3599](https://github.com/open-telemetry/opentelemetry-cpp/pull/3599) +* [BUILD] Use -dev versions in main branch + [#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609) + * The version number in the main branch has changed, + to better differentiate with the latest release. + * For example: + * With a latest release 1.22.0, the main branch is 1.23.0-dev + * Upon release of 1.23.0, the main branch becomes 1.24.0-dev + Breaking changes: * [SDK] View should not have a unit diff --git a/CMakeLists.txt b/CMakeLists.txt index e8ea2001af..d6203408a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,8 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0") cmake_policy(SET CMP0117 NEW) endif() -set(OPENTELEMETRY_VERSION_NUMBER "1.22.0") -set(OPENTELEMETRY_VERSION_SUFFIX "") +set(OPENTELEMETRY_VERSION_NUMBER "1.23.0") +set(OPENTELEMETRY_VERSION_SUFFIX "-dev") set(OPENTELEMETRY_VERSION "${OPENTELEMETRY_VERSION_NUMBER}${OPENTELEMETRY_VERSION_SUFFIX}") diff --git a/MODULE.bazel b/MODULE.bazel index f0597b59e0..b2c115d0bc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "opentelemetry-cpp", - version = "1.22.0", + version = "1.23.0-dev", compatibility_level = 0, repo_name = "io_opentelemetry_cpp", ) diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index ab69ca02f2..d87b7b2e4f 100644 --- a/api/include/opentelemetry/version.h +++ b/api/include/opentelemetry/version.h @@ -10,9 +10,9 @@ # define OPENTELEMETRY_ABI_VERSION_NO 1 #endif -#define OPENTELEMETRY_VERSION "1.22.0" +#define OPENTELEMETRY_VERSION "1.23.0-dev" #define OPENTELEMETRY_VERSION_MAJOR 1 -#define OPENTELEMETRY_VERSION_MINOR 22 +#define OPENTELEMETRY_VERSION_MINOR 23 #define OPENTELEMETRY_VERSION_PATCH 0 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO) diff --git a/api/test/core/version_test.cc b/api/test/core/version_test.cc index 1ceb68602b..9d9e06eb9b 100644 --- a/api/test/core/version_test.cc +++ b/api/test/core/version_test.cc @@ -3,6 +3,7 @@ #include #include +#include #include #include "opentelemetry/version.h" @@ -14,5 +15,7 @@ TEST(VersionTest, Consistency) OPENTELEMETRY_VERSION_MINOR, OPENTELEMETRY_VERSION_PATCH); std::string actual = OPENTELEMETRY_VERSION; - EXPECT_EQ(actual, expected); + /* OPENTELEMETRY_VERSION may contain a -dev suffix */ + std::string prefix = actual.substr(0, strlen(expected)); + EXPECT_EQ(prefix, expected); } diff --git a/docs/public/conf.py b/docs/public/conf.py index 0eda6e9e39..365cbe09c4 100644 --- a/docs/public/conf.py +++ b/docs/public/conf.py @@ -24,7 +24,7 @@ author = 'OpenTelemetry authors' # The full version, including alpha/beta/rc tags -release = "1.22.0" +release = "1.23.0-dev" # Run sphinx on subprojects and copy output # ----------------------------------------- diff --git a/exporters/ostream/test/ostream_log_test.cc b/exporters/ostream/test/ostream_log_test.cc index 6c7028ed16..8b8063f6d4 100644 --- a/exporters/ostream/test/ostream_log_test.cc +++ b/exporters/ostream/test/ostream_log_test.cc @@ -125,7 +125,7 @@ TEST(OstreamLogExporter, DefaultLogRecordToCout) " severity_text : INVALID\n", " body : \n", " resource : \n", - std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n", + std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n", " telemetry.sdk.name: opentelemetry\n", " telemetry.sdk.language: cpp\n", " attributes : \n", @@ -199,7 +199,7 @@ TEST(OStreamLogRecordExporter, SimpleLogToCout) " severity_text : TRACE\n" " body : Message\n", " resource : \n", - std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n", + std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n", " telemetry.sdk.name: opentelemetry\n", " telemetry.sdk.language: cpp\n", " attributes : \n", @@ -270,7 +270,7 @@ TEST(OStreamLogRecordExporter, LogWithStringAttributesToCerr) " severity_text : INVALID\n", " body : \n", " resource : \n", - std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n", + std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n", " telemetry.sdk.name: opentelemetry\n", " telemetry.sdk.language: cpp\n", " service.name: unknown_service\n", @@ -352,7 +352,7 @@ TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog) " body : \n", " resource : \n", " service.name: unknown_service\n", - std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n", + std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n", " telemetry.sdk.name: opentelemetry\n", " telemetry.sdk.language: cpp\n", " res1: [1,2,3]\n", @@ -425,7 +425,7 @@ TEST(OStreamLogRecordExporter, IntegrationTest) " severity_text : DEBUG\n", " body : Hello\n", " resource : \n", - std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n", + std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n", " service.name: unknown_service\n", " telemetry.sdk.name: opentelemetry\n", " telemetry.sdk.language: cpp\n", @@ -496,7 +496,7 @@ TEST(OStreamLogRecordExporter, IntegrationTestWithEventId) " severity_text : DEBUG\n", " body : Hello {key1} {key2}\n", " resource : \n", - std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n", + std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n", " service.name: unknown_service\n", " telemetry.sdk.name: opentelemetry\n", " telemetry.sdk.language: cpp\n", diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h index 1b31852ca2..c96ce7f3e7 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.22.0" +#define OPENTELEMETRY_SDK_VERSION "1.23.0-dev" #include "opentelemetry/version.h" diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 451f7d38ed..798b44780e 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -12,13 +12,13 @@ namespace sdk namespace version { const int major_version = 1; -const int minor_version = 22; +const int minor_version = 23; const int patch_version = 0; -const char *pre_release = "NONE"; -const char *build_metadata = "NONE"; -const char *short_version = "1.22.0"; -const char *full_version = "1.22.0-NONE-NONE"; -const char *build_date = "Fri Jul 11 08:13:24 PM UTC 2025"; +const char *pre_release = "dev"; +const char *build_metadata = "none"; +const char *short_version = "1.23.0"; +const char *full_version = "1.23.0-dev"; +const char *build_date = "MAIN BRANCH"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE