Skip to content

Commit

Permalink
Remove google.golang.org/protobuf dependency from model & storage APIs (
Browse files Browse the repository at this point in the history
#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 <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
  • Loading branch information
akagami-harsh and yurishkuro authored Nov 8, 2023
1 parent 90906f1 commit d12476f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 18 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ SWAGGER_IMAGE=quay.io/goswagger/swagger:v$(SWAGGER_VER)
SWAGGER=docker run --rm -it -u ${shell id -u} -v "${PWD}:/go/src/" -w /go/src/ $(SWAGGER_IMAGE)
SWAGGER_GEN_DIR=swagger-gen

JAEGER_DOCKER_PROTOBUF=jaegertracing/protobuf:0.3.0
JAEGER_DOCKER_PROTOBUF=jaegertracing/protobuf:0.4.0

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

$(PROTOC) \
-Imodel/proto \
--go_out=$(PWD)/model/prototest/ \
--go_out=$(PWD)/model/ \
model/proto/model_test.proto

$(PROTOC) \
-Iplugin/storage/grpc/proto \
--go_out=$(PWD)/plugin/storage/grpc/proto/storageprototest/ \
--go_out=$(PWD)/plugin/storage/grpc/proto/ \
plugin/storage/grpc/proto/storage_test.proto

$(PROTOC) \
Expand Down
2 changes: 2 additions & 0 deletions model/proto/model_test.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ syntax="proto3";

package prototest;

option go_package = "./prototest";

enum SpanRefType {
CHILD_OF = 0;
FOLLOWS_FROM = 1;
Expand Down
12 changes: 4 additions & 8 deletions model/prototest/model_test.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions plugin/storage/grpc/proto/storage_test.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ syntax="proto3";

package storageprototest;

option go_package = "./storageprototest";

message GetTraceRequest {
bytes trace_id = 1;
}
11 changes: 4 additions & 7 deletions plugin/storage/grpc/proto/storageprototest/storage_test.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d12476f

Please sign in to comment.