Merge branch 'main' into add_es_log_record_exporter_tests

open-telemetry · Nov 22, 2024 · 92e96e1 · 92e96e1
2 parents b006b8d + 4341e12
commit 92e96e1
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 257 deletions.
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
@@ -88,10 +88,10 @@ def opentelemetry_cpp_deps():
         http_archive,
         name = "com_github_opentelemetry_proto",
         build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "c069c0d96137cf005d34411fa67dd3b6f1f8c64af1e7fb2fe0089a41c425acd7",
-        strip_prefix = "opentelemetry-proto-1.3.2",
+        sha256 = "53cd32cedb27762ea2060a9c8d83e4b822de13d73b5d5d37a2db3cf55018d694",
+        strip_prefix = "opentelemetry-proto-1.4.0",
         urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.3.2.tar.gz",
+            "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.4.0.tar.gz",
         ],
     )
 

diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
@@ -49,7 +49,7 @@ else()
          "opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)")
         set(opentelemetry-proto "${CMAKE_MATCH_1}")
       else()
-        set(opentelemetry-proto "v1.3.2")
+        set(opentelemetry-proto "v1.4.0")
       endif()
       unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT)
     endif()
@@ -81,10 +81,7 @@ set(LOGS_PROTO "${PROTO_PATH}/opentelemetry/proto/logs/v1/logs.proto")
 set(METRICS_PROTO "${PROTO_PATH}/opentelemetry/proto/metrics/v1/metrics.proto")
 
 set(PROFILES_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/profiles/v1experimental/profiles.proto")
-set(PROFILES_EXT_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/profiles/v1experimental/pprofextended.proto"
-)
+    "${PROTO_PATH}/opentelemetry/proto/profiles/v1development/profiles.proto")
 
 set(TRACE_SERVICE_PROTO
     "${PROTO_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.proto")
@@ -95,7 +92,7 @@ set(METRICS_SERVICE_PROTO
 )
 
 set(PROFILES_SERVICE_PROTO
-    "${PROTO_PATH}/opentelemetry/proto/collector/profiles/v1experimental/profiles_service.proto"
+    "${PROTO_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.proto"
 )
 
 set(GENERATED_PROTOBUF_PATH
@@ -138,30 +135,24 @@ set(TRACE_SERVICE_PB_H_FILE
 #
 
 set(PROFILES_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1experimental/profiles.pb.cc"
+    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1development/profiles.pb.cc"
 )
 set(PROFILES_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1experimental/profiles.pb.h"
-)
-set(PROFILES_EXT_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1experimental/pprofextended.pb.cc"
-)
-set(PROFILES_EXT_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1experimental/pprofextended.pb.h"
+    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/profiles/v1development/profiles.pb.h"
 )
 set(PROFILES_SERVICE_PB_H_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1experimental/profiles_service.pb.h"
+    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.pb.h"
 )
 set(PROFILES_SERVICE_PB_CPP_FILE
-    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1experimental/profiles_service.pb.cc"
+    "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.pb.cc"
 )
 
 if(WITH_OTLP_GRPC)
   set(PROFILES_SERVICE_GRPC_PB_H_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1experimental/profiles_service.grpc.pb.h"
+      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.grpc.pb.h"
   )
   set(PROFILES_SERVICE_GRPC_PB_CPP_FILE
-      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1experimental/profiles_service.grpc.pb.cc"
+      "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/profiles/v1development/profiles_service.grpc.pb.cc"
   )
 endif()
 
@@ -243,8 +234,6 @@ set(PROTOBUF_GENERATED_FILES
     ${METRICS_PB_CPP_FILE}
     ${PROFILES_H_FILE}
     ${PROFILES_CPP_FILE}
-    ${PROFILES_EXT_H_FILE}
-    ${PROFILES_EXT_CPP_FILE}
     ${TRACE_SERVICE_PB_H_FILE}
     ${TRACE_SERVICE_PB_CPP_FILE}
     ${LOGS_SERVICE_PB_H_FILE}
@@ -283,7 +272,6 @@ foreach(
   ${LOGS_PROTO}
   ${METRICS_PROTO}
   ${PROFILES_PROTO}
-  ${PROFILES_EXT_PROTO}
   ${TRACE_SERVICE_PROTO}
   ${LOGS_SERVICE_PROTO}
   ${METRICS_SERVICE_PROTO}
@@ -298,7 +286,7 @@ add_custom_command(
     ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTOBUF_COMMON_FLAGS}
     ${PROTOBUF_INCLUDE_FLAGS} ${COMMON_PROTO} ${RESOURCE_PROTO} ${TRACE_PROTO}
     ${LOGS_PROTO} ${METRICS_PROTO} ${TRACE_SERVICE_PROTO} ${LOGS_SERVICE_PROTO}
-    ${METRICS_SERVICE_PROTO} ${PROFILES_PROTO} ${PROFILES_EXT_PROTO}
+    ${METRICS_SERVICE_PROTO} ${PROFILES_PROTO}
     ${PROFILES_SERVICE_PROTO}
   COMMENT "[Run]: ${PROTOBUF_RUN_PROTOC_COMMAND}")