Add metrics reader interface and gen proto (#2977)

* Add metrics reader interface and gen proto Signed-off-by: albertteoh <[email protected]> * Move metrics proto to metrics package Signed-off-by: albertteoh <[email protected]> * service.proto -> metricsquery.proto Signed-off-by: albertteoh <[email protected]>
jaegertracing · May 6, 2021 · e08d812 · e08d812
1 parent f076065
commit e08d812
Show file tree

Hide file tree

Showing 9 changed files with 8,885 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -505,18 +505,18 @@ proto:
 
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \
-		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/metrics \
 		model/proto/metrics/otelspankind.proto
 
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \
-		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/metrics \
 		model/proto/metrics/otelmetric.proto
 
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \
-		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \
-		model/proto/metrics/service.proto
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/metrics \
+		model/proto/metrics/metricsquery.proto
 
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \

diff --git a/model/proto/metrics/service.proto → model/proto/metrics/metricsquery.proto b/model/proto/metrics/service.proto → model/proto/metrics/metricsquery.proto
@@ -14,16 +14,16 @@
 
 syntax="proto3";
 
-package jaeger.api_v2;
+package jaeger.api_v2.metrics;
 
 import "otelmetric.proto";
 import "otelspankind.proto";
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 
-option go_package = "api_v2";
-option java_package = "io.jaegertracing.api_v2";
+option go_package = "metrics";
+option java_package = "io.jaegertracing.api_v2.metrics";
 
 // Enable gogoprotobuf extensions (https://github.com/gogo/protobuf/blob/master/extensions.md).
 // Enable custom Marshal method.

diff --git a/model/proto/metrics/otelmetric.proto b/model/proto/metrics/otelmetric.proto
@@ -16,12 +16,12 @@
 
 syntax="proto3";
 
-package jaeger.api_v2;
+package jaeger.api_v2.metrics;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "api_v2";
-option java_package = "io.jaegertracing.api_v2";
+option go_package = "metrics";
+option java_package = "io.jaegertracing.api_v2.metrics";
 
 // Enable gogoprotobuf extensions (https://github.com/gogo/protobuf/blob/master/extensions.md).
 // Enable custom Marshal method.

diff --git a/model/proto/metrics/otelspankind.proto b/model/proto/metrics/otelspankind.proto
@@ -16,12 +16,12 @@
 
 syntax="proto3";
 
-package jaeger.api_v2;
+package jaeger.api_v2.metrics;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "api_v2";
-option java_package = "io.jaegertracing.api_v2";
+option go_package = "metrics";
+option java_package = "io.jaegertracing.api_v2.metrics";
 
 // Enable gogoprotobuf extensions (https://github.com/gogo/protobuf/blob/master/extensions.md).
 // Enable custom Marshal method.