fix

Signed-off-by: Harshvir Potpose <[email protected]>
jaegertracing · Nov 4, 2023 · 5183123 · 5183123
1 parent 2d90df9
commit 5183123
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -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) \

diff --git a/go.mod b/go.mod
@@ -23,6 +23,7 @@ require (
 	github.com/gocql/gocql v1.3.2
 	github.com/gogo/googleapis v1.4.1
 	github.com/gogo/protobuf v1.3.2
+	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -120,7 +121,6 @@ require (
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
 	github.com/google/uuid v1.3.1 // indirect

diff --git a/model/proto/model_test.proto b/model/proto/model_test.proto
@@ -16,6 +16,8 @@ syntax="proto3";
 
 package prototest;
 
+option go_package = "./prototest";
+
 enum SpanRefType {
     CHILD_OF = 0;
     FOLLOWS_FROM = 1;

diff --git a/model/prototest/model_test.pb.go b/model/prototest/model_test.pb.go
diff --git a/plugin/storage/grpc/proto/storage_test.proto b/plugin/storage/grpc/proto/storage_test.proto
@@ -16,6 +16,8 @@ syntax="proto3";
 
 package storageprototest;
 
+option go_package = "./storageprototest";
+
 message GetTraceRequest {
     bytes trace_id = 1;
 }
diff --git a/plugin/storage/grpc/proto/storageprototest/storage_test.pb.go b/plugin/storage/grpc/proto/storageprototest/storage_test.pb.go
diff --git a/proto-gen/api_v3/query_service.pb.gw.go b/proto-gen/api_v3/query_service.pb.gw.go