From 96d6fbd2666c26eaf52792d57cc682d8a798817f Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 23 May 2023 11:21:29 +0200 Subject: [PATCH 1/5] Fixes #2148 --- CHANGELOG.md | 58 +++++++++++++++++++++++++---- api/include/opentelemetry/version.h | 4 +- docs/public/conf.py | 2 +- 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef8e82facd..1e409b02ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,17 +15,61 @@ Increment the: ## [Unreleased] -* [SDK] SDK support for the new OTel log - [#2123](https://github.com/open-telemetry/opentelemetry-cpp/pull/2123) +## [1.9.1] 2023-05-23 + +* [DEPRECATION] Drop C++11 support + [#2146](https://github.com/open-telemetry/opentelemetry-cpp/pull/2146) + +* [CI] Upgrade Bazel and Bazelisk version + [#2118](https://github.com/open-telemetry/opentelemetry-cpp/pull/2118) +* [CI] Upgrade Google Benchmark version from 1.6.0 to 1.7.1 + [#2116](https://github.com/open-telemetry/opentelemetry-cpp/pull/2116) +* [CI] Upgrade Nlohmann JSON library version from 3.10.5 to 3.11.2 + [#2115](https://github.com/open-telemetry/opentelemetry-cpp/pull/2115) + +* [BUILD] Missed include + [#2143](https://github.com/open-telemetry/opentelemetry-cpp/pull/2143) +* [BUILD] Add opentelemetry_proto_grpc and allow build shared + opentelemetry_proto and opentelemetry_proto_grpc on non-Windows platform. + [#2097](https://github.com/open-telemetry/opentelemetry-cpp/pull/2097) +* [BUILD] Warning cleanup, single character wrapped by std::string + [#2137](https://github.com/open-telemetry/opentelemetry-cpp/pull/2137) +* [BUILD] Add missing target dependencies + [#2128](https://github.com/open-telemetry/opentelemetry-cpp/pull/2128) +* [BUILD] Fix if JSON library already added another CMake target + [#2126](https://github.com/open-telemetry/opentelemetry-cpp/pull/2126) +* [BUILD] shared libraries with version suffix, along with the symbolic link + [#2109](https://github.com/open-telemetry/opentelemetry-cpp/pull/2109) +* [BUILD] Show warning message if WITH_OTLP is enabled + [#2112](https://github.com/open-telemetry/opentelemetry-cpp/pull/2112) +* [BUILD] Add missing STL header. + [#2107](https://github.com/open-telemetry/opentelemetry-cpp/pull/2107) * [BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown [#2102](https://github.com/open-telemetry/opentelemetry-cpp/pull/2102) -* [BUILD] Add opentelemetry_proto_grpc and allow build shared opentelemetry_proto - and opentelemetry_proto_grpc on non-Windows platform. - [#2097](https://github.com/open-telemetry/opentelemetry-cpp/pull/2097) + +* [TEST] Add unit test for log body implicit conversions. + [#2136](https://github.com/open-telemetry/opentelemetry-cpp/pull/2136) +* [TEST] Add event id to logger benchmark method + [#2133](https://github.com/open-telemetry/opentelemetry-cpp/pull/2133) + +* [API] Fix inclusion header files and use forward declaration + [#2124](https://github.com/open-telemetry/opentelemetry-cpp/pull/2124) * [API] Add user facing Logging API and Benchmarks [#2094](https://github.com/open-telemetry/opentelemetry-cpp/pull/2094) -* [DEPRECATION] Drop C++11 support - [#2146](https://github.com/open-telemetry/opentelemetry-cpp/pull/2146) + +* [SDK] SDK support for the new OTel log + [#2123](https://github.com/open-telemetry/opentelemetry-cpp/pull/2123) + +* [EXPORTER] Fixed HTTP session cleanup on shutdown + [#2111](https://github.com/open-telemetry/opentelemetry-cpp/pull/2111) + +* [EXPORTER] Delegate all API calls of gRPC into + opentelemetry_exporter_otlp_grpc_client, + and make it contains all symbols needed. + [#2005](https://github.com/open-telemetry/opentelemetry-cpp/pull/2005) + +* [DOC] Add Marc as maintainer. + [#2027](https://github.com/open-telemetry/opentelemetry-cpp/pull/2027) Breaking changes: diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index be7b677d85..2178591728 100644 --- a/api/include/opentelemetry/version.h +++ b/api/include/opentelemetry/version.h @@ -7,10 +7,10 @@ #include "opentelemetry/detail/preprocessor.h" #define OPENTELEMETRY_ABI_VERSION_NO 1 -#define OPENTELEMETRY_VERSION "1.9.0" +#define OPENTELEMETRY_VERSION "1.9.1" #define OPENTELEMETRY_VERSION_MAJOR 1 #define OPENTELEMETRY_VERSION_MINOR 9 -#define OPENTELEMETRY_VERSION_PATCH 0 +#define OPENTELEMETRY_VERSION_PATCH 1 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO) diff --git a/docs/public/conf.py b/docs/public/conf.py index 5a1390fe99..53ec43b82a 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.9.0" +release = "1.9.1" # Run sphinx on subprojects and copy output # ----------------------------------------- From 5cc1e6d6cf266ca21eafca1a64c832a697905b57 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 23 May 2023 11:34:01 +0200 Subject: [PATCH 2/5] Update SDK version. --- sdk/src/version/version.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index cd28813491..ff1a1d1ead 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -13,16 +13,16 @@ namespace version { const int major_version = 1; const int minor_version = 9; -const int patch_version = 0; +const int patch_version = 1; const char *pre_release = "NONE"; const char *build_metadata = "NONE"; -const int count_new_commits = 26; -const char *branch = "pre_release_1.9.0"; -const char *commit_hash = "a9876353337d5de74323b8935479618c9b422d09"; -const char *short_version = "1.9.0"; +const int count_new_commits = 0; +const char *branch = "make_release_1.9.1"; +const char *commit_hash = "96d6fbd2666c26eaf52792d57cc682d8a798817f"; +const char *short_version = "1.9.1"; const char *full_version = - "1.9.0-NONE-NONE-26-pre_release_1.9.0-a9876353337d5de74323b8935479618c9b422d09"; -const char *build_date = "Wed 12 Apr 2023 03:32:28 PM UTC"; + "1.9.1-NONE-NONE-0-make_release_1.9.1-96d6fbd2666c26eaf52792d57cc682d8a798817f"; +const char *build_date = "Tue 23 May 2023 09:29:31 AM UTC"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE From cec884c7524f33f46f5e766cb19ce1af8a68f369 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 23 May 2023 11:49:52 +0200 Subject: [PATCH 3/5] Fixed SDK version in header file. --- sdk/include/opentelemetry/sdk/version/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h index 570d575c81..758805b19c 100644 --- a/sdk/include/opentelemetry/sdk/version/version.h +++ b/sdk/include/opentelemetry/sdk/version/version.h @@ -5,7 +5,7 @@ #include "opentelemetry/detail/preprocessor.h" -#define OPENTELEMETRY_SDK_VERSION "1.9.0" +#define OPENTELEMETRY_SDK_VERSION "1.9.1" #include "opentelemetry/version.h" From 6c79a88727bbb8294b7bebd9893ef34288c9ef43 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 23 May 2023 15:50:37 +0200 Subject: [PATCH 4/5] Adjust count_new_commits / commit_hash --- sdk/src/version/version.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index ff1a1d1ead..a9d3812610 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -16,12 +16,12 @@ const int minor_version = 9; const int patch_version = 1; const char *pre_release = "NONE"; const char *build_metadata = "NONE"; -const int count_new_commits = 0; +const int count_new_commits = 21; const char *branch = "make_release_1.9.1"; -const char *commit_hash = "96d6fbd2666c26eaf52792d57cc682d8a798817f"; +const char *commit_hash = "61e8741a70cde8f273b3de49a772f05a12566e80"; const char *short_version = "1.9.1"; const char *full_version = - "1.9.1-NONE-NONE-0-make_release_1.9.1-96d6fbd2666c26eaf52792d57cc682d8a798817f"; + "1.9.1-NONE-NONE-21-make_release_1.9.1-61e8741a70cde8f273b3de49a772f05a12566e80"; const char *build_date = "Tue 23 May 2023 09:29:31 AM UTC"; } // namespace version } // namespace sdk From bbb4f482b12bdf2608532b9d41c568a81002c76a Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Fri, 26 May 2023 09:16:08 +0200 Subject: [PATCH 5/5] Adjust after merge from main: - release date - changelog --- CHANGELOG.md | 5 +++-- sdk/src/version/version.cc | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e409b02ab..a58e5ad3ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ Increment the: ## [Unreleased] -## [1.9.1] 2023-05-23 +## [1.9.1] 2023-05-26 * [DEPRECATION] Drop C++11 support [#2146](https://github.com/open-telemetry/opentelemetry-cpp/pull/2146) @@ -46,6 +46,8 @@ Increment the: [#2107](https://github.com/open-telemetry/opentelemetry-cpp/pull/2107) * [BUILD] Build break with old curl, macro CURL_VERSION_BITS unknown [#2102](https://github.com/open-telemetry/opentelemetry-cpp/pull/2102) +* [BUILD] Transitive dependency issue with the otlp http exporter + [#2154](https://github.com/open-telemetry/opentelemetry-cpp/pull/2154) * [TEST] Add unit test for log body implicit conversions. [#2136](https://github.com/open-telemetry/opentelemetry-cpp/pull/2136) @@ -62,7 +64,6 @@ Increment the: * [EXPORTER] Fixed HTTP session cleanup on shutdown [#2111](https://github.com/open-telemetry/opentelemetry-cpp/pull/2111) - * [EXPORTER] Delegate all API calls of gRPC into opentelemetry_exporter_otlp_grpc_client, and make it contains all symbols needed. diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index a9d3812610..6dfc299814 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -16,13 +16,13 @@ const int minor_version = 9; const int patch_version = 1; const char *pre_release = "NONE"; const char *build_metadata = "NONE"; -const int count_new_commits = 21; +const int count_new_commits = 22; const char *branch = "make_release_1.9.1"; -const char *commit_hash = "61e8741a70cde8f273b3de49a772f05a12566e80"; +const char *commit_hash = "5592180d539b59c4e8293bc927f5a6431fcbacdf"; const char *short_version = "1.9.1"; const char *full_version = - "1.9.1-NONE-NONE-21-make_release_1.9.1-61e8741a70cde8f273b3de49a772f05a12566e80"; -const char *build_date = "Tue 23 May 2023 09:29:31 AM UTC"; + "1.9.1-NONE-NONE-22-make_release_1.9.1-5592180d539b59c4e8293bc927f5a6431fcbacdf"; +const char *build_date = "Fri 26 May 2023 07:14:07 AM UTC"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE