From 5e1506dea0e7edff8d45ef1f66990aa470b8b8ec Mon Sep 17 00:00:00 2001 From: Andre Pereira Date: Wed, 1 Feb 2023 15:56:34 +0000 Subject: [PATCH] Tempo: Remove tempoApmTable feature flag (#62499) Remove tempoApmTable feature flag --- docs/sources/datasources/tempo/_index.md | 1 - .../configure-grafana/feature-toggles/index.md | 1 - .../src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 6 ------ pkg/services/featuremgmt/toggles_gen.go | 4 ---- .../tempo/QueryEditor/ServiceGraphSection.tsx | 5 +---- .../datasource/tempo/datasource.test.ts | 2 -- .../app/plugins/datasource/tempo/datasource.ts | 18 +++++++----------- 8 files changed, 8 insertions(+), 30 deletions(-) diff --git a/docs/sources/datasources/tempo/_index.md b/docs/sources/datasources/tempo/_index.md index 419f4f78e1c..3dbc85fb2da 100644 --- a/docs/sources/datasources/tempo/_index.md +++ b/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. diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index 449086347e2..5a998aaac87 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/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) | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 126aebe083f..7cf1165bc41 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/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; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 4910a8c9d3c..0ed90ac8ec0 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/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", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 7301eb570ba..e451c9b530b 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/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" diff --git a/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx b/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx index e1547153d1b..edaa5ea1d8c 100644 --- a/public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx +++ b/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 - ? ['traces_service_graph_request_total', 'traces_spanmetrics_calls_total'] - : ['traces_service_graph_request_total'], + series: ['traces_service_graph_request_total', 'traces_spanmetrics_calls_total'], }} addFilter={(filter: AdHocVariableFilter) => { onChange({ diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts index 3d8484d0df5..b8bc43f3ab1 100644 --- a/public/app/plugins/datasource/tempo/datasource.test.ts +++ b/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) diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts index 3e8c2111aa6..b17a4fb3839 100644 --- a/public/app/plugins/datasource/tempo/datasource.ts +++ b/public/app/plugins/datasource/tempo/datasource.ts @@ -259,19 +259,15 @@ export class TempoDatasource extends DataSourceWithBackend - rateQuery(options, result, dsId).pipe( - concatMap((result) => errorAndDurationQuery(options, result, dsId, tempoDsUid)) - ) + subQueries.push( + serviceMapQuery(options, dsId, tempoDsUid).pipe( + concatMap((result) => + rateQuery(options, result, dsId).pipe( + concatMap((result) => errorAndDurationQuery(options, result, dsId, tempoDsUid)) ) ) - ); - } else { - subQueries.push(serviceMapQuery(options, dsId, tempoDsUid)); - } + ) + ); } return merge(...subQueries);