Tempo: Remove trace to metrics feature toggle (#82884)

* Remove trace to metrics feature toggle * Fix after merge
2025-01-07 22:53:56 -06:00 · 2024-02-22 13:30:41 +00:00 · 2024-02-22 13:30:41 +00:00 · ee5dc14e17
commit ee5dc14e17
parent 2a1873f038
12 changed files with 10 additions and 52 deletions
--- a/docs/sources/datasources/jaeger/_index.md
+++ b/docs/sources/datasources/jaeger/_index.md
@ -123,11 +123,6 @@ The following table describes the ways in which you can configure your trace to

 ### Trace to metrics

-{{% admonition type="note" %}}
-This feature is behind the `traceToMetrics` [feature toggle][configure-grafana-feature-toggles].
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to metrics** setting configures the [trace to metrics feature](/blog/2022/08/18/new-in-grafana-9.1-trace-to-metrics-allows-users-to-navigate-from-a-trace-span-to-a-selected-data-source/) available when integrating Grafana with Jaeger.

 To configure trace to metrics:
--- a/docs/sources/datasources/tempo/configure-tempo-data-source.md
+++ b/docs/sources/datasources/tempo/configure-tempo-data-source.md
@ -91,11 +91,6 @@ The following table describes the ways in which you can configure your trace to

 ## Trace to metrics

-{{% admonition type="note" %}}
-This feature is behind the `traceToMetrics` [feature toggle][configure-grafana-feature-toggles].
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to metrics** setting configures the [trace to metrics feature](/blog/2022/08/18/new-in-grafana-9.1-trace-to-metrics-allows-users-to-navigate-from-a-trace-span-to-a-selected-data-source/) available when integrating Grafana with Tempo.

 {{< youtube id="TkapvLeMMpc" >}}
--- a/docs/sources/datasources/zipkin/_index.md
+++ b/docs/sources/datasources/zipkin/_index.md
@ -121,11 +121,6 @@ The following table describes the ways in which you can configure your trace to

 ### Trace to metrics

-{{% admonition type="note" %}}
-This feature is behind the `traceToMetrics` [feature toggle][configure-grafana-feature-toggles].
-If you use Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org/#support) to access this feature.
-{{% /admonition %}}
-
 The **Trace to metrics** setting configures the [trace to metrics feature](/blog/2022/08/18/new-in-grafana-9.1-trace-to-metrics-allows-users-to-navigate-from-a-trace-span-to-a-selected-data-source/) available when integrating Grafana with Zipkin.

 To configure trace to metrics:
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@ -112,7 +112,6 @@ Experimental features might be changed or removed without prior notice.
 | `lokiExperimentalStreaming`                 | Support new streaming approach for loki (prototype, needs special loki build)                                                                                                                                                                                                     |
 | `storage`                                   | Configurable storage for dashboards, datasources, and resources                                                                                                                                                                                                                   |
 | `datasourceQueryMultiStatus`                | Introduce HTTP 207 Multi Status for api/ds/query                                                                                                                                                                                                                                  |
-| `traceToMetrics`                            | Enable trace to metrics links                                                                                                                                                                                                                                                     |
 | `canvasPanelNesting`                        | Allow elements nesting                                                                                                                                                                                                                                                            |
 | `scenes`                                    | Experimental framework to build interactive dashboards                                                                                                                                                                                                                            |
 | `disableSecretsCompatibility`               | Disable duplicated secret storage in legacy tables                                                                                                                                                                                                                                |
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@ -31,7 +31,6 @@ export interface FeatureToggles {
  correlations?: boolean;
  exploreContentOutline?: boolean;
  datasourceQueryMultiStatus?: boolean;
-  traceToMetrics?: boolean;
  autoMigrateOldPanels?: boolean;
  autoMigrateGraphPanel?: boolean;
  autoMigrateTablePanel?: boolean;
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@ -108,13 +108,6 @@ var (
 			Stage:       FeatureStageExperimental,
 			Owner:       grafanaPluginsPlatformSquad,
 		},
-		{
-			Name:         "traceToMetrics",
-			Description:  "Enable trace to metrics links",
-			Stage:        FeatureStageExperimental,
-			FrontendOnly: true,
-			Owner:        grafanaObservabilityTracesAndProfilingSquad,
-		},
 		{
 			Name:         "autoMigrateOldPanels",
 			Description:  "Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)",
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@ -12,7 +12,6 @@ storage,experimental,@grafana/grafana-app-platform-squad,false,false,false
 correlations,GA,@grafana/explore-squad,false,false,false
 exploreContentOutline,GA,@grafana/explore-squad,false,false,true
 datasourceQueryMultiStatus,experimental,@grafana/plugins-platform-backend,false,false,false
-traceToMetrics,experimental,@grafana/observability-traces-and-profiling,false,false,true
 autoMigrateOldPanels,preview,@grafana/dataviz-squad,false,false,true
 autoMigrateGraphPanel,preview,@grafana/dataviz-squad,false,false,true
 autoMigrateTablePanel,preview,@grafana/dataviz-squad,false,false,true
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@ -59,10 +59,6 @@ const (
 	// Introduce HTTP 207 Multi Status for api/ds/query
 	FlagDatasourceQueryMultiStatus = "datasourceQueryMultiStatus"

-	// FlagTraceToMetrics
-	// Enable trace to metrics links
-	FlagTraceToMetrics = "traceToMetrics"
-
 	// FlagAutoMigrateOldPanels
 	// Migrate old angular panels to supported versions (graph, table-old, worldmap, etc)
 	FlagAutoMigrateOldPanels = "autoMigrateOldPanels"
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@ -1394,7 +1394,8 @@
      "metadata": {
        "name": "traceToMetrics",
        "resourceVersion": "1708108588074",
-        "creationTimestamp": "2024-02-16T18:36:28Z"
+        "creationTimestamp": "2024-02-16T18:36:28Z",
+        "deletionTimestamp": "2024-02-16T10:09:14Z"
      },
      "spec": {
        "description": "Enable trace to metrics links",
@ -2125,4 +2126,4 @@
      }
    }
  ]
-}
+}
--- a/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/jaeger/configuration/ConfigEditor.tsx
@ -33,15 +33,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
      />

      <TraceToLogsSection options={options} onOptionsChange={onOptionsChange} />
-
      <Divider spacing={4} />

-      {config.featureToggles.traceToMetrics ? (
-        <>
-          <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
-          <Divider spacing={4} />
-        </>
-      ) : null}
+      <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />

      <ConfigSection
        title="Additional settings"
--- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
@ -53,14 +53,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {

      <Divider spacing={4} />
      <TraceToLogsSection options={options} onOptionsChange={onOptionsChange} />
-
      <Divider spacing={4} />
-      {config.featureToggles.traceToMetrics ? (
-        <>
-          <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
-          <Divider spacing={4} />
-        </>
-      ) : null}
+
+      <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />

      <TraceToProfilesSection options={options} onOptionsChange={onOptionsChange} />
      <Divider spacing={4} />
--- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
@ -31,15 +31,10 @@ export const ConfigEditor = ({ options, onOptionsChange }: Props) => {
      />

      <TraceToLogsSection options={options} onOptionsChange={onOptionsChange} />
-
      <Divider spacing={4} />

-      {config.featureToggles.traceToMetrics ? (
-        <>
-          <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
-          <Divider spacing={4} />
-        </>
-      ) : null}
+      <TraceToMetricsSection options={options} onOptionsChange={onOptionsChange} />
+      <Divider spacing={4} />

      <ConfigSection
        title="Additional settings"