From aa700f4f85db59abb78979a2a66b5353acfeb8f3 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Mon, 6 Mar 2023 12:30:02 -0800 Subject: [PATCH 1/5] Prepare v1.8.3 release --- CHANGELOG.md | 42 +++++++++++++++---- api/include/opentelemetry/version.h | 4 +- buildscripts/pre-commit | 1 + docs/public/conf.py | 2 +- .../opentelemetry/sdk/version/version.h | 2 +- sdk/src/version/version.cc | 24 +++++------ 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e85d23935..0c2ef30332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,27 +14,55 @@ Increment the: * PATCH version when you make backwards compatible bug fixes. ## [Unreleased] + +## [1.8.3] 2023-03-06 +* Provide version major/minor/patch macros + [#2014](https://github.com/open-telemetry/opentelemetry-cpp/pull/2014) * [SDK] Rename the global SDK version variables to avoid naming clash [#2011](https://github.com/open-telemetry/opentelemetry-cpp/pull/2011) +* [BUILD] Fix typo in CMakeLists.txt + [#2010](https://github.com/open-telemetry/opentelemetry-cpp/pull/2010) +* [EXPORTER] fix Prometheus test iterator iterator increment + [#2006](https://github.com/open-telemetry/opentelemetry-cpp/pull/2006) * [SDK]Add attributes for InstrumentationScope [#2004](https://github.com/open-telemetry/opentelemetry-cpp/pull/2004) -* [ETW Exporter]Support serialize span/log attributes into JSON +* [METRICS SDK] Performance improvement in measurement processing + [#1993](https://github.com/open-telemetry/opentelemetry-cpp/pull/1993) +* [EXAMPLE] Add example for logs ostream exporter + [#1992](https://github.com/open-telemetry/opentelemetry-cpp/pull/1992) +* [ETW Exporter] Support serialize span/log attributes into JSON [#1991](https://github.com/open-telemetry/opentelemetry-cpp/pull/1991) * ETW Exporter]Do not overwrite ParentId when setting attribute on Span [#1989](https://github.com/open-telemetry/opentelemetry-cpp/pull/1989) -* Convert Prometheus Exporter to Pull MetricReader [#1953](https://github.com/open-telemetry/opentelemetry-cpp/pull/1953) -* Upgrade prometheus-cpp to v1.1.0 [#1954](https://github.com/open-telemetry/opentelemetry-cpp/pull/1954) +* Upgrade prometheus-cpp to v1.1.0 + [#1954](https://github.com/open-telemetry/opentelemetry-cpp/pull/1954) +* Convert Prometheus Exporter to Pull MetricReader + [#1953](https://github.com/open-telemetry/opentelemetry-cpp/pull/1953) +* [DOCS] Add alpine packages to INSTALL.md + [#1957](https://github.com/open-telemetry/opentelemetry-cpp/pull/1957) +* [METRICS SDK] Add benchmark tests for Sum Aggregation. + [#1948](https://github.com/open-telemetry/opentelemetry-cpp/pull/1948) * [BUILD] Build OpenTelemetry SDK and exporters into DLL [#1932](https://github.com/open-telemetry/opentelemetry-cpp/pull/1932) -* [CI] Enforce copyright check in CI [#1965](https://github.com/open-telemetry/opentelemetry-cpp/pull/1965) +* [CI] Enforce copyright check in CI + [#1965](https://github.com/open-telemetry/opentelemetry-cpp/pull/1965) +* [BUILD] Fix typo GENENV -> GETENV + [#1972](https://github.com/open-telemetry/opentelemetry-cpp/pull/1972) * [SEMANTIC CONVENTIONS] Upgrade to version 1.18.0 [#1974](https://github.com/open-telemetry/opentelemetry-cpp/pull/1974) -* Fix Prometheus server crash on listening to already used port [#1986](https://github.com/open-telemetry/opentelemetry-cpp/pull/1986) +* [EXT] Fix thread-safety when shutdown. + [#1977](https://github.com/open-telemetry/opentelemetry-cpp/pull/1977) +* [SDK] Fix missing ObservedTimestamp. + [#1985](https://github.com/open-telemetry/opentelemetry-cpp/pull/1985) +* [METRICS SDK] fix variable names + [#1987](https://github.com/open-telemetry/opentelemetry-cpp/pull/1987) +* [EXPORTER] Fix Prometheus server crash on listening to already used port + [#1986](https://github.com/open-telemetry/opentelemetry-cpp/pull/1986) * [EXPORTER] Boolean environment variables not parsed per the spec [#1982](https://github.com/open-telemetry/opentelemetry-cpp/pull/1982) -* Provide version major/minor/patch macros - [#2014](https://github.com/open-telemetry/opentelemetry-cpp/pull/2014) +* [EXPORTER] Opentracing shim + [#1909](https://github.com/open-telemetry/opentelemetry-cpp/pull/1909) ## [1.8.2] 2023-01-31 diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index 82bfa8811c..92d9b41b16 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.8.2" +#define OPENTELEMETRY_VERSION "1.8.3" #define OPENTELEMETRY_VERSION_MAJOR 1 #define OPENTELEMETRY_VERSION_MINOR 8 -#define OPENTELEMETRY_VERSION_PATCH 2 +#define OPENTELEMETRY_VERSION_PATCH 3 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO) diff --git a/buildscripts/pre-commit b/buildscripts/pre-commit index 0b2f9a92ee..c61bd034ec 100755 --- a/buildscripts/pre-commit +++ b/buildscripts/pre-commit @@ -40,6 +40,7 @@ fi branch="$(git rev-parse --abbrev-ref HEAD)" short_version="${major}.${minor}.${patch}" +echo "${short_version}" full_version="${short_version}-${pre_release}-${build_metadata}-${count_new_commits}-${branch}-${latest_commit_hash}" # Update api version.h diff --git a/docs/public/conf.py b/docs/public/conf.py index 637cdedd8d..d03873134e 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.8.2" +release = "1.8.3" # Run sphinx on subprojects and copy output # ----------------------------------------- diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h index 8ae35d6a16..5bc1982106 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.8.2" +#define OPENTELEMETRY_SDK_VERSION "1.8.3" #include "opentelemetry/version.h" diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 92ab50559c..5d4fa10746 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -11,18 +11,18 @@ namespace sdk { namespace version { -const int major_version = 1; -const int minor_version = 8; -const int patch_version = 2; -const char *pre_release = "NONE"; -const char *build_metadata = "NONE"; -const int count_new_commits = 37; -const char *branch = "pre_release_1.8.2"; -const char *commit_hash = "435ce60f233b6718aaa04bb7068dd641b536299b"; -const char *short_version = "1.8.2"; -const char *full_version = - "1.8.2-NONE-NONE-37-pre_release_1.8.2-435ce60f233b6718aaa04bb7068dd641b536299b"; -const char *build_date = "Tue 31 Jan 2023 04:01:10 PM UTC"; +const int major_version = 1; +const int minor_version = 8; +const int patch_version = 3; +const char* pre_release = "NONE"; +const char* build_metadata = "NONE"; +const int count_new_commits = 33; +const char* branch = "pre_release_1.8.3"; +const char* commit_hash = "267c28ff22c5c380eb1897f35995961223f43a72"; +const char* short_version = "1.8.3"; +const char* full_version = + "1.8.2-NONE-NONE-33-pre_release_1.8.3-267c28ff22c5c380eb1897f35995961223f43a72"; +const char* build_date = "Mon Mar 6 20:46:20 UTC 2023"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE From c2a75e0d2cbf8b73d8d7943500941d3c9f3231d1 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Mon, 6 Mar 2023 16:14:31 -0800 Subject: [PATCH 2/5] Run clang-format on version.cc and update pre-commit --- CHANGELOG.md | 2 +- buildscripts/pre-commit | 20 ++++++++++---------- sdk/src/version/version.cc | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c2ef30332..1ce014548c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ Increment the: * PATCH version when you make backwards compatible bug fixes. ## [Unreleased] - + ## [1.8.3] 2023-03-06 * Provide version major/minor/patch macros diff --git a/buildscripts/pre-commit b/buildscripts/pre-commit index c61bd034ec..e97581cb80 100755 --- a/buildscripts/pre-commit +++ b/buildscripts/pre-commit @@ -62,18 +62,18 @@ namespace sdk { namespace version { -const int major_version = ${major}; -const int minor_version = ${minor}; -const int patch_version = ${patch}; -const char* pre_release = "${pre_release}"; -const char* build_metadata = "${build_metadata}"; +const int major_version = ${major}; +const int minor_version = ${minor}; +const int patch_version = ${patch}; +const char *pre_release = "${pre_release}"; +const char *build_metadata = "${build_metadata}"; const int count_new_commits = ${count_new_commits}; -const char* branch = "${branch}"; -const char* commit_hash = "${latest_commit_hash}"; -const char* short_version = "${short_version}"; -const char* full_version = +const char *branch = "${branch}"; +const char *commit_hash = "${latest_commit_hash}"; +const char *short_version = "${short_version}"; +const char *full_version = "${full_version}"; -const char* build_date = "$(date -u)"; +const char *build_date = "$(date -u)"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 5d4fa10746..52c4a22c15 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -11,18 +11,18 @@ namespace sdk { namespace version { -const int major_version = 1; -const int minor_version = 8; -const int patch_version = 3; -const char* pre_release = "NONE"; -const char* build_metadata = "NONE"; +const int major_version = 1; +const int minor_version = 8; +const int patch_version = 3; +const char *pre_release = "NONE"; +const char *build_metadata = "NONE"; const int count_new_commits = 33; -const char* branch = "pre_release_1.8.3"; -const char* commit_hash = "267c28ff22c5c380eb1897f35995961223f43a72"; -const char* short_version = "1.8.3"; -const char* full_version = - "1.8.2-NONE-NONE-33-pre_release_1.8.3-267c28ff22c5c380eb1897f35995961223f43a72"; -const char* build_date = "Mon Mar 6 20:46:20 UTC 2023"; +const char *branch = "pre_release_1.8.3"; +const char *commit_hash = "267c28ff22c5c380eb1897f35995961223f43a72"; +const char *short_version = "1.8.3"; +const char *full_version = + "1.8.2-NONE-NONE-33-pre_release_1.8.3-267c28ff22c5c380eb1897f35995961223f43a72"; +const char *build_date = "Mon Mar 6 20:46:20 UTC 2023"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE From 39f83bc6cd73f9393c69ebdaccb9e120f34d4f4f Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Mon, 6 Mar 2023 17:08:52 -0800 Subject: [PATCH 3/5] Remove extra space --- sdk/src/version/version.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 52c4a22c15..5688511c76 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -21,7 +21,7 @@ const char *branch = "pre_release_1.8.3"; const char *commit_hash = "267c28ff22c5c380eb1897f35995961223f43a72"; const char *short_version = "1.8.3"; const char *full_version = - "1.8.2-NONE-NONE-33-pre_release_1.8.3-267c28ff22c5c380eb1897f35995961223f43a72"; + "1.8.2-NONE-NONE-33-pre_release_1.8.3-267c28ff22c5c380eb1897f35995961223f43a72"; const char *build_date = "Mon Mar 6 20:46:20 UTC 2023"; } // namespace version } // namespace sdk From 77524e8c847eb68c84afe8229b880e48a0211b99 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Mon, 6 Mar 2023 17:11:30 -0800 Subject: [PATCH 4/5] Remove extra log added --- buildscripts/pre-commit | 1 - 1 file changed, 1 deletion(-) diff --git a/buildscripts/pre-commit b/buildscripts/pre-commit index e97581cb80..0e7b33707e 100755 --- a/buildscripts/pre-commit +++ b/buildscripts/pre-commit @@ -40,7 +40,6 @@ fi branch="$(git rev-parse --abbrev-ref HEAD)" short_version="${major}.${minor}.${patch}" -echo "${short_version}" full_version="${short_version}-${pre_release}-${build_metadata}-${count_new_commits}-${branch}-${latest_commit_hash}" # Update api version.h From 89d4e0278490b72aad6734e7e0c25386afdbd2a9 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 7 Mar 2023 13:21:18 -0800 Subject: [PATCH 5/5] Update versions.cc --- sdk/src/version/version.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 5688511c76..1a1d45a630 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -16,13 +16,13 @@ const int minor_version = 8; const int patch_version = 3; const char *pre_release = "NONE"; const char *build_metadata = "NONE"; -const int count_new_commits = 33; +const int count_new_commits = 43; const char *branch = "pre_release_1.8.3"; -const char *commit_hash = "267c28ff22c5c380eb1897f35995961223f43a72"; +const char *commit_hash = "d011e407306991be4f0580b59d5975aecdc86aca"; const char *short_version = "1.8.3"; const char *full_version = - "1.8.2-NONE-NONE-33-pre_release_1.8.3-267c28ff22c5c380eb1897f35995961223f43a72"; -const char *build_date = "Mon Mar 6 20:46:20 UTC 2023"; + "1.8.2-NONE-NONE-43-pre_release_1.8.3-d011e407306991be4f0580b59d5975aecdc86aca"; +const char *build_date = "Tue Mar 7 21:15:06 UTC 2023"; } // namespace version } // namespace sdk OPENTELEMETRY_END_NAMESPACE