Tempo: Temporarily skip new proto fields (#103586)

2025-04-08 12:56:01 +02:00
parent 4f05b42275
commit 4790f28390
1 changed files with 6 additions and 1 deletions
@@ -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