From 4790f28390b6bb5d8d092631988557bbe1bc8622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Jamr=C3=B3z?= Date: Tue, 8 Apr 2025 12:56:01 +0200 Subject: [PATCH] Tempo: Temporarily skip new proto fields (#103586) --- pkg/tsdb/tempo/traceql_query.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/tempo/traceql_query.go b/pkg/tsdb/tempo/traceql_query.go index 38c07f48767..43eea31f04c 100644 --- a/pkg/tsdb/tempo/traceql_query.go +++ b/pkg/tsdb/tempo/traceql_query.go @@ -101,7 +101,12 @@ func (s *Service) runTraceQlQueryMetrics(ctx context.Context, pCtx backend.Plugi result.Frames = frames } else { var queryResponse tempopb.QueryRangeResponse - err = jsonpb.Unmarshal(bytes.NewReader(responseBody), &queryResponse) + // Temporarily allow extra fields until proto changes are available (https://github.com/grafana/tempo/pull/4525) + unmarshaler := jsonpb.Unmarshaler{ + AllowUnknownFields: true, + } + + err = unmarshaler.Unmarshal(bytes.NewReader(responseBody), &queryResponse) if res, err := handleConversionError(ctxLogger, span, err); err != nil { return res, err