Skip to content

Commit df335b5

Browse files
colin-sentrycolin-sentry
authored
chore(dashboards): Delete old SpanTagsProvider, rename useSpanTags (#93915)
This provider hardcoded spans, and wasn't needed anymore. Let's move to a logs-inclusive world!
1 parent e346986 commit df335b5

37 files changed

+219
-258
lines changed

‎static/app/components/performance/spanSearchQueryBuilder.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
TraceItemSearchQueryBuilder,
2525
useSearchQueryBuilderProps,
2626
} from 'sentry/views/explore/components/traceItemSearchQueryBuilder';
27-
import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
27+
import {useTraceItemTags} from 'sentry/views/explore/contexts/spanTagsContext';
2828
import {TraceItemDataset} from 'sentry/views/explore/types';
2929
import {SPANS_FILTER_KEY_SECTIONS} from 'sentry/views/insights/constants';
3030
import {SpanIndexedField} from 'sentry/views/insights/types';
@@ -192,8 +192,8 @@ function IndexedSpanSearchQueryBuilder({
192192
}
193193

194194
function EapSpanSearchQueryBuilderWrapper(props: SpanSearchQueryBuilderProps) {
195-
const {tags: numberTags} = useSpanTags('number');
196-
const {tags: stringTags} = useSpanTags('string');
195+
const {tags: numberTags} = useTraceItemTags('number');
196+
const {tags: stringTags} = useTraceItemTags('string');
197197

198198
return (
199199
<EAPSpanSearchQueryBuilder

‎static/app/views/alerts/rules/metric/eapField.spec.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
33

44
import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
55

6-
import {DiscoverDatasets} from 'sentry/utils/discover/types';
76
import EAPField from 'sentry/views/alerts/rules/metric/eapField';
8-
import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
7+
import {TraceItemAttributeProvider} from 'sentry/views/explore/contexts/traceItemAttributeContext';
8+
import {TraceItemDataset} from 'sentry/views/explore/types';
99

1010
describe('EAPField', () => {
1111
const organization = OrganizationFixture();
@@ -20,9 +20,9 @@ describe('EAPField', () => {
2020

2121
it('renders', () => {
2222
render(
23-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
23+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
2424
<EAPField aggregate={'count(span.duration)'} onChange={() => {}} />
25-
</SpanTagsProvider>
25+
</TraceItemAttributeProvider>
2626
);
2727
expect(fieldsMock).toHaveBeenCalledWith(
2828
`/organizations/${organization.slug}/trace-items/attributes/`,
@@ -49,9 +49,9 @@ describe('EAPField', () => {
4949

5050
it('renders epm with argument disabled', () => {
5151
render(
52-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
52+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
5353
<EAPField aggregate={'epm()'} onChange={() => {}} />
54-
</SpanTagsProvider>
54+
</TraceItemAttributeProvider>
5555
);
5656
expect(fieldsMock).toHaveBeenCalledWith(
5757
`/organizations/${organization.slug}/trace-items/attributes/`,
@@ -78,9 +78,9 @@ describe('EAPField', () => {
7878

7979
it('renders failure_rate with argument disabled', () => {
8080
render(
81-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
81+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
8282
<EAPField aggregate={'failure_rate()'} onChange={() => {}} />
83-
</SpanTagsProvider>
83+
</TraceItemAttributeProvider>
8484
);
8585
expect(fieldsMock).toHaveBeenCalledWith(
8686
`/organizations/${organization.slug}/trace-items/attributes/`,
@@ -108,9 +108,9 @@ describe('EAPField', () => {
108108
it('should call onChange with the new aggregate string when switching aggregates', async () => {
109109
const onChange = jest.fn();
110110
render(
111-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
111+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
112112
<EAPField aggregate={'count(span.duration)'} onChange={onChange} />
113-
</SpanTagsProvider>
113+
</TraceItemAttributeProvider>
114114
);
115115
expect(fieldsMock).toHaveBeenCalledWith(
116116
`/organizations/${organization.slug}/trace-items/attributes/`,
@@ -133,9 +133,9 @@ describe('EAPField', () => {
133133
function Component() {
134134
const [aggregate, setAggregate] = useState('count(span.duration)');
135135
return (
136-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
136+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
137137
<EAPField aggregate={aggregate} onChange={setAggregate} />
138-
</SpanTagsProvider>
138+
</TraceItemAttributeProvider>
139139
);
140140
}
141141

@@ -162,9 +162,9 @@ describe('EAPField', () => {
162162
function Component() {
163163
const [aggregate, setAggregate] = useState('count(span.duration)');
164164
return (
165-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
165+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
166166
<EAPField aggregate={aggregate} onChange={setAggregate} />
167-
</SpanTagsProvider>
167+
</TraceItemAttributeProvider>
168168
);
169169
}
170170

‎static/app/views/alerts/rules/metric/eapField.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
DEFAULT_VISUALIZATION_FIELD,
1818
updateVisualizeAggregate,
1919
} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
20-
import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
20+
import {useTraceItemTags} from 'sentry/views/explore/contexts/spanTagsContext';
2121

2222
const DEFAULT_EAP_AGGREGATION = 'count';
2323
const DEFAULT_EAP_FIELD = 'span.duration';
@@ -48,8 +48,8 @@ function EAPField({aggregate, onChange}: Props) {
4848
arguments: [field],
4949
} = parseFunction(aggregate) ?? {arguments: [undefined]};
5050

51-
const {tags: storedStringTags} = useSpanTags('string');
52-
const {tags: storedNumberTags} = useSpanTags('number');
51+
const {tags: storedStringTags} = useTraceItemTags('string');
52+
const {tags: storedNumberTags} = useTraceItemTags('number');
5353
const storedTags =
5454
aggregation === AggregationKey.COUNT_UNIQUE ? storedStringTags : storedNumberTags;
5555
const numberTags: TagCollection = useMemo(() => {

‎static/app/views/alerts/rules/metric/ruleConditionsForm.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ import {
7171
DEPRECATED_TRANSACTION_ALERTS,
7272
getSupportedAndOmittedTags,
7373
} from 'sentry/views/alerts/wizard/options';
74-
import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
74+
import {useTraceItemTags} from 'sentry/views/explore/contexts/spanTagsContext';
7575
import {TraceItemAttributeProvider} from 'sentry/views/explore/contexts/traceItemAttributeContext';
7676
import {TraceItemDataset} from 'sentry/views/explore/types';
7777
import {
@@ -775,8 +775,8 @@ function EAPSpanSearchQueryBuilderWithContext({
775775
onSearch,
776776
project,
777777
}: EAPSpanSearchQueryBuilderWithContextProps) {
778-
const {tags: numberTags} = useSpanTags('number');
779-
const {tags: stringTags} = useSpanTags('string');
778+
const {tags: numberTags} = useTraceItemTags('number');
779+
const {tags: stringTags} = useTraceItemTags('string');
780780
return (
781781
<EAPSpanSearchQueryBuilder
782782
numberTags={numberTags}

‎static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.spec.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import {WidgetQueryFixture} from 'sentry-fixture/widgetQuery';
44
import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
55

66
import type {TagValue} from 'sentry/types/group';
7-
import {DiscoverDatasets} from 'sentry/utils/discover/types';
87
import SpansSearchBar from 'sentry/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar';
9-
import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
8+
import {TraceItemAttributeProvider} from 'sentry/views/explore/contexts/traceItemAttributeContext';
9+
import {TraceItemDataset} from 'sentry/views/explore/types';
1010

1111
// The endpoint seems to just return these fields, but the original TagValue type
1212
// has extra fields related to user information that we don't seem to need.
@@ -19,9 +19,9 @@ function renderWithProvider({
1919
onClose,
2020
}: ComponentProps<typeof SpansSearchBar>) {
2121
return render(
22-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
22+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
2323
<SpansSearchBar widgetQuery={widgetQuery} onSearch={onSearch} onClose={onClose} />
24-
</SpanTagsProvider>
24+
</TraceItemAttributeProvider>
2525
);
2626
}
2727

‎static/app/views/dashboards/widgetBuilder/buildSteps/filterResultsStep/spansSearchBar.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {EAPSpanSearchQueryBuilder} from 'sentry/components/performance/spanSearc
22
import {ALLOWED_EXPLORE_VISUALIZE_AGGREGATES} from 'sentry/utils/fields';
33
import usePageFilters from 'sentry/utils/usePageFilters';
44
import type {WidgetBuilderSearchBarProps} from 'sentry/views/dashboards/datasetConfig/base';
5-
import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
5+
import {useTraceItemTags} from 'sentry/views/explore/contexts/spanTagsContext';
66

77
/**
88
* A search bar for exploring tags and values for spans in Dashboards.
@@ -20,8 +20,8 @@ function SpansSearchBar({
2020
const {
2121
selection: {projects},
2222
} = usePageFilters();
23-
const {tags: numberTags} = useSpanTags('number');
24-
const {tags: stringTags} = useSpanTags('string');
23+
const {tags: numberTags} = useTraceItemTags('number');
24+
const {tags: stringTags} = useTraceItemTags('string');
2525
return (
2626
<EAPSpanSearchQueryBuilder
2727
initialQuery={widgetQuery.conditions}

‎static/app/views/dashboards/widgetBuilder/components/groupBySelector.spec.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
22

33
import {render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
44

5-
import {DiscoverDatasets} from 'sentry/utils/discover/types';
65
import WidgetBuilderGroupBySelector from 'sentry/views/dashboards/widgetBuilder/components/groupBySelector';
76
import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
8-
import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
7+
import {TraceItemAttributeProvider} from 'sentry/views/explore/contexts/traceItemAttributeContext';
8+
import {TraceItemDataset} from 'sentry/views/explore/types';
99

1010
const organization = OrganizationFixture({
1111
features: [],
@@ -22,9 +22,9 @@ describe('WidgetBuilderGroupBySelector', function () {
2222
it('renders', async function () {
2323
render(
2424
<WidgetBuilderProvider>
25-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
25+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
2626
<WidgetBuilderGroupBySelector validatedWidgetResponse={{} as any} />
27-
</SpanTagsProvider>
27+
</TraceItemAttributeProvider>
2828
</WidgetBuilderProvider>,
2929
{
3030
organization,
@@ -39,9 +39,9 @@ describe('WidgetBuilderGroupBySelector', function () {
3939
it('renders the group by field and can function', async function () {
4040
render(
4141
<WidgetBuilderProvider>
42-
<SpanTagsProvider dataset={DiscoverDatasets.SPANS_EAP} enabled>
42+
<TraceItemAttributeProvider traceItemType={TraceItemDataset.SPANS} enabled>
4343
<WidgetBuilderGroupBySelector validatedWidgetResponse={{} as any} />
44-
</SpanTagsProvider>
44+
</TraceItemAttributeProvider>
4545
</WidgetBuilderProvider>,
4646
{
4747
organization,

‎static/app/views/dashboards/widgetBuilder/components/groupBySelector.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {GroupBySelector} from 'sentry/views/dashboards/widgetBuilder/buildSteps/
1313
import {SectionHeader} from 'sentry/views/dashboards/widgetBuilder/components/common/sectionHeader';
1414
import {useWidgetBuilderContext} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
1515
import {BuilderStateAction} from 'sentry/views/dashboards/widgetBuilder/hooks/useWidgetBuilderState';
16-
import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
16+
import {useTraceItemTags} from 'sentry/views/explore/contexts/spanTagsContext';
1717

1818
interface WidgetBuilderGroupBySelectorProps {
1919
validatedWidgetResponse: UseApiQueryResult<ValidateWidgetResponse, RequestError>;
@@ -27,8 +27,8 @@ function WidgetBuilderGroupBySelector({
2727
const organization = useOrganization();
2828

2929
let tags: TagCollection = useTags();
30-
const {tags: numericSpanTags} = useSpanTags('number');
31-
const {tags: stringSpanTags} = useSpanTags('string');
30+
const {tags: numericSpanTags} = useTraceItemTags('number');
31+
const {tags: stringSpanTags} = useTraceItemTags('string');
3232
if (state.dataset === WidgetType.SPANS) {
3333
tags = {...numericSpanTags, ...stringSpanTags};
3434
}

‎static/app/views/dashboards/widgetBuilder/components/newWidgetBuilder.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {space} from 'sentry/styles/space';
1818
import {CustomMeasurementsProvider} from 'sentry/utils/customMeasurements/customMeasurementsProvider';
1919
import type {TableDataWithTitle} from 'sentry/utils/discover/discoverQuery';
2020
import EventView from 'sentry/utils/discover/eventView';
21-
import {DiscoverDatasets} from 'sentry/utils/discover/types';
2221
import {MetricsCardinalityProvider} from 'sentry/utils/performance/contexts/metricsCardinality';
2322
import {MEPSettingProvider} from 'sentry/utils/performance/contexts/metricsEnhancedSetting';
2423
import {useDimensions} from 'sentry/utils/useDimensions';
@@ -51,7 +50,8 @@ import {
5150
WidgetBuilderProvider,
5251
} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
5352
import {DashboardsMEPProvider} from 'sentry/views/dashboards/widgetCard/dashboardsMEPContext';
54-
import {SpanTagsProvider} from 'sentry/views/explore/contexts/spanTagsContext';
53+
import {TraceItemAttributeProvider} from 'sentry/views/explore/contexts/traceItemAttributeContext';
54+
import {TraceItemDataset} from 'sentry/views/explore/types';
5555
import {useNavContext} from 'sentry/views/nav/context';
5656
import {usePrefersStackedNav} from 'sentry/views/nav/usePrefersStackedNav';
5757
import {MetricsDataSwitcher} from 'sentry/views/performance/landing/metricsDataSwitcher';
@@ -164,8 +164,8 @@ function WidgetBuilderV2({
164164
organization={organization}
165165
selection={selection}
166166
>
167-
<SpanTagsProvider
168-
dataset={DiscoverDatasets.SPANS_EAP}
167+
<TraceItemAttributeProvider
168+
traceItemType={TraceItemDataset.SPANS}
169169
enabled={organization.features.includes('visibility-explore-view')}
170170
>
171171
<ContainerWithoutSidebar
@@ -227,7 +227,7 @@ function WidgetBuilderV2({
227227
)}
228228
</WidgetBuilderContainer>
229229
</ContainerWithoutSidebar>
230-
</SpanTagsProvider>
230+
</TraceItemAttributeProvider>
231231
</CustomMeasurementsProvider>
232232
</WidgetBuilderProvider>
233233
)}

‎static/app/views/dashboards/widgetBuilder/components/queryFilterBuilder.spec.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import useCustomMeasurements from 'sentry/utils/useCustomMeasurements';
99
import {DisplayType, WidgetType} from 'sentry/views/dashboards/types';
1010
import WidgetBuilderQueryFilterBuilder from 'sentry/views/dashboards/widgetBuilder/components/queryFilterBuilder';
1111
import {WidgetBuilderProvider} from 'sentry/views/dashboards/widgetBuilder/contexts/widgetBuilderContext';
12-
import {useSpanTags} from 'sentry/views/explore/contexts/spanTagsContext';
12+
import {useTraceItemTags} from 'sentry/views/explore/contexts/spanTagsContext';
1313

1414
jest.mock('sentry/utils/useCustomMeasurements');
1515
jest.mock('sentry/views/explore/contexts/spanTagsContext');
@@ -21,7 +21,7 @@ describe('QueryFilterBuilder', () => {
2121
features: [],
2222
});
2323
jest.mocked(useCustomMeasurements).mockReturnValue({customMeasurements: {}});
24-
jest.mocked(useSpanTags).mockReturnValue({tags: {}, isLoading: false});
24+
jest.mocked(useTraceItemTags).mockReturnValue({tags: {}, isLoading: false});
2525

2626
MockApiClient.addMockResponse({url: '/organizations/org-slug/recent-searches/'});
2727
});

0 commit comments

Comments
 (0)