From 5ba2ca83d5ee92ea6a6af4cab566830cbbb28802 Mon Sep 17 00:00:00 2001
From: Joey <90795735+joey-grafana@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:54:42 +0000
Subject: [PATCH] Assign Traces & Profiling feature flags to team (#64406)

---
 pkg/services/featuremgmt/codeowners.go       | 23 ++++++++++----------
 pkg/services/featuremgmt/registry.go         |  3 +++
 pkg/services/featuremgmt/toggles_gen_test.go |  3 ---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index a31e27a7d7c..84d3cc267f8 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -5,15 +5,16 @@ package featuremgmt
 type codeowner string
 
 const (
-	grafanaAppPlatformSquad       codeowner = "@grafana/grafana-app-platform-squad"
-	grafanaDashboardsSquad        codeowner = "@grafana/dashboards-squad"
-	grafanaExploreSquad           codeowner = "@grafana/explore-squad"
-	grafanaBiSquad                codeowner = "@grafana/grafana-bi-squad"
-	grafanaDatavizSquad           codeowner = "@grafana/dataviz-squad"
-	grafanaUserEssentialsSquad    codeowner = "@grafana/user-essentials"
-	grafanaBackendPlatformSquad   codeowner = "@grafana/backend-platform"
-	grafanaPluginsPlatformSquad   codeowner = "@grafana/plugins-platform-backend"
-	grafanaAsCodeSquad            codeowner = "@grafana/grafana-as-code"
-	grafanaAuthnzSquad            codeowner = "@grafana/grafana-authnz-team"
-	grafanaObservabilityLogsSquad codeowner = "@grafana/observability-logs"
+	grafanaAppPlatformSquad                     codeowner = "@grafana/grafana-app-platform-squad"
+	grafanaDashboardsSquad                      codeowner = "@grafana/dashboards-squad"
+	grafanaExploreSquad                         codeowner = "@grafana/explore-squad"
+	grafanaBiSquad                              codeowner = "@grafana/grafana-bi-squad"
+	grafanaDatavizSquad                         codeowner = "@grafana/dataviz-squad"
+	grafanaUserEssentialsSquad                  codeowner = "@grafana/user-essentials"
+	grafanaBackendPlatformSquad                 codeowner = "@grafana/backend-platform"
+	grafanaPluginsPlatformSquad                 codeowner = "@grafana/plugins-platform-backend"
+	grafanaAsCodeSquad                          codeowner = "@grafana/grafana-as-code"
+	grafanaAuthnzSquad                          codeowner = "@grafana/grafana-authnz-team"
+	grafanaObservabilityLogsSquad               codeowner = "@grafana/observability-logs"
+	grafanaObservabilityTracesAndProfilingSquad codeowner = "@grafana/observability-traces-and-profiling"
 )
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 81a7c443b4d..5fff9cef8c9 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -153,6 +153,7 @@ var (
 			Description:  "Shows the new trace view design",
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
+			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 		},
 		{
 			Name:        "correlations",
@@ -177,6 +178,7 @@ var (
 			Description:  "Enable trace to metrics links",
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
+			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 		},
 		{
 			Name:        "newDBLibrary",
@@ -405,6 +407,7 @@ var (
 			Description:  "Enables the 'TraceQL Search' tab for the Tempo datasource which provides a UI to generate TraceQL queries",
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
+			Owner:        grafanaObservabilityTracesAndProfilingSquad,
 		},
 		{
 			Name:         "prometheusMetricEncyclopedia",
diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go
index acfb3a15f89..c6832e9bbe7 100644
--- a/pkg/services/featuremgmt/toggles_gen_test.go
+++ b/pkg/services/featuremgmt/toggles_gen_test.go
@@ -48,9 +48,7 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"prometheusAzureOverrideAudience":   true,
 		"featureHighlights":                 true,
 		"tracing":                           true,
-		"newTraceView":                      true,
 		"cloudWatchDynamicLabels":           true,
-		"traceToMetrics":                    true,
 		"validateDashboardsOnSave":          true,
 		"prometheusWideSeries":              true,
 		"disableSecretsCompatibility":       true,
@@ -67,7 +65,6 @@ func TestFeatureToggleFiles(t *testing.T) {
 		"alertingBacktesting":               true,
 		"alertingNoNormalState":             true,
 		"individualCookiePreferences":       true,
-		"traceqlSearch":                     true,
 	}
 
 	t.Run("all new features should have an owner", func(t *testing.T) {