IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tempo: Remove tempoApmTable feature flag (#62499)

Browse Source 
Remove tempoApmTable feature flag
This commit is contained in:
Andre Pereira
2023-02-01 15:56:34 +00:00
committed by GitHub
parent 317f044e70
commit 5e1506dea0
8 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/tempo/QueryEditor/ServiceGraphSection.tsx
View File

@@ -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({

2
public/app/plugins/datasource/tempo/datasource.test.ts
View File

@@ -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)

18
public/app/plugins/datasource/tempo/datasource.ts
View File

@@ -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(
serviceMapQuery(options, dsId, tempoDsUid).pipe(
concatMap((result) =>
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);