add feature flag

grafana · Sep 4, 2024 · 36f46cd · 36f46cd
1 parent c5422eb
commit 36f46cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/conversion_adapter.go b/backend/conversion_adapter.go
@@ -68,7 +68,7 @@ func (a *conversionSDKAdapter) ConvertObjects(ctx context.Context, req *pluginv2
 			resp, innerErr = a.handler.ConvertObjects(ctx, parsedReq)
 			return RequestStatusFromError(innerErr), innerErr
 		}
-		if a.queryConversionHandler != nil {
+		if a.queryConversionHandler != nil && GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled("dsQueryConvert") {
 			resp, innerErr = a.ConvertQueryDataFromObjects(ctx, parsedReq)
 			return RequestStatusFromError(innerErr), innerErr
 		}

diff --git a/backend/data_adapter.go b/backend/data_adapter.go
@@ -43,7 +43,7 @@ func (a *dataSDKAdapter) QueryData(ctx context.Context, req *pluginv2.QueryDataR
 	err := wrapHandler(ctx, parsedReq.PluginContext, func(ctx context.Context) (RequestStatus, error) {
 		ctx = withHeaderMiddleware(ctx, parsedReq.GetHTTPHeaders())
 		var innerErr error
-		if a.queryConversionHandler != nil {
+		if a.queryConversionHandler != nil && GrafanaConfigFromContext(ctx).FeatureToggles().IsEnabled("dsQueryConvert") {
 			parsedReq, innerErr = a.ConvertQueryData(ctx, parsedReq)
 			if innerErr != nil {
 				return RequestStatusError, innerErr