Skip to content

fix(aci): Remove hardcoded event.type:transactions from query #101361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −43
Open

fix(aci): Remove hardcoded event.type:transactions from query #101361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 2 additions & 32 deletions static/app/views/detectors/datasetConfig/transactions.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,6 @@ import {Dataset, EventTypes} from 'sentry/views/alerts/rules/metric/types';
import {DetectorTransactionsConfig} from 'sentry/views/detectors/datasetConfig/transactions';

describe('DetectorTransactionsConfig', () => {
describe('toSnubaQueryString', () => {
it('passes through when already contains event.type:transaction', () => {
const query = 'event.type:transaction transaction.duration:>0';
expect(
DetectorTransactionsConfig.toSnubaQueryString({
eventTypes: [EventTypes.TRANSACTION],
query,
})
).toBe(query);
});

it('prefixes event.type:transaction when missing', () => {
const query = 'transaction.duration:>0 service:web';
expect(
DetectorTransactionsConfig.toSnubaQueryString({
eventTypes: [EventTypes.TRANSACTION],
query,
})
).toBe(`event.type:transaction ${query}`);
});
});

describe('getDiscoverDataset', () => {
it('returns METRICS_ENHANCED for transactions', () => {
expect(DetectorTransactionsConfig.getDiscoverDataset()).toBe(
DiscoverDatasets.METRICS_ENHANCED
);
});
});

describe('getSeriesQueryOptions', () => {
const organization = OrganizationFixture();

Expand All @@ -55,7 +25,7 @@ describe('DetectorTransactionsConfig', () => {
expect(key[0]).toBe(`/organizations/${organization.slug}/events-stats/`);
const params = key[1]!.query!;
expect(params.dataset).toBe(DiscoverDatasets.METRICS_ENHANCED);
expect(params.query).toBe('event.type:transaction transaction.duration:>0');
expect(params.query).toBe('transaction.duration:>0');
expect(params.interval).toBe('1m');
expect(params.environment).toEqual(['prod']);
expect(params.project).toEqual(['1']);
Expand Down Expand Up @@ -99,7 +69,7 @@ describe('DetectorTransactionsConfig', () => {

const params = key[1]!.query!;
expect(params.dataset).toBe(DiscoverDatasets.METRICS_ENHANCED);
expect(params.query).toBe('event.type:transaction transaction.duration:>0');
expect(params.query).toBe('transaction.duration:>0');
expect(params.interval).toBe('1m');
});
});
Expand Down
12 changes: 1 addition & 11 deletions static/app/views/detectors/datasetConfig/transactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,7 @@ export const DetectorTransactionsConfig: DetectorDatasetConfig<TransactionsSerie
getTimePeriods: interval => getStandardTimePeriodsForInterval(interval),
separateEventTypesFromQuery: query =>
parseEventTypesFromQuery(query, DEFAULT_EVENT_TYPES),
toSnubaQueryString: snubaQuery => {
if (!snubaQuery) {
return '';
}

if (snubaQuery.query.includes('event.type:transaction')) {
return snubaQuery.query;
}

return `event.type:transaction ${snubaQuery.query}`;
},
toSnubaQueryString: snubaQuery => snubaQuery?.query ?? '',
transformSeriesQueryData: (data, aggregate) => {
return [transformEventsStatsToSeries(data, aggregate)];
},
Expand Down
Loading