From 452112b2c1923bc25513a4630d738bc88b3c2db4 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sat, 9 Sep 2023 21:56:30 -0400 Subject: [PATCH 1/3] Add Go type mapping for new timestamp fields from #95 Signed-off-by: Yuri Shkuro --- proto/api_v2/query.proto | 16 ++++++++++++---- proto/api_v3/query_service.proto | 8 ++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/proto/api_v2/query.proto b/proto/api_v2/query.proto index d2a6b15..43f1ccd 100644 --- a/proto/api_v2/query.proto +++ b/proto/api_v2/query.proto @@ -41,9 +41,13 @@ message GetTraceRequest { (gogoproto.customname) = "TraceID" ]; // Optional. The start time to search trace ID. - google.protobuf.Timestamp start_time = 2; + google.protobuf.Timestamp start_time = 2 [ + (gogoproto.stdtime) = true, + ]; // Optional. The end time to search trace ID. - google.protobuf.Timestamp end_time = 3; + google.protobuf.Timestamp end_time = 3 [ + (gogoproto.stdtime) = true, + ]; } message SpansResponseChunk { @@ -59,9 +63,13 @@ message ArchiveTraceRequest { (gogoproto.customname) = "TraceID" ]; // Optional. The start time to search trace ID. - google.protobuf.Timestamp start_time = 2; + google.protobuf.Timestamp start_time = 2 [ + (gogoproto.stdtime) = true, + ]; // Optional. The end time to search trace ID. - google.protobuf.Timestamp end_time = 3; + google.protobuf.Timestamp end_time = 3 [ + (gogoproto.stdtime) = true, + ]; } message ArchiveTraceResponse { diff --git a/proto/api_v3/query_service.proto b/proto/api_v3/query_service.proto index 1ddb02f..425b693 100644 --- a/proto/api_v3/query_service.proto +++ b/proto/api_v3/query_service.proto @@ -28,9 +28,13 @@ message GetTraceRequest { // Hex encoded 64 or 128 bit trace ID. string trace_id = 1; // Optional. The start time to search trace ID. - google.protobuf.Timestamp start_time = 2; + google.protobuf.Timestamp start_time = 2 [ + (gogoproto.stdtime) = true, + ]; // Optional. The end time to search trace ID. - google.protobuf.Timestamp end_time = 3; + google.protobuf.Timestamp end_time = 3 [ + (gogoproto.stdtime) = true, + ]; } // Response object with spans. From a226304f96ce47760f91addf23860a3270c6aed7 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sat, 9 Sep 2023 22:00:56 -0400 Subject: [PATCH 2/3] fix Signed-off-by: Yuri Shkuro --- proto/api_v2/query.proto | 8 ++++---- proto/api_v3/query_service.proto | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/proto/api_v2/query.proto b/proto/api_v2/query.proto index 43f1ccd..43c4969 100644 --- a/proto/api_v2/query.proto +++ b/proto/api_v2/query.proto @@ -42,11 +42,11 @@ message GetTraceRequest { ]; // Optional. The start time to search trace ID. google.protobuf.Timestamp start_time = 2 [ - (gogoproto.stdtime) = true, + (gogoproto.stdtime) = true ]; // Optional. The end time to search trace ID. google.protobuf.Timestamp end_time = 3 [ - (gogoproto.stdtime) = true, + (gogoproto.stdtime) = true ]; } @@ -64,11 +64,11 @@ message ArchiveTraceRequest { ]; // Optional. The start time to search trace ID. google.protobuf.Timestamp start_time = 2 [ - (gogoproto.stdtime) = true, + (gogoproto.stdtime) = true ]; // Optional. The end time to search trace ID. google.protobuf.Timestamp end_time = 3 [ - (gogoproto.stdtime) = true, + (gogoproto.stdtime) = true ]; } diff --git a/proto/api_v3/query_service.proto b/proto/api_v3/query_service.proto index 425b693..71ddcf8 100644 --- a/proto/api_v3/query_service.proto +++ b/proto/api_v3/query_service.proto @@ -29,11 +29,11 @@ message GetTraceRequest { string trace_id = 1; // Optional. The start time to search trace ID. google.protobuf.Timestamp start_time = 2 [ - (gogoproto.stdtime) = true, + (gogoproto.stdtime) = true ]; // Optional. The end time to search trace ID. google.protobuf.Timestamp end_time = 3 [ - (gogoproto.stdtime) = true, + (gogoproto.stdtime) = true ]; } From a741d4d9202eb381aa658b6907c9b26f7bdb04cd Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sat, 9 Sep 2023 22:05:00 -0400 Subject: [PATCH 3/3] import Signed-off-by: Yuri Shkuro --- proto/api_v3/query_service.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/proto/api_v3/query_service.proto b/proto/api_v3/query_service.proto index 71ddcf8..b809e94 100644 --- a/proto/api_v3/query_service.proto +++ b/proto/api_v3/query_service.proto @@ -17,6 +17,7 @@ syntax="proto3"; package jaeger.api_v3; import "opentelemetry/proto/trace/v1/trace.proto"; +import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto";