From 0178de310967dc78a833f7905dc1777632dce1fa Mon Sep 17 00:00:00 2001 From: Nathan Marrs Date: Tue, 27 May 2025 12:18:23 -0700 Subject: [PATCH] Feature Toggles: Remove two AB test feature toggles (#106100) --- .../grafana-data/src/types/featureToggles.gen.ts | 10 ---------- pkg/services/featuremgmt/registry.go | 16 ---------------- pkg/services/featuremgmt/toggles_gen.csv | 2 -- pkg/services/featuremgmt/toggles_gen.go | 8 -------- pkg/services/featuremgmt/toggles_gen.json | 6 ++++-- pkg/services/featuremgmt/toggles_gen_test.go | 3 --- 6 files changed, 4 insertions(+), 41 deletions(-) diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 3993cab76bf..e8b1222e0f6 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -845,20 +845,10 @@ export interface FeatureToggles { */ teamHttpHeadersTempo?: boolean; /** - * Test feature toggle to see how cohorts could be set up AB testing - * @default false - */ - ABTestFeatureToggleA?: boolean; - /** * Use new **Combobox** component for template variables */ templateVariablesUsesCombobox?: boolean; /** - * Test feature toggle to see how cohorts could be set up AB testing - * @default false - */ - ABTestFeatureToggleB?: boolean; - /** * Enables Advisor app */ grafanaAdvisor?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index e968818bbd2..7aa9f4d1fda 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1437,14 +1437,6 @@ var ( FrontendOnly: false, Owner: identityAccessTeam, }, - { - Name: "ABTestFeatureToggleA", - Description: "Test feature toggle to see how cohorts could be set up AB testing", - Stage: FeatureStageExperimental, - Owner: grafanaSharingSquad, - Expression: "false", - HideFromDocs: true, - }, { Name: "templateVariablesUsesCombobox", Description: "Use new **Combobox** component for template variables", @@ -1452,14 +1444,6 @@ var ( Owner: grafanaFrontendPlatformSquad, FrontendOnly: true, }, - { - Name: "ABTestFeatureToggleB", - Description: "Test feature toggle to see how cohorts could be set up AB testing", - Stage: FeatureStageExperimental, - Owner: grafanaSharingSquad, - Expression: "false", - HideFromDocs: true, - }, { Name: "grafanaAdvisor", Description: "Enables Advisor app", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index f1b62dd7b94..0b1c915d271 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -189,9 +189,7 @@ k8SFolderMove,experimental,@grafana/search-and-storage,false,false,false improvedExternalSessionHandlingSAML,preview,@grafana/identity-access-team,false,false,false teamHttpHeadersMimir,preview,@grafana/identity-access-team,false,false,false teamHttpHeadersTempo,experimental,@grafana/identity-access-team,false,false,false -ABTestFeatureToggleA,experimental,@grafana/sharing-squad,false,false,false templateVariablesUsesCombobox,experimental,@grafana/grafana-frontend-platform,false,false,true -ABTestFeatureToggleB,experimental,@grafana/sharing-squad,false,false,false grafanaAdvisor,experimental,@grafana/plugins-platform-backend,false,false,false elasticsearchImprovedParsing,experimental,@grafana/aws-datasources,false,false,false datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 9ef9f4cfbeb..10307d5c12c 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -767,18 +767,10 @@ const ( // Enables LBAC for datasources for Tempo to apply LBAC filtering of traces to the client requests for users in teams FlagTeamHttpHeadersTempo = "teamHttpHeadersTempo" - // FlagABTestFeatureToggleA - // Test feature toggle to see how cohorts could be set up AB testing - FlagABTestFeatureToggleA = "ABTestFeatureToggleA" - // FlagTemplateVariablesUsesCombobox // Use new **Combobox** component for template variables FlagTemplateVariablesUsesCombobox = "templateVariablesUsesCombobox" - // FlagABTestFeatureToggleB - // Test feature toggle to see how cohorts could be set up AB testing - FlagABTestFeatureToggleB = "ABTestFeatureToggleB" - // FlagGrafanaAdvisor // Enables Advisor app FlagGrafanaAdvisor = "grafanaAdvisor" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 6cad9239307..ca69e0927a5 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -7,7 +7,8 @@ "metadata": { "name": "ABTestFeatureToggleA", "resourceVersion": "1745491786560", - "creationTimestamp": "2025-01-13T21:13:13Z" + "creationTimestamp": "2025-01-13T21:13:13Z", + "deletionTimestamp": "2025-05-27T18:50:27Z" }, "spec": { "description": "Test feature toggle to see how cohorts could be set up AB testing", @@ -21,7 +22,8 @@ "metadata": { "name": "ABTestFeatureToggleB", "resourceVersion": "1745491786560", - "creationTimestamp": "2025-01-13T21:13:13Z" + "creationTimestamp": "2025-01-13T21:13:13Z", + "deletionTimestamp": "2025-05-27T18:50:27Z" }, "spec": { "description": "Test feature toggle to see how cohorts could be set up AB testing", diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go index 60514654d83..bae02255b88 100644 --- a/pkg/services/featuremgmt/toggles_gen_test.go +++ b/pkg/services/featuremgmt/toggles_gen_test.go @@ -167,9 +167,6 @@ func TestFeatureToggleFiles(t *testing.T) { func verifyFlagsConfiguration(t *testing.T) { legacyNames := map[string]bool{ "live-service-web-worker": true, - // TODO: Remove this when removing feature toggles - "ABTestFeatureToggleA": true, - "ABTestFeatureToggleB": true, } invalidNames := make([]string, 0)