Skip to content

Commit

Permalink
Bump jaeger-idl (#6569)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
- Part of #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 <github@ysh.us>
  • Loading branch information
yurishkuro authored Jan 20, 2025
1 parent 97c6a33 commit 1a5b262
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions Makefile.Protobuf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,19 @@ proto-model:
$(call proto_compile, model, idl/proto/api_v2/model.proto)
$(PROTOC) -Imodel/proto --go_out=$(PWD)/model/ model/proto/model_test.proto

API_V2_PATCHED_DIR=proto-gen/.patched/api_v2
.PHONY: patch-api-v2
patch-api-v2:
mkdir -p $(API_V2_PATCHED_DIR)
cp idl/proto/api_v2/collector.proto $(API_V2_PATCHED_DIR)/
cp idl/proto/api_v2/sampling.proto $(API_V2_PATCHED_DIR)/
cat idl/proto/api_v2/query.proto | $(SED) 's|jaegertracing/jaeger-idl/model/v1.|jaegertracing/jaeger/model.|g' > $(API_V2_PATCHED_DIR)/query.proto

.PHONY: proto-api-v2
proto-api-v2:
$(call proto_compile, proto-gen/api_v2, idl/proto/api_v2/query.proto)
$(call proto_compile, proto-gen/api_v2, idl/proto/api_v2/collector.proto)
$(call proto_compile, proto-gen/api_v2, idl/proto/api_v2/sampling.proto)
proto-api-v2: patch-api-v2
$(call proto_compile, proto-gen/api_v2, $(API_V2_PATCHED_DIR)/query.proto)
$(call proto_compile, proto-gen/api_v2, $(API_V2_PATCHED_DIR)/collector.proto)
$(call proto_compile, proto-gen/api_v2, $(API_V2_PATCHED_DIR)/sampling.proto)

.PHONY: proto-openmetrics
proto-openmetrics:
Expand Down

0 comments on commit 1a5b262

Please sign in to comment.