Merge branch 'main' into AddInstrumentationLibrary

open-telemetry · Apr 26, 2021 · 5b55dd1 · 5b55dd1
2 parents c2fb193 + 7909008
commit 5b55dd1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,14 @@ Increment the:
 ## [Unreleased]
 
 * [SDK] Add instrumentation library and multiple tracer support ([#693](https://github.com/open-telemetry/opentelemetry-cpp/pull/693))
+
+## [0.5.0] 2021-04-26
+
+* [SDK] Support custom span-id and trace-id generator ([#681](https://github.com/open-telemetry/opentelemetry-cpp/pull/681))
+* [SDK] Add SpanContext (and TraceState) to Recordable ([#667](https://github.com/open-telemetry/opentelemetry-cpp/pull/667))
+* [SDK] Global Propagator ([#668](https://github.com/open-telemetry/opentelemetry-cpp/pull/668))
+* [SDK] Create SharedContext for updating span pipeline ([#650](https://github.com/open-telemetry/opentelemetry-cpp/pull/650))
+* [API] Baggage implementation ([#676](https://github.com/open-telemetry/opentelemetry-cpp/pull/676))
 * [API] Move class from opentelemetry::core namespace to opentelemetry::common namespace ([#686](https://github.com/open-telemetry/opentelemetry-cpp/pull/686))
 
 ## [0.4.0] 2021-04-12

diff --git a/api/docs/Doxyfile b/api/docs/Doxyfile
@@ -44,7 +44,7 @@ PROJECT_NUMBER =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF = "Version 0.4.0"
+PROJECT_BRIEF = "Version 0.5.0"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
@@ -3,7 +3,7 @@
 #include "opentelemetry/detail/preprocessor.h"
 
 #define OPENTELEMETRY_ABI_VERSION_NO 0
-#define OPENTELEMETRY_VERSION "0.4.0"
+#define OPENTELEMETRY_VERSION "0.5.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
@@ -21,7 +21,7 @@
 author = 'OpenTelemetry authors'
 
 # The full version, including alpha/beta/rc tags
-release = '0.4.0'
+release = '0.5.0'
 
 # Run sphinx on subprojects and copy output
 # -----------------------------------------

diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc
@@ -9,7 +9,7 @@ namespace sdk
 namespace version
 {
 const int MAJOR_VERSION = 0;
-const int MINOR_VERSION = 4;
+const int MINOR_VERSION = 5;
 const int PATCH_VERSION = 0;
 const char *PRE_RELEASE = "";
 const char *BUILD_METADATA = "";