@@ -16,11 +16,11 @@ endef
16
16
OPENTELEMETRY_PROTO_SRC_DIR =.tmp/opentelemetry-proto
17
17
18
18
# 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
20
20
21
21
# Find all .proto files.
22
22
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) )
24
24
25
25
# Target directory to write generated files to.
26
26
# PROTO_TARGET_GEN_DIR=otlp
@@ -35,7 +35,7 @@ PROTO_PACKAGE=github.com/grafana/pyroscope/$(PROTO_TARGET_GEN_DIR)
35
35
# Intermediate directory used during generation.
36
36
PROTO_INTERMEDIATE_DIR =.tmp/patched-otlp-proto
37
37
38
- DOCKER_PROTOBUF ?= otel/build-protobuf:0.9 .0
38
+ DOCKER_PROTOBUF ?= otel/build-protobuf:0.23 .0
39
39
PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD}/$(PROTO_INTERMEDIATE_DIR ) ${DOCKER_PROTOBUF} --proto_path=${PWD}
40
40
PROTO_INCLUDES := -I/usr/include/github.com/gogo/protobuf -I./
41
41
@@ -72,7 +72,7 @@ genproto_sub:
72
72
# reserved 1000 -> repeated ScopeLogs deprecated_scope_logs = 1000;
73
73
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
74
74
# 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
76
76
# reserved 1000 -> repeated ScopeMetrics deprecated_scope_metrics = 1000;
77
77
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
78
78
# reserved 1000 -> repeated ScopeSpans deprecated_scope_spans = 1000;
0 commit comments