Skip to content

Commit d12476f

Browse files
Remove google.golang.org/protobuf dependency from model & storage APIs (#4917)
## Which problem is this PR solving? - Part of #4911 ## Description of the changes - using `google.golang.org/protobuf` in place of `github.com/golang/protobuf` - `github.com/golang/protobuf` is not completely removed it is still being used as an indirect dependency ## How was this change tested? - `make test` ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --------- Signed-off-by: Harshvir Potpose <hpotpose62@gmail.com> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
1 parent 90906f1 commit d12476f

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ SWAGGER_IMAGE=quay.io/goswagger/swagger:v$(SWAGGER_VER)
8686
SWAGGER=docker run --rm -it -u ${shell id -u} -v "${PWD}:/go/src/" -w /go/src/ $(SWAGGER_IMAGE)
8787
SWAGGER_GEN_DIR=swagger-gen
8888

89-
JAEGER_DOCKER_PROTOBUF=jaegertracing/protobuf:0.3.0
89+
JAEGER_DOCKER_PROTOBUF=jaegertracing/protobuf:0.4.0
9090

9191
COLOR_PASS=$(shell printf "\033[32mPASS\033[0m")
9292
COLOR_FAIL=$(shell printf "\033[31mFAIL\033[0m")
@@ -642,12 +642,12 @@ proto: proto-prepare-otel
642642

643643
$(PROTOC) \
644644
-Imodel/proto \
645-
--go_out=$(PWD)/model/prototest/ \
645+
--go_out=$(PWD)/model/ \
646646
model/proto/model_test.proto
647647

648648
$(PROTOC) \
649649
-Iplugin/storage/grpc/proto \
650-
--go_out=$(PWD)/plugin/storage/grpc/proto/storageprototest/ \
650+
--go_out=$(PWD)/plugin/storage/grpc/proto/ \
651651
plugin/storage/grpc/proto/storage_test.proto
652652

653653
$(PROTOC) \

model/proto/model_test.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ syntax="proto3";
1616

1717
package prototest;
1818

19+
option go_package = "./prototest";
20+
1921
enum SpanRefType {
2022
CHILD_OF = 0;
2123
FOLLOWS_FROM = 1;

model/prototest/model_test.pb.go

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/storage/grpc/proto/storage_test.proto

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ syntax="proto3";
1616

1717
package storageprototest;
1818

19+
option go_package = "./storageprototest";
20+
1921
message GetTraceRequest {
2022
bytes trace_id = 1;
2123
}

plugin/storage/grpc/proto/storageprototest/storage_test.pb.go

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)