Merge branch 'main' into fix/reader_data_race

CHANGELOG.md

@@ -15,18 +15,77 @@ Increment the:
 
 ## [Unreleased]
 
-* [EXPORTER] Add OTLP File exporters
-  [#2540](https://github.com/open-telemetry/opentelemetry-cpp/pull/2540)
+## [1.15.0] 2024-04-21
+
+* [EXPORTER] Change OTLP HTTP content_type default to binary
+  [#2564](https://github.com/open-telemetry/opentelemetry-cpp/pull/2564)
+* [DOC] Fix OTLP documentation: Default endpoint is wrong for OTLP/HTTP
+  [#2560](https://github.com/open-telemetry/opentelemetry-cpp/pull/2560)
+* [BUILD] Fix old style cast warning
+  [#2567](https://github.com/open-telemetry/opentelemetry-cpp/pull/2567)
 * [EXPORTER] Gzip compression support for OTLP/HTTP and OTLP/gRPC exporter
   [#2530](https://github.com/open-telemetry/opentelemetry-cpp/pull/2530)
+* [BUILD] update vcpkg submodule to 2024.02.14
+  [#2575](https://github.com/open-telemetry/opentelemetry-cpp/pull/2575)
+* [SDK] Support for OTEL_SERVICE_NAME
+  [#2577](https://github.com/open-telemetry/opentelemetry-cpp/pull/2577)
 * [EXPORTER] Support URL-encoded values for `OTEL_EXPORTER_OTLP_HEADERS`
   [#2579](https://github.com/open-telemetry/opentelemetry-cpp/pull/2579)
+* [BUILD] CMake cleanup for message()
+  [#2582](https://github.com/open-telemetry/opentelemetry-cpp/pull/2582)
+* [BUILD] Bump CMake minimum required version to 3.9
+  [#2581](https://github.com/open-telemetry/opentelemetry-cpp/pull/2581)
+* [BUILD] Provide LIKELY / UNLIKELY macros
+  [#2580](https://github.com/open-telemetry/opentelemetry-cpp/pull/2580)
+* [EXPORTER] OTLP: Fix missing ResourceMetrics SchemaURL
+  [#2587](https://github.com/open-telemetry/opentelemetry-cpp/pull/2587)
+* [ETW] cleanup include path
+  [#2594](https://github.com/open-telemetry/opentelemetry-cpp/pull/2594)
+* Upgrade to googletest 1.14.0
+  [#2596](https://github.com/open-telemetry/opentelemetry-cpp/pull/2596)
+* Upgrade to nlohmann_json 3.11.3
+  [#2595](https://github.com/open-telemetry/opentelemetry-cpp/pull/2595)
+* [BAZEL] Move -std=c++14 to .bazelrc
+  [#2600](https://github.com/open-telemetry/opentelemetry-cpp/pull/2600)
+* [BAZEL] Fix -std=c++14 warning on Windows
+  [#2601](https://github.com/open-telemetry/opentelemetry-cpp/pull/2601)
+* Upgrade to benchmark 1.8.3
+  [#2597](https://github.com/open-telemetry/opentelemetry-cpp/pull/2597)
+* Upgrade to prometheus 1.2.4
+  [#2598](https://github.com/open-telemetry/opentelemetry-cpp/pull/2598)
+* [DOC] Fix typo: Asynchronouse -> Asynchronous in meter.h
+  [#2604](https://github.com/open-telemetry/opentelemetry-cpp/pull/2604)
+* [BUILD] Do not link prometheus-cpp::util when it doesn't exist
+  [#2606](https://github.com/open-telemetry/opentelemetry-cpp/pull/2606)
+* [SDK] Remove unused variable
+  [#2609](https://github.com/open-telemetry/opentelemetry-cpp/pull/2609)
+* [METRICS SDK] Remove extra OfferMeasurement call
+  in SyncMetricsStorage::OfferMeasurement
+  [#2610](https://github.com/open-telemetry/opentelemetry-cpp/pull/2610)
+* [MISC] Use set -e on all shell scripts and pass shellcheck --severity=error
+  [#2616](https://github.com/open-telemetry/opentelemetry-cpp/pull/2616)
+* [CI] Add shellcheck --severity=error as a CI step
+  [#2618](https://github.com/open-telemetry/opentelemetry-cpp/pull/2618)
+* [CI] Upgrade to abseil 20240116.1 (CMake only)
+  [#2599](https://github.com/open-telemetry/opentelemetry-cpp/pull/2599)
+* [CI] Benchmark, provide units with --benchmark_min_time
+  [#2621](https://github.com/open-telemetry/opentelemetry-cpp/pull/2621)
+* [EXPORTER] OTLP file exporter
+  [#2540](https://github.com/open-telemetry/opentelemetry-cpp/pull/2540)
 * [CI] Use platform CMake
   [#2627](https://github.com/open-telemetry/opentelemetry-cpp/pull/2627)
-* [PROTO] Upgrade to opentelemetry-proto v1.2.0
+* [PROTO] Upgrade to opentelemetry-proto 1.2.0
   [#2631](https://github.com/open-telemetry/opentelemetry-cpp/pull/2631)
 * [SDK] DefaultLogHandler to print errors to std::cerr, add LogLevel::None
   [#2622](https://github.com/open-telemetry/opentelemetry-cpp/pull/2622)
+* [SEMANTIC CONVENTIONS] Upgrade to semantic convention 1.25.0
+  [#2633](https://github.com/open-telemetry/opentelemetry-cpp/pull/2633)
+* [DOC] Add readme and examples for OTLP FILE exporters.
+  [#2638](https://github.com/open-telemetry/opentelemetry-cpp/pull/2638)
+* [SEMANTIC CONVENTIONS] Rework on semantic conventions 1.25.0
+  [#2640](https://github.com/open-telemetry/opentelemetry-cpp/pull/2640)
+* [DOC] Update INSTALL.md
+  [#2592](https://github.com/open-telemetry/opentelemetry-cpp/pull/2592)
 
 Important changes:
 

api/include/opentelemetry/version.h

@@ -10,10 +10,10 @@
 #  define OPENTELEMETRY_ABI_VERSION_NO 1
 #endif
 
-#define OPENTELEMETRY_VERSION "1.14.2"
+#define OPENTELEMETRY_VERSION "1.15.0"
 #define OPENTELEMETRY_VERSION_MAJOR 1
-#define OPENTELEMETRY_VERSION_MINOR 14
-#define OPENTELEMETRY_VERSION_PATCH 2
+#define OPENTELEMETRY_VERSION_MINOR 15
+#define OPENTELEMETRY_VERSION_PATCH 0
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
 

bazel/repository.bzl

@@ -58,16 +58,20 @@ def opentelemetry_cpp_deps():
         #
         # Important note:
         #
-        # The bazel build still uses abseil-cpp-20220623.1 here.
+        # The bazel build uses abseil-cpp-20230802.2 here,
+        # while CMake uses more recent versions.
         #
-        # Upgrading to abseil-cpp-20240116.1 breaks the OTLP build, reason unknown.
+        # bazel with abseil-cpp-20240116.2 : build failures in CI
+        # bazel with abseil-cpp-20240116.1 : build failures in CI
+        #
+        # TODO: Fix issue #2619
         #
         http_archive,
         name = "com_google_absl",
-        sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
-        strip_prefix = "abseil-cpp-20220623.1",
+        sha256 = "7c11539617af1f332f0854a6fb21e296a1b29c27d03f23c7b49d4adefcd102cc",
+        strip_prefix = "abseil-cpp-20230802.2",
         urls = [
-            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
+            "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.2.tar.gz",
         ],
     )
 

docs/public/conf.py

@@ -24,7 +24,7 @@
 author = 'OpenTelemetry authors'
 
 # The full version, including alpha/beta/rc tags
-release = "1.14.2"
+release = "1.15.0"
 
 # Run sphinx on subprojects and copy output
 # -----------------------------------------

exporters/etw/include/opentelemetry/exporters/etw/etw_properties.h

@@ -7,6 +7,7 @@
 #include "opentelemetry/common/key_value_iterable_view.h"
 
 #include <opentelemetry/nostd/span.h>
+#include <opentelemetry/nostd/type_traits.h>
 #include <map>
 #include <string>
 #include <vector>
@@ -106,7 +107,7 @@ class PropertyValue : public PropertyVariant
    * @param vec Vector of integral type primitives to convert to span.
    * @return Span of integral type primitives.
    */
-  template <typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
+  template <typename T, nostd::enable_if_t<std::is_integral<T>::value, bool> = true>
   static nostd::span<const T> to_span(const std::vector<T> &vec)
   {
     nostd::span<const T> result(vec.data(), vec.size());
@@ -119,7 +120,7 @@ class PropertyValue : public PropertyVariant
    * @param vec Vector of float type primitives to convert to span.
    * @return Span of float type primitives.
    */
-  template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
+  template <typename T, nostd::enable_if_t<std::is_floating_point<T>::value, bool> = true>
   static nostd::span<const T> to_span(const std::vector<T> &vec)
   {
     nostd::span<const T> result(vec.data(), vec.size());
@@ -139,7 +140,7 @@ class PropertyValue : public PropertyVariant
    * @param v
    * @return
    */
-  template <typename TInteger, std::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
+  template <typename TInteger, nostd::enable_if_t<std::is_integral<TInteger>::value, bool> = true>
   PropertyValue(TInteger number) : PropertyVariant(number)
   {}
 
@@ -148,7 +149,7 @@ class PropertyValue : public PropertyVariant
    * @param v
    * @return
    */
-  template <typename TFloat, std::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
+  template <typename TFloat, nostd::enable_if_t<std::is_floating_point<TFloat>::value, bool> = true>
   PropertyValue(TFloat number) : PropertyVariant(double(number))
   {}
 

sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h

@@ -8,6 +8,7 @@
 
 #include "opentelemetry/common/key_value_iterable_view.h"
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/type_traits.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
@@ -73,7 +74,7 @@ class InstrumentationScope
    */
   template <
       class ArgumentType,
-      std::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
+      nostd::enable_if_t<opentelemetry::common::detail::is_key_value_iterable<ArgumentType>::value>
           * = nullptr>
   static nostd::unique_ptr<InstrumentationScope> Create(nostd::string_view name,
                                                         nostd::string_view version,

sdk/include/opentelemetry/sdk/version/version.h

@@ -5,7 +5,7 @@
 
 #include "opentelemetry/detail/preprocessor.h"
 
-#define OPENTELEMETRY_SDK_VERSION "1.14.2"
+#define OPENTELEMETRY_SDK_VERSION "1.15.0"
 
 #include "opentelemetry/version.h"
 

sdk/src/version/version.cc

@@ -12,13 +12,13 @@ namespace sdk
 namespace version
 {
 const int major_version    = 1;
-const int minor_version    = 14;
-const int patch_version    = 2;
+const int minor_version    = 15;
+const int patch_version    = 0;
 const char *pre_release    = "NONE";
 const char *build_metadata = "NONE";
-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";
+const char *short_version  = "1.15.0";
+const char *full_version   = "1.15.0-NONE-NONE";
+const char *build_date     = "Sun Apr 21 19:31:02 UTC 2024";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE