WL#16207: Update bundled OTel API headers to 1.12.0

Author: rsomla1

jdbc/extra/otel/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(OPENTELEMETRY_CPP_TAG "opentelemetry-cpp-1.10.0" CACHE INTERNAL "")
+SET(OPENTELEMETRY_CPP_TAG "opentelemetry-cpp-1.12.0" CACHE INTERNAL "")
 
 add_library(otel_api INTERFACE)
 

jdbc/extra/otel/README.txt

@@ -12,7 +12,7 @@ our copy:
   folder.
 
 3. Inside opentelemtry-cpp-X.Y.Z delete everything except api/ subfolder
-  and LICENSE file.
+  and LICENSE, README.md files.
 
 4. Inside CMakeLists.txt in this folder update OPENTELEMETRY_CPP_TAG
   variable:

jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/include/opentelemetry/metrics/meter_provider.h

@@ -10,25 +10,20 @@ The C++ [OpenTelemetry](https://opentelemetry.io/) client.
 
 ## Project Status
 
-| Signal  | Status                  | Project                                                                  |
-| ------- | ----------------------- | ------------------------------------------------------------------------ |
-| Traces  | Public Release          | N/A                                                                      |
-| Metrics | Public Release          | N/A                                                                      |
-| Logs    | Experimental [1]        | [Release Milestone](https://github.com/open-telemetry/opentelemetry-cpp/milestone/18)|
+**Stable** across all 3 signals i.e. `Logs`, `Metrics`, and `Traces`.
 
-* [1]: The current Log Signal Implementation is Experimental, and will change as
-      the current OpenTelemetry Log specification matures. The current
-      implementation can be included in build by setting `ENABLE_LOGS_PREVIEW`
-      preprocessor macro.
+See [Spec Compliance
+Matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md)
+to understand which portions of the specification has been implemented in this
+repo.
 
 ## Supported C++ Versions
 
 Code shipped from this repository generally supports the following versions of
 C++ standards:
 
-* ISO/IEC 14882:2011 (C++11, C++0x)
-* ISO/IEC 14882:2014 (C++14, C++1y)
-* ISO/IEC 14882:2017 (C++17, C++1z)
+* ISO/IEC 14882:2014 (C++14)
+* ISO/IEC 14882:2017 (C++17)
 * ISO/IEC 14882:2020 (C++20)
 
 Any exceptions to this are noted in the individual `README.md` files.
@@ -43,19 +38,13 @@ of the current project.
 
 | Platform                                                            |   Build type  |
 |---------------------------------------------------------------------|---------------|
-| ubuntu-22.04 (GCC - 10, 12)                                         | CMake, Bazel  |
-| ubuntu-20.04 (GCC 4.8 with -std=c++11 flag)                         | CMake [1]     |
-| ubuntu-20.04 (GCC 9.4.0)                                            | CMake, Bazel  |
-| ubuntu-20.04 (Default GCC Compiler - 9.4.0 with -std=c++20 flags)   | CMake, Bazel  |
-| macOS 12.0 (Xcode 14.2)                                             | Bazel         |
+| ubuntu-22.04 (GCC 10, GCC 12, Clang 14)                             | CMake, Bazel  |
+| ubuntu-20.04 (GCC 9.4.0 - default compiler)                         | CMake, Bazel  |
+| ubuntu-20.04 (GCC 9.4.0 with -std=c++14/17/20 flags)                | CMake, Bazel  |
+| macOS 12.7 (Xcode 14.2)                                             | Bazel         |
 | Windows Server 2019 (Visual Studio Enterprise 2019)                 | CMake, Bazel  |
 | 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 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.
-
 In general, the code shipped from this repository should build on all platforms
 having C++ compiler with [supported C++ standards](#supported-c-versions).
 
@@ -124,8 +113,6 @@ Maintainer/Approver/Triager](https://github.com/open-telemetry/community/blob/ma
 
 ## Release Schedule
 
-Refer to [project status](#project-status) for current status of the project.
-
 See the [release
 notes](https://github.com/open-telemetry/opentelemetry-cpp/releases) for
 existing releases.

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

@@ -22,6 +22,7 @@ cc_library(
     deps = select({
         ":with_external_abseil": [
             "@com_google_absl//absl/base",
+            "@com_google_absl//absl/strings",
             "@com_google_absl//absl/types:variant",
         ],
         "//conditions:default": [],

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

@@ -17,11 +17,6 @@ if(OPENTELEMETRY_INSTALL)
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-  set(LOGS_EXCLUDE_PATTERN "")
-  if(NOT WITH_LOGS_PREVIEW)
-    set(LOGS_EXCLUDE_PATTERN "logs")
-  endif()
-
   install(
     DIRECTORY include/opentelemetry
     DESTINATION include
@@ -33,8 +28,9 @@ if(OPENTELEMETRY_INSTALL)
     DIRECTORY include/opentelemetry
     DESTINATION include
     FILES_MATCHING
-    PATTERN "*.h"
-    PATTERN "${LOGS_EXCLUDE_PATTERN}" EXCLUDE)
+    PATTERN "*.h")
+
+  unset(TARGET_DEPS)
 endif()
 
 if(BUILD_TESTING)
@@ -47,26 +43,44 @@ if(WITH_NO_DEPRECATED_CODE)
 endif()
 
 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(
     opentelemetry_api INTERFACE absl::bad_variant_access absl::any absl::base
                                 absl::bits absl::city)
-
+  list(APPEND TARGET_DEPS "absl_bad_variant_access" "absl_any absl_base"
+       "absl_bits" "absl_city")
 endif()
 
-if(WITH_STL)
-  message(STATUS "Building with standard library types...")
-  target_compile_definitions(opentelemetry_api INTERFACE HAVE_CPP_STDLIB)
+if(WITH_STL STREQUAL "OFF")
+  message(STATUS "Building WITH_STL=OFF")
+elseif(WITH_STL STREQUAL "CXX11")
+  message(STATUS "Building WITH_STL=CXX11")
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE OPENTELEMETRY_STL_VERSION=2011)
+elseif(WITH_STL STREQUAL "CXX14")
+  message(STATUS "Building WITH_STL=CXX14")
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE OPENTELEMETRY_STL_VERSION=2014)
+elseif(WITH_STL STREQUAL "CXX17")
+  message(STATUS "Building WITH_STL=CXX17")
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE OPENTELEMETRY_STL_VERSION=2017)
+elseif(WITH_STL STREQUAL "CXX20")
+  message(STATUS "Building WITH_STL=CXX20")
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE OPENTELEMETRY_STL_VERSION=2020)
+elseif(WITH_STL STREQUAL "CXX23")
+  message(STATUS "Building WITH_STL=CXX23")
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE OPENTELEMETRY_STL_VERSION=2023)
+elseif(WITH_STL STREQUAL "ON")
+  message(STATUS "Building WITH_STL=ON")
+  # "ON" corresponds to "CXX23" at this time.
+  target_compile_definitions(opentelemetry_api
+                             INTERFACE OPENTELEMETRY_STL_VERSION=2023)
 else()
-  message(STATUS "Building with nostd types...")
+  message(
+    FATAL_ERROR "WITH_STL must be ON, OFF, CXX11, CXX14, CXX17, CXX20 or CXX23")
 endif()
 
 if(WITH_GSL)
@@ -77,17 +91,14 @@ if(WITH_GSL)
   find_package(Microsoft.GSL QUIET)
   if(TARGET Microsoft.GSL::GSL)
     target_link_libraries(opentelemetry_api INTERFACE Microsoft.GSL::GSL)
+    list(APPEND TARGET_DEPS "gsl")
   else()
     set(GSL_DIR third_party/ms-gsl)
     target_include_directories(
       opentelemetry_api INTERFACE "$<BUILD_INTERFACE:${GSL_DIR}/include>")
   endif()
 endif()
 
-if(WITH_LOGS_PREVIEW)
-  target_compile_definitions(opentelemetry_api INTERFACE ENABLE_LOGS_PREVIEW)
-endif()
-
 if(WITH_NO_GETENV)
   target_compile_definitions(opentelemetry_api INTERFACE NO_GETENV)
 endif()
@@ -108,6 +119,10 @@ if(WITH_REMOVE_METER_PREVIEW)
                              INTERFACE ENABLE_REMOVE_METER_PREVIEW)
 endif()
 
+target_compile_definitions(
+  opentelemetry_api
+  INTERFACE OPENTELEMETRY_ABI_VERSION_NO=${OPENTELEMETRY_ABI_VERSION_NO})
+
 # A better place should be in sdk, not api
 if(WITH_OTLP_HTTP_SSL_PREVIEW)
   target_compile_definitions(opentelemetry_api
@@ -132,3 +147,12 @@ if(WITH_METRICS_EXEMPLAR_PREVIEW)
   target_compile_definitions(opentelemetry_api
                              INTERFACE ENABLE_METRICS_EXEMPLAR_PREVIEW)
 endif()
+
+include(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake)
+
+if(OPENTELEMETRY_INSTALL)
+  opentelemetry_add_pkgconfig(
+    api "OpenTelemetry API"
+    "A header-only library to support instrumentation with OpenTelemetry."
+    "${TARGET_DEPS}")
+endif()

jdbc/extra/otel/opentelemetry-cpp-1.10.0/api/BUILD renamed to jdbc/extra/otel/opentelemetry-cpp-1.12.0/api/BUILD

@@ -3,13 +3,11 @@
 
 #pragma once
 
-#ifdef ENABLE_LOGS_PREVIEW
+#include <algorithm>
 
-#  include <algorithm>
-
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/unique_ptr.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
@@ -37,4 +35,3 @@ class EventId
 
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
-#endif

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

@@ -2,15 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifdef ENABLE_LOGS_PREVIEW
 
-#  include "opentelemetry/logs/log_record.h"
-#  include "opentelemetry/logs/logger.h"
-#  include "opentelemetry/logs/logger_type_traits.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/unique_ptr.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/logs/log_record.h"
+#include "opentelemetry/logs/logger.h"
+#include "opentelemetry/logs/logger_type_traits.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
@@ -84,5 +83,3 @@ class EventLogger
 };
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
-
-#endif

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

@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifdef ENABLE_LOGS_PREVIEW
 
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
@@ -34,4 +33,3 @@ class EventLoggerProvider
 };
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
-#endif

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

@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifdef ENABLE_LOGS_PREVIEW
 
-#  include "opentelemetry/common/attribute_value.h"
-#  include "opentelemetry/common/timestamp.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/common/attribute_value.h"
+#include "opentelemetry/common/timestamp.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace trace
@@ -91,4 +90,3 @@ class LogRecord
 };
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
-#endif

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

@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
-#ifdef ENABLE_LOGS_PREVIEW
 
-#  include "opentelemetry/logs/logger_type_traits.h"
-#  include "opentelemetry/logs/severity.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/unique_ptr.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/logs/logger_type_traits.h"
+#include "opentelemetry/logs/severity.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/unique_ptr.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace common
@@ -475,5 +474,3 @@ class Logger
 };
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
-
-#endif  // end of ENABLE_LOGS_PREVIEW

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

@@ -3,15 +3,13 @@
 
 #pragma once
 
-#ifdef ENABLE_LOGS_PREVIEW
-
-#  include "opentelemetry/common/key_value_iterable.h"
-#  include "opentelemetry/common/key_value_iterable_view.h"
-#  include "opentelemetry/nostd/shared_ptr.h"
-#  include "opentelemetry/nostd/span.h"
-#  include "opentelemetry/nostd/string_view.h"
-#  include "opentelemetry/nostd/type_traits.h"
-#  include "opentelemetry/version.h"
+#include "opentelemetry/common/key_value_iterable.h"
+#include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/nostd/span.h"
+#include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/nostd/type_traits.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace logs
@@ -71,5 +69,3 @@ class OPENTELEMETRY_EXPORT LoggerProvider
 };
 }  // namespace logs
 OPENTELEMETRY_END_NAMESPACE
-
-#endif  // ENABLE_LOGS_PREVIEW