Fix builds due to upstream OTEL proto path change (#3525)

* Update idl submodule with otel bump Signed-off-by: albertteoh <see.kwang.teoh@gmail.com> * Update proto-gen and sed Signed-off-by: albertteoh <see.kwang.teoh@gmail.com> * Update Makefile sed Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
jaegertracing · Feb 13, 2022 · ed5fa99 · ed5fa99
1 parent 96026e6
commit ed5fa99
Show file tree

Hide file tree

Showing 9 changed files with 211 additions and 264 deletions.
diff --git a/Makefile b/Makefile
@@ -534,7 +534,7 @@ proto: init-submodules proto-prepare-otel
 	# prevents panic of two equal proto types.
 	rm -rf $(PROTO_INTERMEDIATE_DIR)/*
 	cp -R idl/opentelemetry-proto/* $(PROTO_INTERMEDIATE_DIR)
-	find $(PROTO_INTERMEDIATE_DIR) -name "*.proto" | xargs -L 1 sed -i 's+github.com/open-telemetry/opentelemetry-proto/gen/go+github.com/jaegertracing/jaeger/proto-gen/otel+g'
+	find $(PROTO_INTERMEDIATE_DIR) -name "*.proto" | xargs -L 1 sed -i 's+go.opentelemetry.io/proto/otlp+github.com/jaegertracing/jaeger/proto-gen/otel+g'
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \
 		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v3 \

diff --git a/go.mod b/go.mod
@@ -45,6 +45,7 @@ require (
 	github.com/uber/jaeger-lib v2.4.1+incompatible
 	github.com/xdg-go/scram v1.1.0
 	go.opentelemetry.io/collector/model v0.44.0
+	go.opentelemetry.io/proto/otlp v0.7.0
 	go.uber.org/atomic v1.9.0
 	go.uber.org/automaxprocs v1.4.0
 	go.uber.org/zap v1.21.0

diff --git a/go.sum b/go.sum
@@ -838,6 +838,7 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA=
 go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU=
+go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

diff --git a/idl b/idl
diff --git a/otel_proto_patch.sed b/otel_proto_patch.sed
@@ -1,4 +1,4 @@
-s+github.com/open-telemetry/opentelemetry-proto/gen/go+github.com/jaegertracing/jaeger/proto-gen/otel+g
+s+go.opentelemetry.io/proto/otlp+github.com/jaegertracing/jaeger/proto-gen/otel+g
 
 s+ opentelemetry.proto+ jaeger+g
 s+import "opentelemetry/proto/+import "+g
diff --git a/proto-gen/api_v2/sampling.pb.go b/proto-gen/api_v2/sampling.pb.go
diff --git a/proto-gen/otel/common/v1/common.pb.go b/proto-gen/otel/common/v1/common.pb.go
diff --git a/proto-gen/otel/resource/v1/resource.pb.go b/proto-gen/otel/resource/v1/resource.pb.go