Skip to content

Commit

Permalink
[EXPORTER] Upgrade to opentelemetry-proto 1.4.0 (#3157)
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcalff
marcalff authored Nov 21, 2024
1 parent 4d9cc28 commit fe68d51
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 27 deletions.
6 changes: 3 additions & 3 deletions bazel/repository.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
32 changes: 10 additions & 22 deletions cmake/opentelemetry-proto.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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")
Expand All @@ -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
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -283,7 +272,6 @@ foreach(
${LOGS_PROTO}
${METRICS_PROTO}
${PROFILES_PROTO}
${PROFILES_EXT_PROTO}
${TRACE_SERVICE_PROTO}
${LOGS_SERVICE_PROTO}
${METRICS_SERVICE_PROTO}
Expand All @@ -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}")

Expand Down
2 changes: 1 addition & 1 deletion third_party/opentelemetry-proto
Submodule opentelemetry-proto updated 14 files
+2 −11 .github/CODEOWNERS
+27 −0 CHANGELOG.md
+1 −1 CONTRIBUTING.md
+12 −11 Makefile
+4 −4 README.md
+31 −21 docs/specification.md
+5 −4 examples/README.md
+75 −0 examples/events.json
+33 −0 examples/metrics.json
+6 −6 opentelemetry/proto/collector/profiles/v1development/profiles_service.proto
+2 −2 opentelemetry/proto/collector/profiles/v1development/profiles_service_http.yaml
+24 −3 opentelemetry/proto/metrics/v1/metrics.proto
+215 −112 opentelemetry/proto/profiles/v1development/profiles.proto
+0 −191 opentelemetry/proto/profiles/v1experimental/profiles.proto
2 changes: 1 addition & 1 deletion third_party_release
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ benchmark=v1.8.3
googletest=1.14.0
ms-gsl=v3.1.0-67-g6f45293
nlohmann-json=v3.11.3
opentelemetry-proto=v1.3.2
opentelemetry-proto=v1.4.0
opentracing-cpp=v1.6.0
prometheus-cpp=v1.3.0
vcpkg=2024.02.14

1 comment on commit fe68d51

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp api Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: fe68d51 Previous: 4d9cc28 Ratio
BM_SpinLockThrashing/4/process_time/real_time 1.3764823476473491 ms/iter 0.6833334861717788 ms/iter 2.01
BM_ProcYieldSpinLockThrashing/2/process_time/real_time 0.5779888318932574 ms/iter 0.20378167353597101 ms/iter 2.84
BM_ProcYieldSpinLockThrashing/4/process_time/real_time 1.900983036012578 ms/iter 0.7076752491486378 ms/iter 2.69
BM_NaiveSpinLockThrashing/2/process_time/real_time 0.7327411134364241 ms/iter 0.1895427703857422 ms/iter 3.87
BM_NaiveSpinLockThrashing/4/process_time/real_time 1.6654021498085796 ms/iter 0.7080567510504472 ms/iter 2.35

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.