From adac9fbe7108d176f441d2c45009cfdd82bec64b Mon Sep 17 00:00:00 2001
From: Brendan O'Handley <brendan.ohandley@grafana.com>
Date: Wed, 10 Sep 2025 11:18:13 -0500
Subject: [PATCH] Tempo: Remove experimental config option to select native
 histograms (#110618)

* remove config option from configured data sources

* remove from ServiceGraphSettings.tsx

* remove config option from types
---
 devenv/datasources.yaml                       |  1 -
 devenv/datasources_docker.yaml                |  1 -
 .../configuration/ServiceGraphSettings.tsx    | 60 +------------------
 .../plugins/datasource/tempo/datasource.ts    |  1 -
 public/app/plugins/datasource/tempo/types.ts  |  1 -
 5 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
index 346cd22e02d..4a9270bccd3 100644
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -344,7 +344,6 @@ datasources:
             query: 'sum(rate({$$__tags}[5m]))'
       serviceMap:
         datasourceUid: 'gdev-prometheus'
-        histogramType: 'both' # 'classic' or 'native' or 'both'
 
   - name: gdev-pyroscope
     type: grafana-pyroscope-datasource
diff --git a/devenv/datasources_docker.yaml b/devenv/datasources_docker.yaml
index eb76de4ef5b..0fc5f09094c 100644
--- a/devenv/datasources_docker.yaml
+++ b/devenv/datasources_docker.yaml
@@ -218,4 +218,3 @@ datasources:
             query: 'sum(rate({$$__tags}[5m]))'
       serviceMap:
         datasourceUid: 'gdev-prometheus'
-        histogramType: 'both' # 'classic' or 'native' or 'both'
diff --git a/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx b/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
index bc7cdea6a72..31016057bd4 100644
--- a/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ServiceGraphSettings.tsx
@@ -4,7 +4,7 @@ import {
   updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
 import { DataSourcePicker } from '@grafana/runtime';
-import { Button, InlineField, InlineFieldRow, useStyles2, Combobox, TextLink } from '@grafana/ui';
+import { Button, InlineField, InlineFieldRow, useStyles2 } from '@grafana/ui';
 
 import { TempoJsonData } from '../types';
 
@@ -15,47 +15,6 @@ interface Props extends DataSourcePluginOptionsEditorProps<TempoJsonData> {}
 export function ServiceGraphSettings({ options, onOptionsChange }: Props) {
   const styles = useStyles2(getStyles);
 
-  const histogramOptions = [
-    { label: 'Classic', value: 'classic' },
-    { label: 'Native', value: 'native' },
-    { label: 'Both', value: 'both' },
-  ];
-
-  const nativeHistogramDocs = (
-    <>
-      Select which type of histograms are configured in the {metricsGeneratorDocsLink()}. If native histograms are
-      configured, you must also configure native histograms ingestion in {prometheusNativeHistogramsDocsLink()} or{' '}
-      {mimirNativeHistogramsDocsLink()}.
-    </>
-  );
-
-  function metricsGeneratorDocsLink() {
-    return (
-      <TextLink href="https://grafana.com/docs/tempo/latest/setup-and-configuration/metrics-generator/" external>
-        Tempo metrics generator
-      </TextLink>
-    );
-  }
-
-  function prometheusNativeHistogramsDocsLink() {
-    return (
-      <TextLink href="https://prometheus.io/docs/specs/native_histograms/#native-histograms" external>
-        Prometheus
-      </TextLink>
-    );
-  }
-
-  function mimirNativeHistogramsDocsLink() {
-    return (
-      <TextLink
-        href="https://grafana.com/docs/mimir/latest/configure/configure-native-histograms-ingestion/#configure-native-histograms-globally"
-        external
-      >
-        Mimir
-      </TextLink>
-    );
-  }
-
   return (
     <div className={styles.container}>
       <InlineFieldRow className={styles.row}>
@@ -93,23 +52,6 @@ export function ServiceGraphSettings({ options, onOptionsChange }: Props) {
           </Button>
         ) : null}
       </InlineFieldRow>
-      <InlineFieldRow className={styles.row}>
-        {/* TODO: Remove this in favor of automatic detection of native histograms https://github.com/grafana/grafana/issues/109709 */}
-        <InlineField tooltip={nativeHistogramDocs} label="Histogram type" labelWidth={26} interactive={true}>
-          <Combobox
-            id="histogram-type-select"
-            value={options.jsonData.serviceMap?.histogramType || 'classic'}
-            width={40}
-            options={histogramOptions}
-            onChange={(value) =>
-              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'serviceMap', {
-                ...options.jsonData.serviceMap,
-                histogramType: value.value,
-              })
-            }
-          />
-        </InlineField>
-      </InlineFieldRow>
     </div>
   );
 }
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 5f28cb96429..efaf9d30aca 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -114,7 +114,6 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
   tracesToLogs?: TraceToLogsOptions;
   serviceMap?: {
     datasourceUid?: string;
-    histogramType?: 'classic' | 'native' | 'both';
   };
   search?: {
     hide?: boolean;
diff --git a/public/app/plugins/datasource/tempo/types.ts b/public/app/plugins/datasource/tempo/types.ts
index ef7eaae06ac..fc740a324f0 100644
--- a/public/app/plugins/datasource/tempo/types.ts
+++ b/public/app/plugins/datasource/tempo/types.ts
@@ -7,7 +7,6 @@ export interface TempoJsonData extends DataSourceJsonData {
   tracesToLogs?: TraceToLogsOptions;
   serviceMap?: {
     datasourceUid?: string;
-    histogramType?: 'classic' | 'native' | 'both';
   };
   search?: {
     hide?: boolean;