wl#16207: Update bundled OTel API headers

Author: rsomla1

jdbc/CMakeLists.txt

@@ -149,16 +149,8 @@ endif()
 
 find_dependency(MySQL)
 
-add_library(otel_api INTERFACE)
-# Note: For now make it phony target on platforms other than Linux
-if(NOT (WIN32 OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "SunOS"))
-  message(STATUS "Adding OTel support")
-  set(TELEMETRY ON)
-  target_include_directories(otel_api INTERFACE
-    "${PROJECT_SOURCE_DIR}/extra/otel/opentelemetry-cpp-1.8.3/api/include"
-  )
-  target_compile_definitions(otel_api INTERFACE TELEMETRY)
-endif()
+# otel_api interface target
+add_subdirectory(extra/otel)
 
 
 #-----------------

jdbc/extra/otel/CMakeLists.txt

@@ -0,0 +1,25 @@
+SET(OPENTELEMETRY_CPP_TAG "opentelemetry-cpp-1.10.0" CACHE INTERNAL "")
+
+add_library(otel_api INTERFACE)
+
+# Note: For now make it phony target on platforms other than Linux
+
+if(NOT (WIN32 OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "SunOS"))
+
+  message(STATUS "Adding OTel support")
+
+  set(TELEMETRY ON CACHE INTERNAL "Whether connector is built with OTel support")
+
+  target_include_directories(otel_api INTERFACE
+    "${PROJECT_SOURCE_DIR}/extra/otel/${OPENTELEMETRY_CPP_TAG}/api/include"
+  )
+
+  target_compile_definitions(otel_api INTERFACE TELEMETRY)
+
+  if(WIN32)
+    # Note: warning C4996 is triggered by OTel headers (as of version 1.10.0)
+    target_compile_definitions(otel_api INTERFACE _SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING)
+  endif()
+
+endif()
+

jdbc/extra/otel/README.txt

@@ -0,0 +1,23 @@
+How to update the bundled version of opentelemetry-cpp
+======================================================
+
+We use copy of opentelemetry-cpp sources that are bundled with the server
+(note that server potentially patches the original sources). When server
+starts to bundle new version X.Y.Z the following should be done to update
+our copy:
+
+1. Delete the current opentelemtetry-cpp-* subfolder from this folder.
+
+2. Copy folder opentelemetry-cpp-X.Y.Z from the server source tree to this
+  folder.
+
+3. Inside opentelemtry-cpp-X.Y.Z delete everything except api/ subfolder
+  and LICENSE file.
+
+4. Inside CMakeLists.txt in this folder update OPENTELEMETRY_CPP_TAG
+  variable:
+
+  set(OPENTELEMETRY_CPP_TAG "opentelemetry-cpp-X.Y.Z" CACHE INTERNAL "")
+
+3. Build and test connector on a platform on which we support OTel (Linux)
+  to confirm that it works as before.

jdbc/extra/otel/opentelemetry-cpp-1.8.3/LICENSE renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/LICENSE

@@ -52,7 +52,7 @@ of the current project.
 | Windows Server 2022 (Visual Studio Enterprise 2022)                 | CMake         |
 
 [1]: Bazel build is disabled for GCC 4.8, as gRPC library 1.38 and above
-  (required by OTLP expoter) don't build with this compiler. See gRPC [official
+  (required by OTLP exporter) don't build with this compiler. See gRPC [official
   support](https://grpc.io/docs/#official-support) document. CMake build doesn't
   build OTLP exporter with GCC 4.8.
 
@@ -98,14 +98,13 @@ For edit access, get in touch on
 
 * [Ehsan Saei](https://github.com/esigo)
 * [Lalit Kumar Bhasin](https://github.com/lalitb), Microsoft
+* [Marc Alff](https://github.com/marcalff), Oracle
 * [Tom Tan](https://github.com/ThomsonTan), Microsoft
 
 [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)):
 
 * [Josh Suereth](https://github.com/jsuereth), Google
-* [Marc Alff](https://github.com/marcalff), Oracle
-* [Reiley Yang](https://github.com/reyang), Microsoft
 * [WenTao Ou](https://github.com/owent), Tencent
 
 [Emeritus
@@ -116,6 +115,7 @@ Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/ma
 * [Jodee Varney](https://github.com/jodeev)
 * [Johannes Tax](https://github.com/pyohannes)
 * [Max Golovanov](https://github.com/maxgolov)
+* [Reiley Yang](https://github.com/reyang)
 * [Ryan Burn](https://github.com/rnburn)
 
 ### Thanks to all the people who have contributed

jdbc/extra/otel/opentelemetry-cpp-1.8.3/README.md renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/README.md

@@ -0,0 +1,34 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
+
+package(default_visibility = ["//visibility:public"])
+
+bool_flag(
+    name = "with_abseil",
+    build_setting_default = False,
+)
+
+cc_library(
+    name = "api",
+    hdrs = glob(["include/**/*.h"]),
+    defines = select({
+        ":with_external_abseil": ["HAVE_ABSEIL"],
+        "//conditions:default": [],
+    }),
+    strip_include_prefix = "include",
+    tags = ["api"],
+    deps = select({
+        ":with_external_abseil": [
+            "@com_google_absl//absl/base",
+            "@com_google_absl//absl/types:variant",
+        ],
+        "//conditions:default": [],
+    }),
+)
+
+config_setting(
+    name = "with_external_abseil",
+    flag_values = {":with_abseil": "true"},
+)

jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/BUILD

@@ -46,9 +46,14 @@ if(WITH_NO_DEPRECATED_CODE)
                              INTERFACE OPENTELEMETRY_NO_DEPRECATED_CODE)
 endif()
 
-if(WITH_ABSEIL)
-
-  find_package(absl CONFIG REQUIRED)
+if(TELEMETRY_WITH_ABSEIL)
+  IF(WITH_PROTOBUF STREQUAL "bundled")
+    INCLUDE_DIRECTORIES(BEFORE SYSTEM
+      "${BUNDLED_PROTO_SRCDIR}"
+      "${BUNDLED_ABSEIL_SRCDIR}")
+  ELSE()
+    find_package(absl CONFIG REQUIRED)
+  ENDIF()
 
   target_compile_definitions(opentelemetry_api INTERFACE HAVE_ABSEIL)
   target_link_libraries(
@@ -58,10 +63,10 @@ if(WITH_ABSEIL)
 endif()
 
 if(WITH_STL)
-  message("Building with standard library types...")
+  message(STATUS "Building with standard library types...")
   target_compile_definitions(opentelemetry_api INTERFACE HAVE_CPP_STDLIB)
 else()
-  message("Building with nostd types...")
+  message(STATUS "Building with nostd types...")
 endif()
 
 if(WITH_GSL)
@@ -98,6 +103,31 @@ if(WITH_ASYNC_EXPORT_PREVIEW)
   target_compile_definitions(opentelemetry_api INTERFACE ENABLE_ASYNC_EXPORT)
 endif()
 
+if(WITH_REMOVE_METER_PREVIEW)
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE ENABLE_REMOVE_METER_PREVIEW)
+endif()
+
+# A better place should be in sdk, not api
+if(WITH_OTLP_HTTP_SSL_PREVIEW)
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE ENABLE_OTLP_HTTP_SSL_PREVIEW)
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE ENABLE_HTTP_SSL_PREVIEW)
+
+  if(WITH_OTLP_HTTP_SSL_TLS_PREVIEW)
+    target_compile_definitions(opentelemetry_api
+                               INTERFACE ENABLE_OTLP_HTTP_SSL_TLS_PREVIEW)
+    target_compile_definitions(opentelemetry_api
+                               INTERFACE ENABLE_HTTP_SSL_TLS_PREVIEW)
+  endif()
+endif()
+
+if(WITH_OTLP_GRPC_SSL_MTLS_PREVIEW)
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW)
+endif()
+
 if(WITH_METRICS_EXEMPLAR_PREVIEW)
   target_compile_definitions(opentelemetry_api
                              INTERFACE ENABLE_METRICS_EXEMPLAR_PREVIEW)

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/CMakeLists.txt renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/CMakeLists.txt

@@ -26,14 +26,12 @@ class OPENTELEMETRY_EXPORT Baggage
   static constexpr char kMembersSeparator   = ',';
   static constexpr char kMetadataSeparator  = ';';
 
-  Baggage() noexcept : kv_properties_(new opentelemetry::common::KeyValueProperties()) {}
-  Baggage(size_t size) noexcept
-      : kv_properties_(new opentelemetry::common::KeyValueProperties(size))
-  {}
+  Baggage() noexcept : kv_properties_(new common::KeyValueProperties()) {}
+  Baggage(size_t size) noexcept : kv_properties_(new common::KeyValueProperties(size)) {}
 
   template <class T>
   Baggage(const T &keys_and_values) noexcept
-      : kv_properties_(new opentelemetry::common::KeyValueProperties(keys_and_values))
+      : kv_properties_(new common::KeyValueProperties(keys_and_values))
   {}
 
   OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<Baggage> GetDefault()
@@ -293,7 +291,7 @@ class OPENTELEMETRY_EXPORT Baggage
 
 private:
   // Store entries in a C-style array to avoid using std::array or std::vector.
-  nostd::unique_ptr<opentelemetry::common::KeyValueProperties> kv_properties_;
+  nostd::unique_ptr<common::KeyValueProperties> kv_properties_;
 };
 
 }  // namespace baggage

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/include/opentelemetry/baggage/baggage.h renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/baggage/baggage.h

@@ -0,0 +1,36 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+#pragma once
+
+#include "opentelemetry/baggage/baggage.h"
+#include "opentelemetry/context/context.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/version.h"
+
+OPENTELEMETRY_BEGIN_NAMESPACE
+
+namespace baggage
+{
+
+static const std::string kBaggageHeader = "baggage";
+
+inline nostd::shared_ptr<Baggage> GetBaggage(const context::Context &context) noexcept
+{
+  context::ContextValue context_value = context.GetValue(kBaggageHeader);
+  if (nostd::holds_alternative<nostd::shared_ptr<Baggage>>(context_value))
+  {
+    return nostd::get<nostd::shared_ptr<Baggage>>(context_value);
+  }
+  static nostd::shared_ptr<Baggage> empty_baggage{new Baggage()};
+  return empty_baggage;
+}
+
+inline context::Context SetBaggage(context::Context &context,
+                                   nostd::shared_ptr<Baggage> baggage) noexcept
+{
+  return context.SetValue(kBaggageHeader, baggage);
+}
+
+}  // namespace baggage
+OPENTELEMETRY_END_NAMESPACE

jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/baggage/baggage_context.h

@@ -14,29 +14,29 @@ namespace baggage
 namespace propagation
 {
 
-class BaggagePropagator : public opentelemetry::context::propagation::TextMapPropagator
+class BaggagePropagator : public context::propagation::TextMapPropagator
 {
 public:
-  void Inject(opentelemetry::context::propagation::TextMapCarrier &carrier,
-              const opentelemetry::context::Context &context) noexcept override
+  void Inject(context::propagation::TextMapCarrier &carrier,
+              const context::Context &context) noexcept override
   {
-    auto baggage = opentelemetry::baggage::GetBaggage(context);
+    auto baggage = baggage::GetBaggage(context);
     auto header  = baggage->ToHeader();
     if (header.size())
     {
       carrier.Set(kBaggageHeader, header);
     }
   }
 
-  context::Context Extract(const opentelemetry::context::propagation::TextMapCarrier &carrier,
-                           opentelemetry::context::Context &context) noexcept override
+  context::Context Extract(const context::propagation::TextMapCarrier &carrier,
+                           context::Context &context) noexcept override
   {
-    nostd::string_view baggage_str = carrier.Get(opentelemetry::baggage::kBaggageHeader);
-    auto baggage                   = opentelemetry::baggage::Baggage::FromHeader(baggage_str);
+    nostd::string_view baggage_str = carrier.Get(baggage::kBaggageHeader);
+    auto baggage                   = baggage::Baggage::FromHeader(baggage_str);
 
     if (baggage->ToHeader().size())
     {
-      return opentelemetry::baggage::SetBaggage(context, baggage);
+      return baggage::SetBaggage(context, baggage);
     }
     else
     {

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/include/opentelemetry/baggage/propagation/baggage_propagator.h renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/baggage/propagation/baggage_propagator.h

@@ -5,6 +5,7 @@
 
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/include/opentelemetry/common/attribute_value.h renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/common/attribute_value.h

@@ -4,10 +4,10 @@
 #pragma once
 
 #include <iterator>
-#include <type_traits>
 #include <utility>
 
 #include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/type_traits.h"

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/include/opentelemetry/common/key_value_iterable.h renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/common/key_value_iterable.h

@@ -6,7 +6,6 @@
 #include "opentelemetry/common/key_value_iterable_view.h"
 #include "opentelemetry/common/string_util.h"
 #include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/version.h"

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/include/opentelemetry/common/key_value_iterable_view.h renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/common/key_value_iterable_view.h

@@ -10,6 +10,7 @@
 #      define OPENTELEMETRY_LIKELY_IF(...) \
         if (__VA_ARGS__)                   \
         [[likely]]
+
 #    endif
 #  endif
 #endif
@@ -176,6 +177,31 @@ point.
 
 #endif
 
+//
+// Atomic wrappers based on compiler intrinsics for memory read/write.
+// The tailing number is read/write length in bits.
+//
+// N.B. Compiler instrinsic is used because the usage of C++ standard library is restricted in the
+// OpenTelemetry C++ API.
+//
+#if defined(__GNUC__)
+
+#  define OPENTELEMETRY_ATOMIC_READ_8(ptr) __atomic_load_n(ptr, __ATOMIC_SEQ_CST)
+#  define OPENTELEMETRY_ATOMIC_WRITE_8(ptr, value) __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST)
+
+#elif defined(_MSC_VER)
+
+#  include <intrin.h>
+
+#  define OPENTELEMETRY_ATOMIC_READ_8(ptr) \
+    static_cast<uint8_t>(_InterlockedCompareExchange8(reinterpret_cast<char *>(ptr), 0, 0))
+#  define OPENTELEMETRY_ATOMIC_WRITE_8(ptr, value) \
+    _InterlockedExchange8(reinterpret_cast<char *>(ptr), static_cast<char>(value))
+
+#else
+#  error port atomics read/write for the current platform
+#endif
+
 /* clang-format on */
 //
 // The if/elif order matters here. If both OPENTELEMETRY_BUILD_IMPORT_DLL and

jdbc/extra/otel/opentelemetry-cpp-1.8.3/api/include/opentelemetry/common/kv_properties.h renamed to jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/common/kv_properties.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace common
@@ -14,11 +15,11 @@ class StringUtil
 public:
   static nostd::string_view Trim(nostd::string_view str, size_t left, size_t right) noexcept
   {
-    while (str[static_cast<std::size_t>(left)] == ' ' && left <= right)
+    while (left <= right && str[static_cast<std::size_t>(left)] == ' ')
     {
       left++;
     }
-    while (str[static_cast<std::size_t>(right)] == ' ' && left <= right)
+    while (left <= right && str[static_cast<std::size_t>(right)] == ' ')
     {
       right--;
     }