From e00e4d9ec6066722d6f7c22f9267ddc893d7739a Mon Sep 17 00:00:00 2001 From: Joey <90795735+joey-grafana@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:14:26 +0000 Subject: [PATCH] Pyroscope: Switch to sdk httpclient from infra httpclient (#79373) Decouple httpclient --- pkg/tsdb/grafana-pyroscope-datasource/service.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/grafana-pyroscope-datasource/service.go b/pkg/tsdb/grafana-pyroscope-datasource/service.go index f80f18c8053..0a019ad74ef 100644 --- a/pkg/tsdb/grafana-pyroscope-datasource/service.go +++ b/pkg/tsdb/grafana-pyroscope-datasource/service.go @@ -8,8 +8,8 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend" "github.com/grafana/grafana-plugin-sdk-go/backend/datasource" + "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" "github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt" - "github.com/grafana/grafana/pkg/infra/httpclient" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/accesscontrol" ) @@ -64,14 +64,14 @@ func (s *Service) getInstance(ctx context.Context, pluginCtx backend.PluginConte return in, nil } -func ProvideService(httpClientProvider httpclient.Provider, ac accesscontrol.AccessControl) *Service { +func ProvideService(httpClientProvider *httpclient.Provider, ac accesscontrol.AccessControl) *Service { return &Service{ im: datasource.NewInstanceManager(newInstanceSettings(httpClientProvider, ac)), logger: logger, } } -func newInstanceSettings(httpClientProvider httpclient.Provider, ac accesscontrol.AccessControl) datasource.InstanceFactoryFunc { +func newInstanceSettings(httpClientProvider *httpclient.Provider, ac accesscontrol.AccessControl) datasource.InstanceFactoryFunc { return func(ctx context.Context, settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) { return NewPyroscopeDatasource(ctx, httpClientProvider, settings, ac) }