Caching: Remove useCachingService feature toggle (#80695)

remove useCachingService feature toggle

docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md

@@ -41,14 +41,13 @@ Some features are enabled by default. You can disable these feature by setting t
 | `prometheusDataplane`                | Changes responses to from Prometheus to be compliant with the dataplane specification. In particular, when this feature toggle is active, the numeric `Field.Name` is set from 'Value' to the value of the `__name__` label. | Yes                |
 | `lokiMetricDataplane`                | Changes metric responses from Loki to be compliant with the dataplane specification.                                                                                                                                         | Yes                |
 | `dataplaneFrontendFallback`          | Support dataplane contract field name change for transformations and field name matchers where the name is different                                                                                                         | Yes                |
-| `useCachingService`                  | When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.                                                                                  | Yes                |
 | `enableElasticsearchBackendQuerying` | Enable the processing of queries and responses in the Elasticsearch data source through backend                                                                                                                              | Yes                |
 | `advancedDataSourcePicker`           | Enable a new data source picker with contextual information, recently used order and advanced mode                                                                                                                           | Yes                |
 | `cloudWatchLogsMonacoEditor`         | Enables the Monaco editor for CloudWatch Logs queries                                                                                                                                                                        | Yes                |
 | `recordedQueriesMulti`               | Enables writing multiple items from a single query within Recorded Queries                                                                                                                                                   | Yes                |
 | `transformationsRedesign`            | Enables the transformations redesign                                                                                                                                                                                         | Yes                |
 | `grafanaAPIServer`                   | Enable Kubernetes API Server for Grafana resources                                                                                                                                                                           | Yes                |
-| `awsAsyncQueryCaching`               | Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled                                     | Yes                |
+| `awsAsyncQueryCaching`               | Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled                                                                                           | Yes                |
 | `splitScopes`                        | Support faster dashboard and folder search by splitting permission scopes into parts                                                                                                                                         | Yes                |
 | `prometheusConfigOverhaulAuth`       | Update the Prometheus configuration page with the new auth component                                                                                                                                                         | Yes                |
 | `influxdbSqlSupport`                 | Enable InfluxDB SQL query language support with new querying UI                                                                                                                                                              | Yes                |

packages/grafana-data/src/types/featureToggles.gen.ts

@@ -78,7 +78,6 @@ export interface FeatureToggles {
   renderAuthJWT?: boolean;
   externalServiceAuth?: boolean;
   refactorVariablesTimeRange?: boolean;
-  useCachingService?: boolean;
   enableElasticsearchBackendQuerying?: boolean;
   advancedDataSourcePicker?: boolean;
   faroDatasourceSelector?: boolean;

pkg/services/featuremgmt/registry.go

@@ -512,16 +512,6 @@ var (
 			HideFromAdminPage: true, // Non-feature, used to test out a bug fix that impacts the performance of template variables.
 			Created:           time.Date(2023, time.June, 6, 12, 0, 0, 0, time.UTC),
 		},
-		{
-			Name:            "useCachingService",
-			Description:     "When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.",
-			Stage:           FeatureStageGeneralAvailability,
-			Owner:           grafanaOperatorExperienceSquad,
-			RequiresRestart: true,
-			Expression:      "true", // enabled by default
-			AllowSelfServe:  false,
-			Created:         time.Date(2023, time.April, 12, 12, 0, 0, 0, time.UTC),
-		},
 		{
 			Name:           "enableElasticsearchBackendQuerying",
 			Description:    "Enable the processing of queries and responses in the Elasticsearch data source through backend",
@@ -753,7 +743,7 @@ var (
 		},
 		{
 			Name:        "awsAsyncQueryCaching",
-			Description: "Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled",
+			Description: "Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled",
 			Stage:       FeatureStageGeneralAvailability,
 			Expression:  "true", // enabled by default
 			Owner:       awsDatasourcesSquad,

pkg/services/featuremgmt/toggles_gen.csv

@@ -59,7 +59,6 @@ unifiedRequestLog,experimental,@grafana/backend-platform,2023-03-31,false,false,
 renderAuthJWT,preview,@grafana/grafana-as-code,2023-04-03,false,false,false,false
 externalServiceAuth,experimental,@grafana/identity-access-team,2023-04-11,true,false,false,false
 refactorVariablesTimeRange,preview,@grafana/dashboards-squad,2023-06-06,false,false,false,false
-useCachingService,GA,@grafana/grafana-operator-experience-squad,2023-04-12,false,false,true,false
 enableElasticsearchBackendQuerying,GA,@grafana/observability-logs,2023-04-14,false,false,false,false
 advancedDataSourcePicker,GA,@grafana/dashboards-squad,2023-04-14,false,false,false,true
 faroDatasourceSelector,preview,@grafana/app-o11y,2023-05-04,false,false,false,true

pkg/services/featuremgmt/toggles_gen.go

@@ -247,10 +247,6 @@ const (
 	// Refactor time range variables flow to reduce number of API calls made when query variables are chained
 	FlagRefactorVariablesTimeRange = "refactorVariablesTimeRange"
 
-	// FlagUseCachingService
-	// When active, the new query and resource caching implementation using a wire service inject replaces the previous middleware implementation.
-	FlagUseCachingService = "useCachingService"
-
 	// FlagEnableElasticsearchBackendQuerying
 	// Enable the processing of queries and responses in the Elasticsearch data source through backend
 	FlagEnableElasticsearchBackendQuerying = "enableElasticsearchBackendQuerying"
@@ -360,7 +356,7 @@ const (
 	FlagFeatureToggleAdminPage = "featureToggleAdminPage"
 
 	// FlagAwsAsyncQueryCaching
-	// Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled
+	// Enable caching for async queries for Redshift and Athena. Requires that the datasource has caching and async query support enabled
 	FlagAwsAsyncQueryCaching = "awsAsyncQueryCaching"
 
 	// FlagSplitScopes

pkg/services/pluginsintegration/pluginsintegration.go

@@ -172,13 +172,9 @@ func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthToken
 		clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
 		clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
 		clientmiddleware.NewResourceResponseMiddleware(),
+		clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features),
 	)
 
-	// Placing the new service implementation behind a feature flag until it is known to be stable
-	if features.IsEnabledGlobally(featuremgmt.FlagUseCachingService) {
-		middlewares = append(middlewares, clientmiddleware.NewCachingMiddlewareWithFeatureManager(cachingService, features))
-	}
-
 	if features.IsEnabledGlobally(featuremgmt.FlagIdForwarding) {
 		middlewares = append(middlewares, clientmiddleware.NewForwardIDMiddleware())
 	}