Skip to content

fix(apm): Adjust transaction name normalization #18968

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

Merged
dashed merged 3 commits into from
May 21, 2020
Merged

fix(apm): Adjust transaction name normalization #18968

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
024919b
handle blanks
dashed May 21, 2020
0d98f5f
if routePath is either blank or /*, then fallback to window.location.…
dashed May 21, 2020
10d9892
if the react-router route matching emits an error, fallback to window…
dashed May 21, 2020
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
21 changes: 12 additions & 9 deletions src/sentry/static/sentry/app/utils/apm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export async function normalizeTransactionName(

let prevTransactionName = event.transaction;

if (typeof prevTransactionName === 'string') {
if (typeof prevTransactionName === 'string' && prevTransactionName.length > 0) {
if (prevTransactionName.startsWith('/')) {
return event;
}
Expand All @@ -43,7 +43,7 @@ export async function normalizeTransactionName(
prevTransactionName = window.location.pathname;
}

const transactionName: string | undefined = await new Promise(function(resolve) {
const transactionName: string = await new Promise(function(resolve) {
Router.match(
{
routes: appRoutes,
Expand All @@ -52,25 +52,28 @@ export async function normalizeTransactionName(
(error, _redirectLocation, renderProps) => {
if (error) {
set(event, ['tags', 'transaction.rename.router-match'], 'error');
return resolve(undefined);
return resolve(window.location.pathname);
}

set(event, ['tags', 'transaction.rename.router-match'], 'success');

const routePath = getRouteStringFromRoutes(renderProps.routes ?? []);

if (routePath.length === 0 || routePath === '/*') {
return resolve(window.location.pathname);
}

return resolve(routePath);
}
);
});

if (typeof transactionName === 'string' && transactionName.length) {
event.transaction = transactionName;
event.transaction = transactionName;

set(event, ['tags', 'transaction.rename.before'], prevTransactionName);
set(event, ['tags', 'transaction.rename.after'], transactionName);
set(event, ['tags', 'transaction.rename.before'], prevTransactionName);
set(event, ['tags', 'transaction.rename.after'], transactionName);

set(event, ['tags', 'ui.route'], transactionName);
}
set(event, ['tags', 'ui.route'], transactionName);

return event;
}