Skip to content

Commit 1a5b262

Browse files
authored
Bump jaeger-idl (jaegertracing#6569)
## Which problem is this PR solving? - Part of jaegertracing#6494 ## Description of the changes - Bump jaeger-idl submodule - Adjust code gen to account for different custom types due to jaegertracing/jaeger-idl#118 ## How was this change tested? - CI Signed-off-by: Yuri Shkuro <[email protected]>
1 parent 97c6a33 commit 1a5b262

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

Makefile.Protobuf.mk

+12-4
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,19 @@ proto-model:
9191
$(call proto_compile, model, idl/proto/api_v2/model.proto)
9292
$(PROTOC) -Imodel/proto --go_out=$(PWD)/model/ model/proto/model_test.proto
9393

94+
API_V2_PATCHED_DIR=proto-gen/.patched/api_v2
95+
.PHONY: patch-api-v2
96+
patch-api-v2:
97+
mkdir -p $(API_V2_PATCHED_DIR)
98+
cp idl/proto/api_v2/collector.proto $(API_V2_PATCHED_DIR)/
99+
cp idl/proto/api_v2/sampling.proto $(API_V2_PATCHED_DIR)/
100+
cat idl/proto/api_v2/query.proto | $(SED) 's|jaegertracing/jaeger-idl/model/v1.|jaegertracing/jaeger/model.|g' > $(API_V2_PATCHED_DIR)/query.proto
101+
94102
.PHONY: proto-api-v2
95-
proto-api-v2:
96-
$(call proto_compile, proto-gen/api_v2, idl/proto/api_v2/query.proto)
97-
$(call proto_compile, proto-gen/api_v2, idl/proto/api_v2/collector.proto)
98-
$(call proto_compile, proto-gen/api_v2, idl/proto/api_v2/sampling.proto)
103+
proto-api-v2: patch-api-v2
104+
$(call proto_compile, proto-gen/api_v2, $(API_V2_PATCHED_DIR)/query.proto)
105+
$(call proto_compile, proto-gen/api_v2, $(API_V2_PATCHED_DIR)/collector.proto)
106+
$(call proto_compile, proto-gen/api_v2, $(API_V2_PATCHED_DIR)/sampling.proto)
99107

100108
.PHONY: proto-openmetrics
101109
proto-openmetrics:

0 commit comments

Comments
 (0)