From 377acb4cdd6c4dafb5d346f27b0600839fdd73fb Mon Sep 17 00:00:00 2001
From: Joey Tawadrous <90795735+joey-grafana@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:25:12 +0100
Subject: [PATCH] [v9.0.x] Traces: Remove serviceMap feature flag (#52433)

---
 packages/grafana-data/src/types/featureToggles.gen.ts     | 1 -
 pkg/services/featuremgmt/registry.go                      | 6 ------
 pkg/services/featuremgmt/toggles_gen.go                   | 4 ----
 .../plugins/datasource/tempo/QueryEditor/QueryField.tsx   | 5 +----
 .../datasource/tempo/configuration/ConfigEditor.tsx       | 8 +++-----
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index a307dc22f76..99905f5ac64 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -29,7 +29,6 @@ export interface FeatureToggles {
   panelTitleSearch?: boolean;
   tempoSearch?: boolean;
   tempoBackendSearch?: boolean;
-  tempoServiceGraph?: boolean;
   lokiBackendMode?: boolean;
   prometheus_azure_auth?: boolean;
   prometheusAzureOverrideAudience?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index a17dc2ee6c6..6838cbc6e41 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -77,12 +77,6 @@ var (
 			Description: "Use backend for tempo search",
 			State:       FeatureStateBeta,
 		},
-		{
-			Name:         "tempoServiceGraph",
-			Description:  "show service",
-			State:        FeatureStateBeta,
-			FrontendOnly: true,
-		},
 		{
 			Name:         "lokiBackendMode",
 			Description:  "Loki datasource works as backend datasource",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index cad864e2871..7163b149864 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -59,10 +59,6 @@ const (
 	// Use backend for tempo search
 	FlagTempoBackendSearch = "tempoBackendSearch"
 
-	// FlagTempoServiceGraph
-	// show service
-	FlagTempoServiceGraph = "tempoServiceGraph"
-
 	// FlagLokiBackendMode
 	// Loki datasource works as backend datasource
 	FlagLokiBackendMode = "lokiBackendMode"
diff --git a/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx b/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
index fe226fcb6ff..941b3b23d53 100644
--- a/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
+++ b/public/app/plugins/datasource/tempo/QueryEditor/QueryField.tsx
@@ -76,12 +76,9 @@ class TempoQueryFieldComponent extends React.PureComponent<Props> {
     const queryTypeOptions: Array<SelectableValue<TempoQueryType>> = [
       { value: 'traceId', label: 'TraceID' },
       { value: 'upload', label: 'JSON file' },
+      { value: 'serviceMap', label: 'Service Graph' },
     ];
 
-    if (config.featureToggles.tempoServiceGraph) {
-      queryTypeOptions.push({ value: 'serviceMap', label: 'Service Graph' });
-    }
-
     if (config.featureToggles.tempoSearch && !datasource?.search?.hide) {
       queryTypeOptions.unshift({ value: 'nativeSearch', label: 'Search - Beta' });
     }
diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
index 618c0bc28a3..5e9dca6bfc3 100644
--- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
@@ -33,11 +33,9 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
         </div>
       ) : null}
 
-      {config.featureToggles.tempoServiceGraph && (
-        <div className="gf-form-group">
-          <ServiceGraphSettings options={options} onOptionsChange={onOptionsChange} />
-        </div>
-      )}
+      <div className="gf-form-group">
+        <ServiceGraphSettings options={options} onOptionsChange={onOptionsChange} />
+      </div>
 
       {config.featureToggles.tempoSearch && (
         <div className="gf-form-group">