Merge branch 'main' into gzip-compression

open-telemetry · Feb 27, 2024 · 0ad3f66 · 0ad3f66
2 parents 03464a9 + d036d82
commit 0ad3f66
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,11 @@ Important changes:
 * [SDK] Change OTLP HTTP content_type default to binary
   [#2558](https://github.com/open-telemetry/opentelemetry-cpp/pull/2558)
 
+## [1.14.2] 2024-02-27
+
+* [SDK] Fix observable attributes drop
+   [#2557](https://github.com/open-telemetry/opentelemetry-cpp/pull/2557)
+
 ## [1.14.1] 2024-02-23
 
 * [SDK] Restore Recordable API compatibility with versions < 1.14.0

diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
@@ -10,10 +10,10 @@
 #  define OPENTELEMETRY_ABI_VERSION_NO 1
 #endif
 
-#define OPENTELEMETRY_VERSION "1.14.1"
+#define OPENTELEMETRY_VERSION "1.14.2"
 #define OPENTELEMETRY_VERSION_MAJOR 1
 #define OPENTELEMETRY_VERSION_MINOR 14
-#define OPENTELEMETRY_VERSION_PATCH 1
+#define OPENTELEMETRY_VERSION_PATCH 2
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
 

diff --git 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.14.1"
+release = "1.14.2"
 
 # 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
@@ -5,7 +5,7 @@
 
 #include "opentelemetry/detail/preprocessor.h"
 
-#define OPENTELEMETRY_SDK_VERSION "1.14.1"
+#define OPENTELEMETRY_SDK_VERSION "1.14.2"
 
 #include "opentelemetry/version.h"
 

diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc
@@ -13,12 +13,12 @@ namespace version
 {
 const int major_version    = 1;
 const int minor_version    = 14;
-const int patch_version    = 1;
+const int patch_version    = 2;
 const char *pre_release    = "NONE";
 const char *build_metadata = "NONE";
-const char *short_version  = "1.14.1";
-const char *full_version   = "1.14.1-NONE-NONE";
-const char *build_date     = "Fri Feb 23 21:04:34 UTC 2024";
+const char *short_version  = "1.14.2";
+const char *full_version   = "1.14.2-NONE-NONE";
+const char *build_date     = "Tue Feb 27 18:25:51 UTC 2024";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE