fix(explore): restore trace item attribute typing

Restore type-specific trace item attribute requests for the key fetch hook and preserve secondary aliases for number and boolean attributes. Update the related frontend specs to match the current combined-request behavior used by the shared attribute context.

Co-Authored-By: Codex <noreply@openai.com>

Author: nsdeschenes

static/app/views/explore/contexts/traceItemAttributeContext.spec.tsx

@@ -50,18 +50,16 @@ describe('shouldRemoveNumberKey', () => {
 });
 
 function addAttributeMock(
-  attributeType: string,
-  body: Array<{key: string; name: string; secondaryAliases?: string[]}>
+  body: Array<{
+    attributeType: 'string' | 'number' | 'boolean';
+    key: string;
+    name: string;
+    secondaryAliases?: string[];
+  }>
 ) {
   MockApiClient.addMockResponse({
     url: '/organizations/org-slug/trace-items/attributes/',
     body,
-    match: [
-      (_url, options) => {
-        const query = options?.query || {};
-        return query.attributeType === attributeType;
-      },
-    ],
   });
 }
 
@@ -87,12 +85,11 @@ describe('useTraceItemAttributes number filtering', () => {
   it('filters out number attributes that overlap with boolean attributes', async () => {
     const organization = OrganizationFixture();
 
-    addAttributeMock('number', [
-      {key: 'is_transaction', name: 'is_transaction'},
-      {key: 'custom_metric', name: 'custom_metric'},
+    addAttributeMock([
+      {attributeType: 'number', key: 'is_transaction', name: 'is_transaction'},
+      {attributeType: 'number', key: 'custom_metric', name: 'custom_metric'},
+      {attributeType: 'boolean', key: 'is_transaction', name: 'is_transaction'},
     ]);
-    addAttributeMock('string', []);
-    addAttributeMock('boolean', [{key: 'is_transaction', name: 'is_transaction'}]);
 
     const {result} = renderHookWithProviders(
       () =>
@@ -117,12 +114,10 @@ describe('useTraceItemAttributes number filtering', () => {
   it('filters number attributes that overlap with default boolean attributes', async () => {
     const organization = OrganizationFixture();
 
-    addAttributeMock('number', [
-      {key: 'is_transaction', name: 'is_transaction'},
-      {key: 'custom_metric', name: 'custom_metric'},
+    addAttributeMock([
+      {attributeType: 'number', key: 'is_transaction', name: 'is_transaction'},
+      {attributeType: 'number', key: 'custom_metric', name: 'custom_metric'},
     ]);
-    addAttributeMock('string', []);
-    addAttributeMock('boolean', []);
 
     const {result} = renderHookWithProviders(
       () =>
@@ -147,13 +142,18 @@ describe('useTraceItemAttributes number filtering', () => {
   it('filters tags[key,number] format when boolean version exists', async () => {
     const organization = OrganizationFixture();
 
-    addAttributeMock('number', [
-      {key: 'tags[is_transaction,number]', name: 'tags[is_transaction,number]'},
-      {key: 'custom_metric', name: 'custom_metric'},
-    ]);
-    addAttributeMock('string', []);
-    addAttributeMock('boolean', [
-      {key: 'tags[is_transaction,boolean]', name: 'tags[is_transaction,boolean]'},
+    addAttributeMock([
+      {
+        attributeType: 'number',
+        key: 'tags[is_transaction,number]',
+        name: 'tags[is_transaction,number]',
+      },
+      {attributeType: 'number', key: 'custom_metric', name: 'custom_metric'},
+      {
+        attributeType: 'boolean',
+        key: 'tags[is_transaction,boolean]',
+        name: 'tags[is_transaction,boolean]',
+      },
     ]);
 
     const {result} = renderHookWithProviders(
@@ -179,16 +179,18 @@ describe('useTraceItemAttributes number filtering', () => {
   it('filters overlapping number secondary aliases when boolean version exists', async () => {
     const organization = OrganizationFixture();
 
-    addAttributeMock('number', [
+    addAttributeMock([
       {
+        attributeType: 'number',
         key: 'custom_metric',
         name: 'custom_metric',
         secondaryAliases: ['tags[is_transaction,number]', 'tags[custom_metric,number]'],
       },
-    ]);
-    addAttributeMock('string', []);
-    addAttributeMock('boolean', [
-      {key: 'tags[is_transaction,boolean]', name: 'tags[is_transaction,boolean]'},
+      {
+        attributeType: 'boolean',
+        key: 'tags[is_transaction,boolean]',
+        name: 'tags[is_transaction,boolean]',
+      },
     ]);
 
     const {result} = renderHookWithProviders(
@@ -214,12 +216,11 @@ describe('useTraceItemAttributes number filtering', () => {
   it('preserves non-overlapping number attributes', async () => {
     const organization = OrganizationFixture();
 
-    addAttributeMock('number', [
-      {key: 'custom_metric', name: 'custom_metric'},
-      {key: 'another_metric', name: 'another_metric'},
+    addAttributeMock([
+      {attributeType: 'number', key: 'custom_metric', name: 'custom_metric'},
+      {attributeType: 'number', key: 'another_metric', name: 'another_metric'},
+      {attributeType: 'boolean', key: 'is_transaction', name: 'is_transaction'},
     ]);
-    addAttributeMock('string', []);
-    addAttributeMock('boolean', [{key: 'is_transaction', name: 'is_transaction'}]);
 
     const {result} = renderHookWithProviders(
       () =>

static/app/views/explore/hooks/useGetTraceItemAttributeKeys.tsx

@@ -17,6 +17,7 @@ interface UseGetTraceItemAttributeKeysProps extends UseTraceItemAttributeBasePro
 
 export function useGetTraceItemAttributeKeys({
   traceItemType,
+  type,
   projectIds,
   query,
 }: UseGetTraceItemAttributeKeysProps) {
@@ -33,6 +34,7 @@ export function useGetTraceItemAttributeKeys({
             organization,
             selection,
             traceItemType,
+            type,
             projectIds: projectIds ?? selection.projects,
             search: queryString,
             query,
@@ -44,10 +46,7 @@ export function useGetTraceItemAttributeKeys({
         throw new Error(`Unable to fetch trace item attribute keys: ${e}`);
       }
 
-      const {booleanAttributes, numberAttributes, stringAttributes} =
-        getTraceItemTagCollection(result);
-
-      return {...booleanAttributes, ...numberAttributes, ...stringAttributes};
+      return getTraceItemTagCollection(result, type);
     },
   });
 

static/app/views/explore/metrics/metricToolbar/index.spec.tsx

@@ -91,19 +91,16 @@ describe('MetricToolbar', () => {
     expect(await screen.findByRole('button', {name: /Group by/})).toBeInTheDocument();
 
     // The query is left undefined for the attributes request because
-    // we currently don't filter the attributes for equations
-    ['string', 'number', 'boolean'].forEach(attributeType => {
-      expect(mockAttributesRequest).toHaveBeenCalledWith(
-        '/organizations/org-slug/trace-items/attributes/',
-        expect.objectContaining({
-          query: expect.objectContaining({
-            itemType: 'tracemetrics',
-            attributeType,
-            query: undefined,
-          }),
-        })
-      );
-    });
+    // we currently don't filter the attributes for equations.
+    expect(mockAttributesRequest).toHaveBeenCalledWith(
+      '/organizations/org-slug/trace-items/attributes/',
+      expect.objectContaining({
+        query: expect.objectContaining({
+          itemType: 'tracemetrics',
+          attributeType: ['string', 'number', 'boolean'],
+        }),
+      })
+    );
   });
 
   it('renders group by selector for function visualizations', async () => {

static/app/views/explore/utils/traceItemAttributeKeysOptions.tsx

@@ -62,7 +62,7 @@ export function traceItemAttributeKeysOptions({
   const substringMatch = search || undefined;
   const options: TraceItemAttributeKeyOptions = {
     itemType: traceItemType,
-    attributeType: Array.isArray(type) ? type : [type],
+    attributeType: type,
     project: projectIds?.map(String),
     query,
     ...normalizeDateTimeParams(selection.datetime),
@@ -159,12 +159,14 @@ export function getTraceItemTagCollection(
         key: attribute.key,
         name: attribute.name,
         kind: FieldKind.MEASUREMENT,
+        secondaryAliases: attribute?.secondaryAliases ?? [],
       };
     } else if (type === 'boolean' || attribute.attributeType === 'boolean') {
       booleanAttributes[attribute.key] = {
         key: attribute.key,
         name: attribute.name,
         kind: FieldKind.BOOLEAN,
+        secondaryAliases: attribute?.secondaryAliases ?? [],
       };
     }
   }