Skip to content

Commit 6540d19

Browse files
marcalffmarcalff
authored
[BUILD] Use -dev versions in main branch (open-telemetry#3609)
1 parent 096454f commit 6540d19

File tree

9 files changed

+34
-20
lines changed

9 files changed

+34
-20
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,22 @@ Increment the:
3030
* [SDK] View should not have a unit
3131
[#3552](https://github.com/open-telemetry/opentelemetry-cpp/pull/3552)
3232

33+
* [BUILD] Use -dev versions in main branch
34+
[#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609)
35+
3336
Important changes:
3437

3538
* [CMAKE] Upgrade CMake minimum version to 3.16
3639
[#3599](https://github.com/open-telemetry/opentelemetry-cpp/pull/3599)
3740

41+
* [BUILD] Use -dev versions in main branch
42+
[#3609](https://github.com/open-telemetry/opentelemetry-cpp/pull/3609)
43+
* The version number in the main branch has changed,
44+
to better differentiate with the latest release.
45+
* For example:
46+
* With a latest release 1.22.0, the main branch is 1.23.0-dev
47+
* Upon release of 1.23.0, the main branch becomes 1.24.0-dev
48+
3849
Breaking changes:
3950

4051
* [SDK] View should not have a unit

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0")
1515
cmake_policy(SET CMP0117 NEW)
1616
endif()
1717

18-
set(OPENTELEMETRY_VERSION_NUMBER "1.22.0")
19-
set(OPENTELEMETRY_VERSION_SUFFIX "")
18+
set(OPENTELEMETRY_VERSION_NUMBER "1.23.0")
19+
set(OPENTELEMETRY_VERSION_SUFFIX "-dev")
2020
set(OPENTELEMETRY_VERSION
2121
"${OPENTELEMETRY_VERSION_NUMBER}${OPENTELEMETRY_VERSION_SUFFIX}")
2222

‎MODULE.bazel‎

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

44
module(
55
name = "opentelemetry-cpp",
6-
version = "1.22.0",
6+
version = "1.23.0-dev",
77
compatibility_level = 0,
88
repo_name = "io_opentelemetry_cpp",
99
)

‎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.22.0"
13+
#define OPENTELEMETRY_VERSION "1.23.0-dev"
1414
#define OPENTELEMETRY_VERSION_MAJOR 1
15-
#define OPENTELEMETRY_VERSION_MINOR 22
15+
#define OPENTELEMETRY_VERSION_MINOR 23
1616
#define OPENTELEMETRY_VERSION_PATCH 0
1717

1818
#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)

‎api/test/core/version_test.cc‎

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

44
#include <gtest/gtest.h>
55
#include <stdio.h>
6+
#include <string.h>
67
#include <string>
78

89
#include "opentelemetry/version.h"
@@ -14,5 +15,7 @@ TEST(VersionTest, Consistency)
1415
OPENTELEMETRY_VERSION_MINOR, OPENTELEMETRY_VERSION_PATCH);
1516

1617
std::string actual = OPENTELEMETRY_VERSION;
17-
EXPECT_EQ(actual, expected);
18+
/* OPENTELEMETRY_VERSION may contain a -dev suffix */
19+
std::string prefix = actual.substr(0, strlen(expected));
20+
EXPECT_EQ(prefix, expected);
1821
}

‎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.22.0"
27+
release = "1.23.0-dev"
2828

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

‎exporters/ostream/test/ostream_log_test.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ TEST(OstreamLogExporter, DefaultLogRecordToCout)
125125
" severity_text : INVALID\n",
126126
" body : \n",
127127
" resource : \n",
128-
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n",
128+
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n",
129129
" telemetry.sdk.name: opentelemetry\n",
130130
" telemetry.sdk.language: cpp\n",
131131
" attributes : \n",
@@ -199,7 +199,7 @@ TEST(OStreamLogRecordExporter, SimpleLogToCout)
199199
" severity_text : TRACE\n"
200200
" body : Message\n",
201201
" resource : \n",
202-
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n",
202+
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n",
203203
" telemetry.sdk.name: opentelemetry\n",
204204
" telemetry.sdk.language: cpp\n",
205205
" attributes : \n",
@@ -270,7 +270,7 @@ TEST(OStreamLogRecordExporter, LogWithStringAttributesToCerr)
270270
" severity_text : INVALID\n",
271271
" body : \n",
272272
" resource : \n",
273-
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n",
273+
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n",
274274
" telemetry.sdk.name: opentelemetry\n",
275275
" telemetry.sdk.language: cpp\n",
276276
" service.name: unknown_service\n",
@@ -352,7 +352,7 @@ TEST(OStreamLogRecordExporter, LogWithVariantTypesToClog)
352352
" body : \n",
353353
" resource : \n",
354354
" service.name: unknown_service\n",
355-
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n",
355+
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n",
356356
" telemetry.sdk.name: opentelemetry\n",
357357
" telemetry.sdk.language: cpp\n",
358358
" res1: [1,2,3]\n",
@@ -425,7 +425,7 @@ TEST(OStreamLogRecordExporter, IntegrationTest)
425425
" severity_text : DEBUG\n",
426426
" body : Hello\n",
427427
" resource : \n",
428-
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n",
428+
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n",
429429
" service.name: unknown_service\n",
430430
" telemetry.sdk.name: opentelemetry\n",
431431
" telemetry.sdk.language: cpp\n",
@@ -496,7 +496,7 @@ TEST(OStreamLogRecordExporter, IntegrationTestWithEventId)
496496
" severity_text : DEBUG\n",
497497
" body : Hello {key1} {key2}\n",
498498
" resource : \n",
499-
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_VERSION + "\n",
499+
std::string{" telemetry.sdk.version: "} + OPENTELEMETRY_SDK_VERSION + "\n",
500500
" service.name: unknown_service\n",
501501
" telemetry.sdk.name: opentelemetry\n",
502502
" telemetry.sdk.language: cpp\n",

‎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.22.0"
6+
#define OPENTELEMETRY_SDK_VERSION "1.23.0-dev"
77

88
#include "opentelemetry/version.h"
99

‎sdk/src/version/version.cc‎

Lines changed: 6 additions & 6 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 = 22;
15+
const int minor_version = 23;
1616
const int patch_version = 0;
17-
const char *pre_release = "NONE";
18-
const char *build_metadata = "NONE";
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";
17+
const char *pre_release = "dev";
18+
const char *build_metadata = "none";
19+
const char *short_version = "1.23.0";
20+
const char *full_version = "1.23.0-dev";
21+
const char *build_date = "MAIN BRANCH";
2222
} // namespace version
2323
} // namespace sdk
2424
OPENTELEMETRY_END_NAMESPACE

0 commit comments

Comments
 (0)