wip

Author: avsej

CMakeLists.txt

@@ -249,7 +249,6 @@ set(couchbase_cxx_client_FILES
     core/meta/version.cxx
     core/metrics/logging_meter.cxx
     core/metrics/meter_wrapper.cxx
-    core/metrics/otel_meter.cxx
     core/n1ql_query_options.cxx
     core/operations/document_analytics.cxx
     core/operations/document_append.cxx

cmake/CompilerWarnings.cmake

@@ -70,11 +70,6 @@ function(set_project_warnings project_name)
   )
 
   set(CLANG_WARNINGS ${COMMON_WARNINGS})
-  if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL "17.0.0")
-    set(CLANG_WARNINGS ${CLANG_WARNINGS} -Wshadow # warn the user if a variable declaration shadows one from a parent
-                                                  # context
-    )
-  endif()
 
   if(MSVC)
     set(PROJECT_WARNINGS ${MSVC_WARNINGS})

cmake/ThirdPartyDependencies.cmake

@@ -62,16 +62,17 @@ if(NOT TARGET opentelemetry_api)
   # https://github.com/open-telemetry/opentelemetry-cpp/releases
   cpmaddpackage(
     NAME
-    opentelemetry
+    opentelemetry_api
     VERSION
     1.17.0
     GITHUB_REPOSITORY
     "open-telemetry/opentelemetry-cpp"
     EXCLUDE_FROM_ALL ON
     OPTIONS
     "OPENTELEMETRY_INSTALL OFF"
-    # "WITH_API_ONLY ON"
+    "WITH_ABSEIL ON"
     "WITH_OTLP_HTTP ON"
+    "WITH_OTLP_GRPC OFF"
     "WITH_BENCHMARK OFF"
     "BUILD_TESTING OFF"
     "BUILD_SHARED_LIBS OFF"
@@ -80,7 +81,6 @@ if(NOT TARGET opentelemetry_api)
     "CMAKE_POSITION_INDEPENDENT_CODE ON")
 endif()
 
-
 if(NOT TARGET Microsoft.GSL::GSL)
   # https://github.com/microsoft/GSL/releases
   cpmaddpackage(

core/meta/version.cxx

@@ -32,6 +32,7 @@
 #include <llhttp.h>
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
+#include <opentelemetry/version.h>
 #include <snappy-stubs-public.h>
 #include <spdlog/version.h>
 
@@ -168,6 +169,7 @@ sdk_build_info() -> std::map<std::string, std::string>
 #if defined(__GLIBC__)
   info["libc"] = fmt::format("glibc {}.{}", __GLIBC__, __GLIBC_MINOR__);
 #endif
+  info["opentelemetry_api"] = OPENTELEMETRY_VERSION;
 
   return info;
 }