From 3fcc7f412b21cc65adbfe037142e79a4bb686c07 Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Fri, 19 Jul 2024 11:37:46 -0600 Subject: [PATCH] Loki Datasource: Fix getting the feature toggles in MT mode (#90684) --- pkg/tsdb/loki/loki.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/loki/loki.go b/pkg/tsdb/loki/loki.go index 1d31f500c2d..6894003bf78 100644 --- a/pkg/tsdb/loki/loki.go +++ b/pkg/tsdb/loki/loki.go @@ -160,11 +160,11 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) } responseOpts := ResponseOpts{ - metricDataplane: s.features.IsEnabled(ctx, featuremgmt.FlagLokiMetricDataplane), - logsDataplane: s.features.IsEnabled(ctx, featuremgmt.FlagLokiLogsDataplane), + metricDataplane: backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(featuremgmt.FlagLokiMetricDataplane), + logsDataplane: backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(featuremgmt.FlagLokiLogsDataplane), } - return queryData(ctx, req, dsInfo, responseOpts, s.tracer, logger, s.features.IsEnabled(ctx, featuremgmt.FlagLokiRunQueriesInParallel), s.features.IsEnabled(ctx, featuremgmt.FlagLokiStructuredMetadata)) + return queryData(ctx, req, dsInfo, responseOpts, s.tracer, logger, backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(featuremgmt.FlagLokiRunQueriesInParallel), backend.GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled(featuremgmt.FlagLokiStructuredMetadata)) } func queryData(ctx context.Context, req *backend.QueryDataRequest, dsInfo *datasourceInfo, responseOpts ResponseOpts, tracer tracing.Tracer, plog log.Logger, runInParallel bool, requestStructuredMetadata bool) (*backend.QueryDataResponse, error) {