Merge branch 'main' into attributes-limit

open-telemetry · Oct 13, 2023 · 9370c7b · 9370c7b
2 parents 097721e + 2c4b2a9
commit 9370c7b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
@@ -145,11 +145,11 @@ def opentelemetry_cpp_deps():
         http_archive,
         name = "curl",
         build_file = "@io_opentelemetry_cpp//bazel:curl.BUILD",
-        sha256 = "ba98332752257b47b9dea6d8c0ad25ec1745c20424f1dd3ff2c99ab59e97cf91",
-        strip_prefix = "curl-7.73.0",
+        sha256 = "816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427",
+        strip_prefix = "curl-8.4.0",
         urls = [
-            "https://curl.haxx.se/download/curl-7.73.0.tar.gz",
-            "https://github.com/curl/curl/releases/download/curl-7_73_0/curl-7.73.0.tar.gz",
+            "https://curl.haxx.se/download/curl-8.4.0.tar.gz",
+            "https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.tar.gz",
         ],
     )
 

diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt
@@ -342,7 +342,8 @@ if(BUILD_TESTING)
       ${GMOCK_LIB}
       opentelemetry_exporter_otlp_http_log
       opentelemetry_logs
-      opentelemetry_http_client_nosend)
+      opentelemetry_http_client_nosend
+      nlohmann_json::nlohmann_json)
     gtest_add_tests(
       TARGET otlp_http_log_record_exporter_test
       TEST_PREFIX exporter.otlp.

diff --git a/opentracing-shim/CMakeLists.txt b/opentracing-shim/CMakeLists.txt
@@ -14,10 +14,13 @@ target_include_directories(
                         "$<INSTALL_INTERFACE:include>")
 
 if(OPENTRACING_DIR)
-  include_directories(
-    "${CMAKE_BINARY_DIR}/${OPENTRACING_DIR}/include"
-    "${CMAKE_SOURCE_DIR}/${OPENTRACING_DIR}/include"
-    "${CMAKE_SOURCE_DIR}/${OPENTRACING_DIR}/3rd_party/include")
+  target_include_directories(
+    ${this_target}
+    PUBLIC
+      "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/${OPENTRACING_DIR}/include>"
+      "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/${OPENTRACING_DIR}/include>"
+      "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/${OPENTRACING_DIR}/3rd_party/include>"
+  )
   target_link_libraries(${this_target} opentelemetry_api opentracing)
 else()
   target_link_libraries(${this_target} opentelemetry_api

diff --git a/sdk/test/trace/sampler_benchmark.cc b/sdk/test/trace/sampler_benchmark.cc
@@ -42,6 +42,11 @@ void BM_AlwaysOnSamplerConstruction(benchmark::State &state)
 }
 BENCHMARK(BM_AlwaysOnSamplerConstruction);
 
+/*
+  Fails to build with GCC.
+  See upstream bug: https://github.com/google/benchmark/issues/1675
+*/
+#if 0
 void BM_ParentBasedSamplerConstruction(benchmark::State &state)
 {
   while (state.KeepRunning())
@@ -59,6 +64,7 @@ void BM_TraceIdRatioBasedSamplerConstruction(benchmark::State &state)
   }
 }
 BENCHMARK(BM_TraceIdRatioBasedSamplerConstruction);
+#endif
 
 // Sampler Helper Function
 void BenchmarkShouldSampler(Sampler &sampler, benchmark::State &state)