fix(dashboards): Avoid narrowing trace metric suggestions

Keep trace metric attribute suggestions unscoped when a dashboard widget
selects multiple distinct metrics. This matches the rendered search bar
behavior and avoids hiding valid attributes for non-primary metrics.

Add a regression test that covers both distinct multi-metric selections and
multiple aggregates on the same metric.

Co-Authored-By: GPT-5.4 <noreply@openai.com>
Made-with: Cursor

Author: nsdeschenes

static/app/views/dashboards/datasetConfig/traceMetrics.spec.tsx

@@ -12,10 +12,20 @@ import {
 } from 'sentry/views/dashboards/datasetConfig/traceMetrics';
 import {DisplayType, WidgetType, type WidgetQuery} from 'sentry/views/dashboards/types';
 import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
+import {createTraceMetricFilter} from 'sentry/views/explore/metrics/utils';
+
+const mockUseTraceItemSearchQueryBuilderProps = jest.fn(() => ({
+  filterKeys: {},
+  filterKeySections: [],
+  getTagValues: jest.fn(),
+}));
 
 jest.mock('sentry/views/explore/components/traceItemSearchQueryBuilder', () => {
   return {
     ...jest.requireActual('sentry/views/explore/components/traceItemSearchQueryBuilder'),
+    useTraceItemSearchQueryBuilderProps: (
+      ...args: Parameters<typeof mockUseTraceItemSearchQueryBuilderProps>
+    ) => mockUseTraceItemSearchQueryBuilderProps(...args),
     TraceItemSearchQueryBuilder: jest.fn(props => (
       <div
         data-test-id="trace-item-search-query-builder"
@@ -794,4 +804,93 @@ describe('TraceMetricsConfig', () => {
       expect(searchBar).toHaveAttribute('data-namespace', 'same_metric');
     });
   });
+
+  describe('useTraceMetricsSearchBarDataProvider', () => {
+    const defaultWidgetQuery: WidgetQuery = {
+      name: '',
+      fields: [],
+      columns: [],
+      fieldAliases: [],
+      aggregates: [],
+      conditions: '',
+      orderby: '',
+    };
+
+    function SearchBarDataProviderProbe({widgetQuery}: {widgetQuery?: WidgetQuery}) {
+      TraceMetricsConfig.useSearchBarDataProvider?.({
+        pageFilters: PageFiltersFixture({projects: [1]}),
+        widgetQuery,
+      });
+      return null;
+    }
+
+    beforeEach(() => {
+      mockUseTraceItemSearchQueryBuilderProps.mockClear();
+    });
+
+    it('does not scope attribute suggestions to the first metric when multiple metrics are selected', () => {
+      render(
+        <WidgetBuilderProvider>
+          <SearchBarDataProviderProbe widgetQuery={defaultWidgetQuery} />
+        </WidgetBuilderProvider>,
+        {
+          organization: OrganizationFixture({
+            features: ['tracemetrics-multi-metric-selection-in-dashboards'],
+          }),
+          initialRouterConfig: {
+            location: {
+              pathname: DASHBOARD_WIDGET_BUILDER_PATHNAME,
+              query: {
+                yAxis: ['avg(value,metric_a,counter,-)', 'avg(value,metric_b,gauge,-)'],
+                dataset: WidgetType.TRACEMETRICS,
+                displayType: DisplayType.LINE,
+              },
+            },
+          },
+        }
+      );
+
+      expect(mockUseTraceItemSearchQueryBuilderProps).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributeQuery: undefined,
+        })
+      );
+    });
+
+    it('keeps attribute suggestions scoped when all selected aggregates target the same metric', () => {
+      render(
+        <WidgetBuilderProvider>
+          <SearchBarDataProviderProbe widgetQuery={defaultWidgetQuery} />
+        </WidgetBuilderProvider>,
+        {
+          organization: OrganizationFixture({
+            features: ['tracemetrics-multi-metric-selection-in-dashboards'],
+          }),
+          initialRouterConfig: {
+            location: {
+              pathname: DASHBOARD_WIDGET_BUILDER_PATHNAME,
+              query: {
+                yAxis: [
+                  'avg(value,same_metric,counter,-)',
+                  'p50(value,same_metric,counter,-)',
+                ],
+                dataset: WidgetType.TRACEMETRICS,
+                displayType: DisplayType.LINE,
+              },
+            },
+          },
+        }
+      );
+
+      expect(mockUseTraceItemSearchQueryBuilderProps).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributeQuery: createTraceMetricFilter({
+            name: 'same_metric',
+            type: 'counter',
+            unit: '-',
+          }),
+        })
+      );
+    });
+  });
 });

static/app/views/dashboards/datasetConfig/traceMetrics.tsx

@@ -32,7 +32,6 @@ import {DisplayType, type WidgetQuery} from 'sentry/views/dashboards/types';
 import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
 import {useTraceMetricMultiMetricSelection} from 'sentry/views/dashboards/widgetBuilder/hooks/useTraceMetricMultiMetricSelection';
 import {
-  extractTraceMetricFromAggregates,
   extractTraceMetricFromColumn,
   getTraceMetricAggregateSource,
 } from 'sentry/views/dashboards/widgetBuilder/utils/buildTraceMetricAggregate';
@@ -85,30 +84,13 @@ function TraceMetricsSearchBar({
   const {
     selection: {projects},
   } = usePageFilters();
-  const {state: widgetBuilderState} = useWidgetBuilderContext();
-  const hasMultiMetricSelection = useTraceMetricMultiMetricSelection();
-
-  const aggregateSource = getTraceMetricAggregateSource(
-    widgetBuilderState.displayType,
-    widgetBuilderState.yAxis,
-    widgetBuilderState.fields
-  );
-  const traceMetrics =
-    aggregateSource?.map(extractTraceMetricFromColumn).filter(defined) ?? [];
-
-  const hasMultipleMetrics = hasMultipleMetricsSelected(
-    traceMetrics,
-    hasMultiMetricSelection
-  );
+  const {attributeQuery, hasMultipleMetrics, traceMetrics} = useTraceMetricsSearchScope();
 
   // In the case of multiple metrics, wipe the query so it fetches all attributes
   const {attributes: stringAttributes, secondaryAliases: stringSecondaryAliases} =
     useTraceMetricItemAttributes(
       {
-        query:
-          !hasMultipleMetrics && traceMetrics[0]
-            ? createTraceMetricFilter(traceMetrics[0])
-            : undefined,
+        query: attributeQuery,
         enabled: defined(traceMetrics[0]), // Only enable if there is at least one metric
       },
       'string',
@@ -117,10 +99,7 @@ function TraceMetricsSearchBar({
   const {attributes: numberAttributes, secondaryAliases: numberSecondaryAliases} =
     useTraceMetricItemAttributes(
       {
-        query:
-          !hasMultipleMetrics && traceMetrics[0]
-            ? createTraceMetricFilter(traceMetrics[0])
-            : undefined,
+        query: attributeQuery,
         enabled: defined(traceMetrics[0]),
       },
       'number',
@@ -129,10 +108,7 @@ function TraceMetricsSearchBar({
   const {attributes: booleanAttributes, secondaryAliases: booleanSecondaryAliases} =
     useTraceMetricItemAttributes(
       {
-        query:
-          !hasMultipleMetrics && traceMetrics[0]
-            ? createTraceMetricFilter(traceMetrics[0])
-            : undefined,
+        query: attributeQuery,
         enabled: defined(traceMetrics[0]),
       },
       'boolean',
@@ -159,11 +135,7 @@ function TraceMetricsSearchBar({
       namespace={hasMultipleMetrics ? undefined : traceMetrics?.[0]?.name}
       disableRecentSearches={hasMultipleMetrics}
       hiddenAttributeKeys={HiddenTraceMetricSearchFields}
-      attributeQuery={
-        !hasMultipleMetrics && traceMetrics[0]
-          ? createTraceMetricFilter(traceMetrics[0])
-          : undefined
-      }
+      attributeQuery={attributeQuery}
     />
   );
 }
@@ -172,33 +144,23 @@ function useTraceMetricsSearchBarDataProvider(
   props: SearchBarDataProviderProps
 ): SearchBarData {
   const {pageFilters, widgetQuery} = props;
-  const {state: widgetBuilderState} = useWidgetBuilderContext();
-
-  const aggregateSource = getTraceMetricAggregateSource(
-    widgetBuilderState.displayType,
-    widgetBuilderState.yAxis,
-    widgetBuilderState.fields
-  );
-  const traceMetric = extractTraceMetricFromAggregates(aggregateSource) ?? {
-    name: '',
-    type: '',
-  };
+  const {attributeQuery, traceMetrics} = useTraceMetricsSearchScope();
 
   const {attributes: stringAttributes, secondaryAliases: stringSecondaryAliases} =
     useTraceMetricItemAttributes(
-      {query: createTraceMetricFilter(traceMetric)},
+      {query: attributeQuery, enabled: defined(traceMetrics[0])},
       'string',
       HiddenTraceMetricSearchFields
     );
   const {attributes: numberAttributes, secondaryAliases: numberSecondaryAliases} =
     useTraceMetricItemAttributes(
-      {query: createTraceMetricFilter(traceMetric)},
+      {query: attributeQuery, enabled: defined(traceMetrics[0])},
       'number',
       HiddenTraceMetricSearchFields
     );
   const {attributes: booleanAttributes, secondaryAliases: booleanSecondaryAliases} =
     useTraceMetricItemAttributes(
-      {query: createTraceMetricFilter(traceMetric)},
+      {query: attributeQuery, enabled: defined(traceMetrics[0])},
       'boolean',
       HiddenTraceMetricSearchFields
     );
@@ -216,7 +178,7 @@ function useTraceMetricsSearchBarDataProvider(
       initialQuery: widgetQuery?.conditions ?? '',
       projects: pageFilters.projects,
       hiddenAttributeKeys: HiddenTraceMetricSearchFields,
-      attributeQuery: createTraceMetricFilter(traceMetric),
+      attributeQuery,
     });
 
   return {
@@ -226,6 +188,29 @@ function useTraceMetricsSearchBarDataProvider(
   };
 }
 
+function useTraceMetricsSearchScope() {
+  const {state: widgetBuilderState} = useWidgetBuilderContext();
+  const hasMultiMetricSelection = useTraceMetricMultiMetricSelection();
+
+  const aggregateSource = getTraceMetricAggregateSource(
+    widgetBuilderState.displayType,
+    widgetBuilderState.yAxis,
+    widgetBuilderState.fields
+  );
+  const traceMetrics =
+    aggregateSource?.map(extractTraceMetricFromColumn).filter(defined) ?? [];
+  const hasMultipleMetrics = hasMultipleMetricsSelected(
+    traceMetrics,
+    hasMultiMetricSelection
+  );
+  const attributeQuery =
+    !hasMultipleMetrics && traceMetrics[0]
+      ? createTraceMetricFilter(traceMetrics[0])
+      : undefined;
+
+  return {attributeQuery, hasMultipleMetrics, traceMetrics};
+}
+
 export function formatTraceMetricsFunction(
   valueToParse: string | string[],
   defaultValue?: string | ReactNode