From d6697ddde42850fcb017d1287b51185c4e4b27d5 Mon Sep 17 00:00:00 2001 From: Christian Simon Date: Mon, 16 Jun 2025 13:27:02 +0100 Subject: [PATCH] [release-11.6.3] Profiles: Stop passing response headers for Grafana-Pyroscope and parca datasources (#106729) Profiles: Stop passing response headers for Grafana-Pyroscope and parca datasources (#106577) * Revert "pkgs/tsdb/[grafana-pyroscope-datasource|parca]: Fix use of request headers in responses" This reverts commit 8bac68e906bbb6d075da45397014fb7091fbab23. * Profiles: Stop passing request/response headers to the backend (cherry picked from commit 8fdf86e56f19c619bbcdc89a6780292a6fae2db0) --- pkg/tsdb/grafana-pyroscope-datasource/instance.go | 6 +++--- pkg/tsdb/parca/resources.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/tsdb/grafana-pyroscope-datasource/instance.go b/pkg/tsdb/grafana-pyroscope-datasource/instance.go index c69ec2ceabb..6449e3b2076 100644 --- a/pkg/tsdb/grafana-pyroscope-datasource/instance.go +++ b/pkg/tsdb/grafana-pyroscope-datasource/instance.go @@ -119,7 +119,7 @@ func (d *PyroscopeDatasource) profileTypes(ctx context.Context, req *backend.Cal ctxLogger.Error("Failed to marshal response", "error", err, "function", logEntrypoint()) return err } - err = sender.Send(&backend.CallResourceResponse{Body: bodyData, Headers: req.Headers, Status: 200}) + err = sender.Send(&backend.CallResourceResponse{Body: bodyData, Status: 200}) if err != nil { ctxLogger.Error("Failed to send response", "error", err, "function", logEntrypoint()) return err @@ -167,7 +167,7 @@ func (d *PyroscopeDatasource) labelNames(ctx context.Context, req *backend.CallR ctxLogger.Error("Failed to marshal response", "error", err, "function", logEntrypoint()) return err } - err = sender.Send(&backend.CallResourceResponse{Body: jsonResponse, Headers: req.Headers, Status: 200}) + err = sender.Send(&backend.CallResourceResponse{Body: jsonResponse, Status: 200}) if err != nil { ctxLogger.Error("Failed to send response", "error", err, "function", logEntrypoint()) return err @@ -207,7 +207,7 @@ func (d *PyroscopeDatasource) labelValues(ctx context.Context, req *backend.Call return err } - err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200}) + err = sender.Send(&backend.CallResourceResponse{Body: data, Status: 200}) if err != nil { ctxLogger.Error("Failed to send response", "error", err, "function", logEntrypoint()) return err diff --git a/pkg/tsdb/parca/resources.go b/pkg/tsdb/parca/resources.go index f49dd4592d6..08a4b0a5231 100644 --- a/pkg/tsdb/parca/resources.go +++ b/pkg/tsdb/parca/resources.go @@ -65,7 +65,7 @@ func (d *ParcaDatasource) callProfileTypes(ctx context.Context, req *backend.Cal span.SetStatus(codes.Error, err.Error()) return err } - err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200}) + err = sender.Send(&backend.CallResourceResponse{Body: data, Status: 200}) if err != nil { ctxLogger.Error("Failed to send data to Parca", "error", err, "function", logEntrypoint()) span.RecordError(err) @@ -98,7 +98,7 @@ func (d *ParcaDatasource) callLabelNames(ctx context.Context, req *backend.CallR span.SetStatus(codes.Error, err.Error()) return err } - err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200}) + err = sender.Send(&backend.CallResourceResponse{Body: data, Status: 200}) if err != nil { ctxLogger.Error("Failed to send data to Parca", "error", err, "function", logEntrypoint()) span.RecordError(err) @@ -142,7 +142,7 @@ func (d *ParcaDatasource) callLabelValues(ctx context.Context, req *backend.Call span.SetStatus(codes.Error, err.Error()) return err } - err = sender.Send(&backend.CallResourceResponse{Body: data, Headers: req.Headers, Status: 200}) + err = sender.Send(&backend.CallResourceResponse{Body: data, Status: 200}) if err != nil { ctxLogger.Error("Failed to send data to Parca", "error", err, "function", logEntrypoint()) span.RecordError(err)