From 7728794957b99056be3a28e6e525e79bf8b353bd Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Sun, 17 Nov 2024 16:42:01 -0500 Subject: [PATCH] Change start/end time to non-nullable (#109) ## Which problem is this PR solving? - Part of https://github.com/jaegertracing/jaeger/issues/4150 ## Description of the changes - Make time values non-nullable to avoid pointers ## How was this change tested? - In https://github.com/jaegertracing/jaeger/pull/6218 --------- Signed-off-by: Yuri Shkuro --- Makefile | 4 +++- proto/api_v2/query.proto | 6 ++++-- proto/api_v3/query_service.proto | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index da10c03..ebe619d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ +# Copyright (c) 2023 The Jaeger Authors. +# SPDX-License-Identifier: Apache-2.0 -THRIFT_VER?=0.13 +THRIFT_VER?=0.19 THRIFT_IMG?=jaegertracing/thrift:$(THRIFT_VER) THRIFT=docker run --rm -u $(shell id -u) -v "${PWD}:/data" $(THRIFT_IMG) thrift diff --git a/proto/api_v2/query.proto b/proto/api_v2/query.proto index 43c4969..7c69b3a 100644 --- a/proto/api_v2/query.proto +++ b/proto/api_v2/query.proto @@ -42,11 +42,13 @@ message GetTraceRequest { ]; // Optional. The start time to search trace ID. google.protobuf.Timestamp start_time = 2 [ - (gogoproto.stdtime) = true + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false ]; // Optional. The end time to search trace ID. google.protobuf.Timestamp end_time = 3 [ - (gogoproto.stdtime) = true + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false ]; } diff --git a/proto/api_v3/query_service.proto b/proto/api_v3/query_service.proto index 61feed0..ebf125e 100644 --- a/proto/api_v3/query_service.proto +++ b/proto/api_v3/query_service.proto @@ -30,11 +30,13 @@ 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, + (gogoproto.nullable) = false ]; // Optional. The end time to search trace ID. google.protobuf.Timestamp end_time = 3 [ - (gogoproto.stdtime) = true + (gogoproto.stdtime) = true, + (gogoproto.nullable) = false ]; }