From 43ad7b9fea54d6ff5400778e14e0b4b4ac41b7da Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Mon, 31 Jan 2022 09:54:10 -0800 Subject: [PATCH 1/3] move non-active members to Emeritus (#1186) --- README.md | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b37283e23a..ec97ca2788 100644 --- a/README.md +++ b/README.md @@ -95,37 +95,28 @@ doc](https://docs.google.com/document/d/1i1E4-_y4uJ083lCutKGDhkpi3n4_e774SBLi9hP For edit access, get in touch on [Slack](https://cloud-native.slack.com/archives/C01N3AT62SJ). -Approvers -([@open-telemetry/cpp-approvers](https://github.com/orgs/open-telemetry/teams/cpp-approvers)): - -* [Ehsan Saei](https://github.com/esigo) -* [Johannes Tax](https://github.com/pyohannes), Microsoft -* [Josh Suereth](https://github.com/jsuereth), Google -* [Max Golovanov](https://github.com/maxgolov), Microsoft -* [Ryan Burn](https://github.com/rnburn), Lightstep - -*Find more about the approver role in [community -repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).* - -Maintainers +[Maintainers](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer) ([@open-telemetry/cpp-maintainers](https://github.com/orgs/open-telemetry/teams/cpp-maintainers)): -* [Emil Mikulic](https://github.com/g-easy), Google * [Lalit Kumar Bhasin](https://github.com/lalitb), Microsoft * [Reiley Yang](https://github.com/reyang), Microsoft * [Tom Tan](https://github.com/ThomsonTan), Microsoft -*Find more about the maintainer role in [community -repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).* +[Approvers](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver) +([@open-telemetry/cpp-approvers](https://github.com/orgs/open-telemetry/teams/cpp-approvers)): -Triagers -([@open-telemetry/cpp-triagers](https://github.com/orgs/open-telemetry/teams/cpp-triagers)): +* [Ehsan Saei](https://github.com/esigo) +* [Josh Suereth](https://github.com/jsuereth), Google -* [Alolita Sharma](https://github.com/alolita), Amazon -* [Jodee Varney](https://github.com/jodeev), New Relic +[Emeritus +Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/main/community-membership.md#emeritus-maintainerapprovertriager): -*Find more about the triager role in [community -repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#triager).* +* [Alolita Sharma](https://github.com/alolita) +* [Emil Mikulic](https://github.com/g-easy) +* [Jodee Varney](https://github.com/jodeev) +* [Johannes Tax](https://github.com/pyohannes) +* [Max Golovanov](https://github.com/maxgolov) +* [Ryan Burn](https://github.com/rnburn) ### Thanks to all the people who have contributed From 033b16fe19f2ec13f4b96a74b3b33a04e1bc83a2 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 1 Feb 2022 11:58:47 -0800 Subject: [PATCH 2/3] Prepare for 1.2.0 release (#1188) --- CHANGELOG.md | 29 +++++++++++++++---- Versioning.md | 6 ++-- api/include/opentelemetry/version.h | 2 +- docs/public/conf.py | 2 +- .../opentelemetry/sdk/version/version.h | 2 +- sdk/src/version/version.cc | 4 +-- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaef8a94f5..b6997b4012 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,29 @@ Increment the: ## [Unreleased] -* [API/SDK] Logger: Support for Instrumentation library ([#1128](https://github.com/open-telemetry/opentelemetry-cpp/pull/1128)) -* [SDK] Add LogLevel to internal_log ([#1147](https://github.com/open-telemetry/opentelemetry-cpp/pull/1147)) -* [API/SDK] Logger: Propagating resources through LoggerProvider ([#1154](https://github.com/open-telemetry/opentelemetry-cpp/pull/1154)) -* [API]: Allow to use external abseil for bazel targets ([#1172](https://github.com/open-telemetry/opentelemetry-cpp/pull/1172)) +## [1.2.0] 2022-01-31 + +* [CI] Continuous benchmark tests as part of the CI ([#1174](https://github.com/open-telemetry/opentelemetry-cpp/pull/1174)) +* [API] Allow to use external abseil for bazel targets ([#1172](https://github.com/open-telemetry/opentelemetry-cpp/pull/1172)) +* [EXPORTER] Importing gsl::span if std::span is not available ([#1167](https://github.com/open-telemetry/opentelemetry-cpp/pull/1167)) +* [EXPORTER] Synchronized calls to Exporter::Export & Shutdown ([#1164](https://github.com/open-telemetry/opentelemetry-cpp/pull/1164)) +* [EXPORTER] OTLP http exporter block thread ([#1163](https://github.com/open-telemetry/opentelemetry-cpp/pull/1163)) +* [TESTS] Jaeger: ThriftSender unit test ([#1162](https://github.com/open-telemetry/opentelemetry-cpp/pull/1162)) +* [EXPORTER] InMemorySpanExporter shutdown fix ([#1161](https://github.com/open-telemetry/opentelemetry-cpp/pull/1161)) +* [EXPORTER] Fix leak in Jaeger exporter ([#1160](https://github.com/open-telemetry/opentelemetry-cpp/pull/1160)) +* [TESTS] ZipkinExporter unit-tests ([#1155](https://github.com/open-telemetry/opentelemetry-cpp/pull/1155)) +* [SDK] Logger: propagating resources through LoggerProvider ([#1154](https://github.com/open-telemetry/opentelemetry-cpp/pull/1154)) +* [SDK] Logger: support for instrumentation library ([#1149](https://github.com/open-telemetry/opentelemetry-cpp/pull/1149)) +* [SDK] Add log level for internal log of sdk ([#1147](https://github.com/open-telemetry/opentelemetry-cpp/pull/1147)) +* [METRICS] Metrics SDK: View API ([#1110](https://github.com/open-telemetry/opentelemetry-cpp/pull/1110)) + +Notes on experimental features: + +[#1149](https://github.com/open-telemetry/opentelemetry-cpp/pull/1149) and +[#1154](https://github.com/open-telemetry/opentelemetry-cpp/pull/1154) from +above CHANGELOG introduced API changes which are not backward compatible with +previous logs, please update API package to this release if +`ENABLE_LOGS_PREVIEW` is turned on (it is turned off by default). ## [1.1.1] 2021-12-20 @@ -233,7 +252,7 @@ Increment the: * [SDK] Added `ForceFlush` to `TracerProvider`. ([#588](https://github.com/open-telemetry/opentelemetry-cpp/pull/588)). * [SDK] Added Resource API. ([#502](https://github.com/open-telemetry/opentelemetry-cpp/pull/502)) * [API] Modified TraceState support for w3c trace context as per specs. -([#551](https://github.com/open-telemetry/opentelemetry-cpp/pull/551)) +* [SDK] TraceState implementation as per spec ([#551](https://github.com/open-telemetry/opentelemetry-cpp/pull/551)) * [API] Added B3 Propagator. ([#523](https://github.com/open-telemetry/opentelemetry-cpp/pull/523)) * [Exporter] Added ETW Exporter. ([#376](https://github.com/open-telemetry/opentelemetry-cpp/pull/376)) * [CI] Enable cache for Bazel for faster builds. ([#505](https://github.com/open-telemetry/opentelemetry-cpp/pull/505)) diff --git a/Versioning.md b/Versioning.md index b965ffd413..9327285163 100644 --- a/Versioning.md +++ b/Versioning.md @@ -52,7 +52,7 @@ Refer to the [ABI Policy](./docs/abi-policy.md) for more details. To summarise: * Naming: * `ENABLE__PREVIEW` : For experimental release of signal api/sdks - eg, `METRICS_PREVIEW`, `LOGGING_PREVIEW`, + eg, `METRICS_PREVIEW`, `LOGS_PREVIEW`, * `ENABLE___PREVIEW` : For experimental release for any feature within stable signal. For example, `TRACING_JAEGER_PREVIEW` to release the experimental Jaeger exporter for tracing. @@ -73,8 +73,8 @@ Refer to the [ABI Policy](./docs/abi-policy.md) for more details. To summarise: trace signal is experimental at the time of the writing and is within `experimental_semantic_conventions.h` * Code under the "*::detail" namespace implements internal details, - and NOT part of public interface. Also, any API not documented in the [public - documentation](https://opentelemetry-cpp.readthedocs.io/en/latest/) is NOT part of public interface. + and is NOT part of public interface. Also, any API not documented in the [public + documentation](https://opentelemetry-cpp.readthedocs.io/en/latest/) is NOT part of the public interface. * GitHub releases will be made for all released versions. diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h index 8f39221555..2fe333f3d4 100644 --- a/api/include/opentelemetry/version.h +++ b/api/include/opentelemetry/version.h @@ -6,7 +6,7 @@ #include "opentelemetry/detail/preprocessor.h" #define OPENTELEMETRY_ABI_VERSION_NO 1 -#define OPENTELEMETRY_VERSION "1.1.1" +#define OPENTELEMETRY_VERSION "1.2.0" #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO) // clang-format off diff --git a/docs/public/conf.py b/docs/public/conf.py index 6bee925428..cd6c7ec6df 100644 --- a/docs/public/conf.py +++ b/docs/public/conf.py @@ -21,7 +21,7 @@ author = 'OpenTelemetry authors' # The full version, including alpha/beta/rc tags -release = '1.1.1' +release = '1.2.0' # 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 c414258805..3155ea8e0b 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.1.1" +#define OPENTELEMETRY_SDK_VERSION "1.2.0" #include "opentelemetry/version.h" diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc index 243a32d33e..9c4aadf1c9 100644 --- a/sdk/src/version/version.cc +++ b/sdk/src/version/version.cc @@ -9,8 +9,8 @@ namespace sdk namespace version { const int MAJOR_VERSION = 1; -const int MINOR_VERSION = 1; -const int PATCH_VERSION = 1; +const int MINOR_VERSION = 2; +const int PATCH_VERSION = 0; const char *PRE_RELEASE = ""; const char *BUILD_METADATA = ""; const int COUNT_NEW_COMMITS = 0; From a320739a46000dfedba7d7a8ba60119d2a6dc5f7 Mon Sep 17 00:00:00 2001 From: Hamed Mansouri Date: Thu, 3 Feb 2022 01:28:45 +0330 Subject: [PATCH 3/3] Update GettingStarted.rst (#1189) --- docs/public/sdk/GettingStarted.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/public/sdk/GettingStarted.rst b/docs/public/sdk/GettingStarted.rst index 6e7b6f0916..c39f080e71 100644 --- a/docs/public/sdk/GettingStarted.rst +++ b/docs/public/sdk/GettingStarted.rst @@ -179,7 +179,7 @@ There are two different mechanisms to create TraceProvider instance sdktrace::TracerProvider(std::move(simple_processor), resource, std::move(always_on_sampler)); // set the global tracer TraceProvider - opentelemetry::trace::Provider::SetTracerProvider(provider); + opentelemetry::trace::Provider::SetTracerProvider(tracer_provider); Logging and Error Handling @@ -220,4 +220,4 @@ The custom log handler can be defined by inheriting from `opentelemetry::sdk::co } }; opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogHandler(CustomLogHandler()); - opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(opentelemetry::sdk::common::internal_log::LogLevel::Debug); \ No newline at end of file + opentelemetry::sdk::common::internal_log::GlobalLogHandler::SetLogLevel(opentelemetry::sdk::common::internal_log::LogLevel::Debug);