From 1a5b2621e204c60c84b77c95eb8d5b8a0587fdec Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sun, 19 Jan 2025 23:08:49 -0400 Subject: [PATCH] Bump jaeger-idl (#6569) ## 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 https://github.com/jaegertracing/jaeger-idl/pull/118 ## How was this change tested? - CI Signed-off-by: Yuri Shkuro --- Makefile.Protobuf.mk | 16 ++++++++++++---- idl | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile.Protobuf.mk b/Makefile.Protobuf.mk index 843e3889b95..e0d1d5a06d8 100644 --- a/Makefile.Protobuf.mk +++ b/Makefile.Protobuf.mk @@ -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: diff --git a/idl b/idl index 63f6e7e5b13..2a6ba696070 160000 --- a/idl +++ b/idl @@ -1 +1 @@ -Subproject commit 63f6e7e5b134ec6fb78830f48bd4bd2f1e8fd295 +Subproject commit 2a6ba6960701dc52abdc98a4671af0c5646e3734