Tempo: Remove tempoApmTable feature flag (#62499)

Remove tempoApmTable feature flag

docs/sources/datasources/tempo/_index.md

@@ -293,7 +293,6 @@ For details, refer to the [APM dashboard documentation](/docs/tempo/latest/metri
 
 **To display the APM table:**
 
-1. Activate the `tempoApmTable` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}) in your `grafana.ini` file.
 1. Link a Prometheus data source in the Tempo data source settings.
 1. Navigate to [Explore]({{< relref "../../explore/" >}}).
 1. Select the Tempo data source.

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

@@ -64,7 +64,6 @@ Alpha features might be changed or removed without prior notice.
 | `live-pipeline`                    | Enable a generic live processing pipeline                                                                                                                                    |
 | `live-service-web-worker`          | This will use a webworker thread to processes events rather than the main thread                                                                                             |
 | `queryOverLive`                    | Use Grafana Live WebSocket to execute backend queries                                                                                                                        |
-| `tempoApmTable`                    | Show APM table                                                                                                                                                               |
 | `publicDashboards`                 | Enables public access to dashboards                                                                                                                                          |
 | `lokiLive`                         | Support WebSocket streaming for loki (early prototype)                                                                                                                       |
 | `lokiDataframeApi`                 | Use experimental loki api for WebSocket streaming (early prototype)                                                                                                          |

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

@@ -28,7 +28,6 @@ export interface FeatureToggles {
   ['live-service-web-worker']?: boolean;
   queryOverLive?: boolean;
   panelTitleSearch?: boolean;
-  tempoApmTable?: boolean;
   prometheusAzureOverrideAudience?: boolean;
   showFeatureFlagsInUI?: boolean;
   publicDashboards?: boolean;

pkg/services/featuremgmt/registry.go

@@ -72,12 +72,6 @@ var (
 			Description: "Search for dashboards using panel title",
 			State:       FeatureStateBeta,
 		},
-		{
-			Name:         "tempoApmTable",
-			Description:  "Show APM table",
-			State:        FeatureStateAlpha,
-			FrontendOnly: true,
-		},
 		{
 			Name:        "prometheusAzureOverrideAudience",
 			Description: "Experimental. Allow override default AAD audience for Azure Prometheus endpoint",

pkg/services/featuremgmt/toggles_gen.go

@@ -55,10 +55,6 @@ const (
 	// Search for dashboards using panel title
 	FlagPanelTitleSearch = "panelTitleSearch"
 
-	// FlagTempoApmTable
-	// Show APM table
-	FlagTempoApmTable = "tempoApmTable"
-
 	// FlagPrometheusAzureOverrideAudience
 	// Experimental. Allow override default AAD audience for Azure Prometheus endpoint
 	FlagPrometheusAzureOverrideAudience = "prometheusAzureOverrideAudience"

public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx

@@ -3,7 +3,6 @@ import React, { useEffect, useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { config } from '@grafana/runtime';
 import { Alert, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
 
 import { AdHocFilter } from '../../../../features/variables/adhoc/picker/AdHocFilter';
@@ -72,9 +71,7 @@ export function ServiceGraphSection({
             datasource={{ uid: graphDatasourceUid }}
             filters={filters}
             getTagKeysOptions={{
-              series: config.featureToggles.tempoApmTable
+              series: ['traces_service_graph_request_total', 'traces_spanmetrics_calls_total'],
-                ? ['traces_service_graph_request_total', 'traces_spanmetrics_calls_total']
-                : ['traces_service_graph_request_total'],
             }}
             addFilter={(filter: AdHocVariableFilter) => {
               onChange({

public/app/plugins/datasource/tempo/datasource.test.ts

@@ -20,7 +20,6 @@ import {
   setDataSourceSrv,
   TemplateSrv,
 } from '@grafana/runtime';
-import config from 'app/core/config';
 
 import {
   DEFAULT_LIMIT,
@@ -442,7 +441,6 @@ describe('Tempo apm table', () => {
         },
       },
     });
-    config.featureToggles.tempoApmTable = true;
     setDataSourceSrv(backendSrvWithPrometheus as any);
     const response = await lastValueFrom(
       ds.query({ targets: [{ queryType: 'serviceMap' }], range: getDefaultTimeRange() } as any)

public/app/plugins/datasource/tempo/datasource.ts

@@ -259,19 +259,15 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
 
       const dsId = this.serviceMap.datasourceUid;
       const tempoDsUid = this.uid;
-      if (config.featureToggles.tempoApmTable) {
+      subQueries.push(
-        subQueries.push(
+        serviceMapQuery(options, dsId, tempoDsUid).pipe(
-          serviceMapQuery(options, dsId, tempoDsUid).pipe(
+          concatMap((result) =>
-            concatMap((result) =>
+            rateQuery(options, result, dsId).pipe(
-              rateQuery(options, result, dsId).pipe(
+              concatMap((result) => errorAndDurationQuery(options, result, dsId, tempoDsUid))
-                concatMap((result) => errorAndDurationQuery(options, result, dsId, tempoDsUid))
-              )
             )
           )
-        );
+        )
-      } else {
+      );
-        subQueries.push(serviceMapQuery(options, dsId, tempoDsUid));
-      }
     }
 
     return merge(...subQueries);