diff --git a/public/app/plugins/datasource/tempo/datasource.test.ts b/public/app/plugins/datasource/tempo/datasource.test.ts index ed2b0bb5710..05c5399d8f9 100644 --- a/public/app/plugins/datasource/tempo/datasource.test.ts +++ b/public/app/plugins/datasource/tempo/datasource.test.ts @@ -71,7 +71,6 @@ describe('Tempo data source', () => { beforeEach(() => (console.error = consoleErrorMock)); describe('runs correctly', () => { - jest.spyOn(TempoDatasource.prototype, 'isFeatureAvailable').mockImplementation(() => true); const handleStreamingQuery = jest.spyOn(TempoDatasource.prototype, 'handleStreamingQuery'); const request = jest.spyOn(TempoDatasource.prototype, '_request'); const templateSrv: TemplateSrv = { replace: (s: string) => s } as unknown as TemplateSrv; diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts index c7168f59d4e..193c6f053ff 100644 --- a/public/app/plugins/datasource/tempo/datasource.ts +++ b/public/app/plugins/datasource/tempo/datasource.ts @@ -1,7 +1,6 @@ import { groupBy } from 'lodash'; import { EMPTY, forkJoin, from, lastValueFrom, merge, Observable, of } from 'rxjs'; import { catchError, concatMap, finalize, map, mergeMap, toArray } from 'rxjs/operators'; -import semver from 'semver'; import { CoreApp, @@ -86,10 +85,6 @@ export const featuresToTempoVersion = { [FeatureName.metricsStreaming]: '2.7.0', }; -// The version that we use as default in case we cannot retrieve it from the backend. -// This is the last minor version of Tempo that does not expose the endpoint for build information. -const defaultTempoVersion = '2.1.0'; - interface ServiceMapQueryResponse { nodes: DataFrame; edges: DataFrame; @@ -138,9 +133,6 @@ export class TempoDatasource extends DataSourceWithBackend, private readonly templateSrv: TemplateSrv = getTemplateSrv() @@ -265,19 +257,6 @@ export class TempoDatasource extends DataSourceWithBackend { - const response = await lastValueFrom( - this._request('/api/status/buildinfo').pipe( - map((response) => response), - catchError((error) => { - console.error('Failure in retrieving build information', error?.data?.message); - return of({ error, data: { version: null } }); // unknown version - }) - ) - ); - this.tempoVersion = response.data.version; - }; - // TODO: Implement this function in Prometheus datasource https://github.com/grafana/grafana/issues/109706 async getNativeHistograms(timeRange?: TimeRange): Promise { if (!this.serviceMap?.datasourceUid) { @@ -325,27 +304,6 @@ export class TempoDatasource extends DataSourceWithBackend