Skip to content
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

Jump to bottom

fix(remix): Pass transaction name as route to RequestData. #6276

Merged
merged 1 commit into from
Nov 24, 2022
Merged

fix(remix): Pass transaction name as route to RequestData. #6276

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 23 additions & 5 deletions packages/remix/src/utils/instrumentServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,20 @@ async function captureRemixServerException(err: Error, name: string, request: Re
const normalizedRequest = normalizeRemixRequest(request as unknown as any);

captureException(isResponse(err) ? await extractResponseError(err) : err, scope => {
scope.setSDKProcessingMetadata({ request: normalizedRequest });
const activeTransactionName = getActiveTransaction()?.name;

scope.setSDKProcessingMetadata({
request: {
...normalizedRequest,
// When `route` is not defined, `RequestData` integration uses the full URL
route: activeTransactionName
? {
path: activeTransactionName,
}
: undefined,
},
});

scope.addEventProcessor(event => {
addExceptionMechanism(event, {
type: 'instrument',
Expand Down Expand Up @@ -378,19 +391,24 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui

const normalizedRequest = normalizeRemixRequest(request);

const url = new URL(request.url);
const [name, source] = getTransactionName(routes, url, pkg);

if (scope) {
scope.setSDKProcessingMetadata({
request: normalizedRequest,
request: {
...normalizedRequest,
route: {
path: name,
},
},
});
}

if (!options || !hasTracingEnabled(options)) {
return origRequestHandler.call(this, request, loadContext);
}

const url = new URL(request.url);
const [name, source] = getTransactionName(routes, url, pkg);

const transaction = startRequestHandlerTransaction(hub, name, source, {
headers: {
'sentry-trace': request.headers.get('sentry-trace') || '',
Expand Down