Skip to content

Commit 836c495

Browse files
authored
chore(otel): update to new otlp version (#3796)
1 parent 29c8f6f commit 836c495

File tree

9 files changed

+2418
-3466
lines changed

9 files changed

+2418
-3466
lines changed

api/otlp/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ endef
1616
OPENTELEMETRY_PROTO_SRC_DIR=.tmp/opentelemetry-proto
1717

1818
# The SHA matching the current version of the proto to use
19-
OPENTELEMETRY_PROTO_VERSION=v1.3.2
19+
OPENTELEMETRY_PROTO_VERSION=v1.5.0
2020

2121
# Find all .proto files.
2222

23-
OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1experimental/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1experimental/*.proto))
23+
OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1development/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1development/*.proto))
2424

2525
# Target directory to write generated files to.
2626
# PROTO_TARGET_GEN_DIR=otlp
@@ -35,7 +35,7 @@ PROTO_PACKAGE=github.com/grafana/pyroscope/$(PROTO_TARGET_GEN_DIR)
3535
# Intermediate directory used during generation.
3636
PROTO_INTERMEDIATE_DIR=.tmp/patched-otlp-proto
3737

38-
DOCKER_PROTOBUF ?= otel/build-protobuf:0.9.0
38+
DOCKER_PROTOBUF ?= otel/build-protobuf:0.23.0
3939
PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD}/$(PROTO_INTERMEDIATE_DIR) ${DOCKER_PROTOBUF} --proto_path=${PWD}
4040
PROTO_INCLUDES := -I/usr/include/github.com/gogo/protobuf -I./
4141

@@ -72,7 +72,7 @@ genproto_sub:
7272
# reserved 1000 -> repeated ScopeLogs deprecated_scope_logs = 1000;
7373
sed 's/reserved 1000;/repeated ScopeLogs deprecated_scope_logs = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/logs/v1/logs.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/logs/v1/logs.proto
7474
# reserved 1000 -> repeated ScopeProfiles deprecated_scope_profiles = 1000;
75-
sed 's/reserved 1000;/repeated ScopeProfiles deprecated_scope_profiles = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/profiles/v1experimental/profiles.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/profiles/v1experimental/profiles.proto
75+
sed 's/reserved 1000;/repeated ScopeProfiles deprecated_scope_profiles = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/profiles/v1development/profiles.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/profiles/v1development/profiles.proto
7676
# reserved 1000 -> repeated ScopeMetrics deprecated_scope_metrics = 1000;
7777
sed 's/reserved 1000;/repeated ScopeMetrics deprecated_scope_metrics = 1000;/g' $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/metrics/v1/metrics.proto 1<> $(PROTO_INTERMEDIATE_DIR)/opentelemetry/proto/metrics/v1/metrics.proto
7878
# reserved 1000 -> repeated ScopeSpans deprecated_scope_spans = 1000;

api/otlp/collector/profiles/v1experimental/profiles_service.pb.go renamed to api/otlp/collector/profiles/v1development/profiles_service.pb.go

Lines changed: 49 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)