diff --git a/pkg/services/ngalert/ngalert.go b/pkg/services/ngalert/ngalert.go index aac3a453571..c86a1d00c30 100644 --- a/pkg/services/ngalert/ngalert.go +++ b/pkg/services/ngalert/ngalert.go @@ -346,7 +346,7 @@ func (ng *AlertNG) init() error { evalFactory := eval.NewEvaluatorFactory(ng.Cfg.UnifiedAlerting, ng.DataSourceCache, ng.ExpressionService) conditionValidator := eval.NewConditionValidator(ng.DataSourceCache, ng.ExpressionService, ng.pluginsStore) - recordingWriter, err := createRecordingWriter(ng.FeatureToggles, ng.Cfg.UnifiedAlerting.RecordingRules, ng.httpClientProvider, clk, ng.tracer, ng.Metrics.GetRemoteWriterMetrics()) + recordingWriter, err := createRecordingWriter(ng.FeatureToggles, ng.Cfg.UnifiedAlerting.RecordingRules, ng.httpClientProvider, clk, ng.Metrics.GetRemoteWriterMetrics()) if err != nil { return fmt.Errorf("failed to initialize recording writer: %w", err) } @@ -663,11 +663,11 @@ func createRemoteAlertmanager(cfg remote.AlertmanagerConfig, kvstore kvstore.KVS return remote.NewAlertmanager(cfg, notifier.NewFileStore(cfg.OrgID, kvstore), decryptFn, autogenFn, m, tracer) } -func createRecordingWriter(featureToggles featuremgmt.FeatureToggles, settings setting.RecordingRuleSettings, httpClientProvider httpclient.Provider, clock clock.Clock, tracer tracing.Tracer, m *metrics.RemoteWriter) (schedule.RecordingWriter, error) { +func createRecordingWriter(featureToggles featuremgmt.FeatureToggles, settings setting.RecordingRuleSettings, httpClientProvider httpclient.Provider, clock clock.Clock, m *metrics.RemoteWriter) (schedule.RecordingWriter, error) { logger := log.New("ngalert.writer") if featureToggles.IsEnabledGlobally(featuremgmt.FlagGrafanaManagedRecordingRules) { - return writer.NewPrometheusWriter(settings, httpClientProvider, clock, tracer, logger, m) + return writer.NewPrometheusWriter(settings, httpClientProvider, clock, logger, m) } return writer.NoopWriter{}, nil diff --git a/pkg/services/ngalert/schedule/recording_rule_test.go b/pkg/services/ngalert/schedule/recording_rule_test.go index c46144c6d58..8dba179927d 100644 --- a/pkg/services/ngalert/schedule/recording_rule_test.go +++ b/pkg/services/ngalert/schedule/recording_rule_test.go @@ -19,7 +19,6 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient" "github.com/grafana/grafana/pkg/expr" "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/ngalert/metrics" models "github.com/grafana/grafana/pkg/services/ngalert/models" @@ -532,7 +531,7 @@ func withQueryForHealth(health string) models.AlertRuleMutator { func setupWriter(t *testing.T, target *writer.TestRemoteWriteTarget, reg prometheus.Registerer) *writer.PrometheusWriter { provider := testClientProvider{} m := metrics.NewNGAlert(reg) - wr, err := writer.NewPrometheusWriter(target.ClientSettings(), provider, clock.NewMock(), tracing.InitializeTracerForTest(), log.NewNopLogger(), m.GetRemoteWriterMetrics()) + wr, err := writer.NewPrometheusWriter(target.ClientSettings(), provider, clock.NewMock(), log.NewNopLogger(), m.GetRemoteWriterMetrics()) require.NoError(t, err) return wr } diff --git a/pkg/services/ngalert/writer/prom.go b/pkg/services/ngalert/writer/prom.go index b01baf5197e..ef860a599e7 100644 --- a/pkg/services/ngalert/writer/prom.go +++ b/pkg/services/ngalert/writer/prom.go @@ -11,7 +11,6 @@ import ( "github.com/benbjohnson/clock" "github.com/grafana/dataplane/sdata/numeric" "github.com/grafana/grafana/pkg/infra/log" - "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/services/ngalert/metrics" "github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/setting" @@ -106,7 +105,6 @@ func NewPrometheusWriter( settings setting.RecordingRuleSettings, httpClientProvider HttpClientProvider, clock clock.Clock, - tracer tracing.Tracer, l log.Logger, metrics *metrics.RemoteWriter, ) (*PrometheusWriter, error) { @@ -119,14 +117,9 @@ func NewPrometheusWriter( headers.Add(k, v) } - middlewares := []httpclient.Middleware{ - httpclient.TracingMiddleware(tracer), - } - cl, err := httpClientProvider.New(httpclient.Options{ - Middlewares: middlewares, - BasicAuth: createAuthOpts(settings.BasicAuthUsername, settings.BasicAuthPassword), - Header: headers, + BasicAuth: createAuthOpts(settings.BasicAuthUsername, settings.BasicAuthPassword), + Header: headers, }) if err != nil { return nil, err