Skip to content

fix(remix): Avoid rewrapping root loader.#16136

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
lforst merged 4 commits into from
Apr 28, 2025
Merged

fix(remix): Avoid rewrapping root loader. #16136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7c9372
fix(remix): Avoid rewrapping root loader.
onurtemizkan Apr 25, 2025
c0a0312
Bump `remix` to `2.16.5` in e2e test app.
onurtemizkan Apr 25, 2025
f9fced8
Match previous wrapper usage
onurtemizkan Apr 25, 2025
9df73ea
Align tests
onurtemizkan Apr 25, 2025
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
12 changes: 6 additions & 6 deletions dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
},
"dependencies": {
"@sentry/remix": "latest || *",
"@remix-run/css-bundle": "2.7.2",
"@remix-run/node": "2.7.2",
"@remix-run/react": "2.7.2",
"@remix-run/serve": "2.7.2",
"@remix-run/css-bundle": "2.16.5",
"@remix-run/node": "2.16.5",
"@remix-run/react": "2.16.5",
"@remix-run/serve": "2.16.5",
"isbot": "^3.6.8",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@playwright/test": "~1.50.0",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "2.7.2",
"@remix-run/eslint-config": "2.7.2",
"@remix-run/dev": "2.16.5",
"@remix-run/eslint-config": "2.16.5",
"@sentry/core": "latest || *",
"@types/react": "^18.0.35",
"@types/react-dom": "^18.0.11",
Expand Down
2 changes: 0 additions & 2 deletions dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;

@onurtemizkanonurtemizkanApr 25, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.


const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

expect(httpServerTraceId).toBeDefined();
expect(httpServerSpanId).toBeDefined();
expect(loaderSpanId).toBeDefined();

expect(pageLoadTraceId).toEqual(httpServerTraceId);
expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down
23 changes: 12 additions & 11 deletions packages/remix/src/server/instrumentServer.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
for (const [id, route] of Object.entries(build.routes)) {
const wrappedRoute = { ...route, module: { ...route.module } };

// Entry module should have a loader function to provide `sentry-trace` and `baggage`
// They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
if (!wrappedRoute.parentId) {
if (!wrappedRoute.module.loader) {
wrappedRoute.module.loader = () => ({});
}

if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
}
}

const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
if (routeAction && !routeAction.__sentry_original__) {
fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
}

// Entry module should have a loader function to provide `sentry-trace` and `baggage`
// They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
if (!wrappedRoute.parentId) {
if (!wrappedRoute.module.loader) {
wrappedRoute.module.loader = () => ({});
}

// We want to wrap the root loader regardless of whether it's already wrapped before.
fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
}

routes[id] = wrappedRoute;
}

Expand Down
4 changes: 2 additions & 2 deletions packages/remix/test/integration/test/server/instrumentation/action.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
data: {
'code.function': 'loader',
'sentry.op': 'loader.remix',
'match.route.id': 'routes/action-json-response.$id',
'match.route.id': 'root',
'match.params.id': '123123',
},
},
{
data: {
'code.function': 'loader',
'sentry.op': 'loader.remix',
'match.route.id': 'root',
'match.route.id': 'routes/action-json-response.$id',
'match.params.id': '123123',
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/remix/test/integration/test/server/instrumentation/loader.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
data: {
'code.function': 'loader',
'sentry.op': 'loader.remix',
'match.route.id': 'routes/loader-defer-response.$id',
'match.route.id': 'root',
},
},
{
data: {
'code.function': 'loader',
'sentry.op': 'loader.remix',
'match.route.id': 'root',
'match.route.id': 'routes/loader-defer-response.$id',
},
},
],
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(remix): Avoid rewrapping root loader. by onurtemizkan · Pull Request #16136 · getsentry/sentry-javascript · GitHub
Skip to content
fix(remix): Avoid rewrapping root loader.#16136

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

lforst
merged 4 commits into

from

Apr 28, 2025
 Merged


fix(remix): Avoid rewrapping root loader.
#16136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a7c9372

fix(remix): Avoid rewrapping root loader.


onurtemizkan Apr 25, 2025
c0a0312

Bump `remix` to `2.16.5` in e2e test app.


onurtemizkan Apr 25, 2025
f9fced8

Match previous wrapper usage


onurtemizkan Apr 25, 2025
9df73ea

Align tests


onurtemizkan Apr 25, 2025

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


12 changes: 6 additions & 6 deletions
dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,19 +12,19 @@
 },
 "dependencies": {
 "@sentry/remix": "latest || *",
 "@remix-run/css-bundle": "2.7.2",
 "@remix-run/node": "2.7.2",
 "@remix-run/react": "2.7.2",
 "@remix-run/serve": "2.7.2",
 "@remix-run/css-bundle": "2.16.5",
 "@remix-run/node": "2.16.5",
 "@remix-run/react": "2.16.5",
 "@remix-run/serve": "2.16.5",
 "isbot": "^3.6.8",
 "react": "^18.2.0",
 "react-dom": "^18.2.0"
 },
 "devDependencies": {
 "@playwright/test": "~1.50.0",
 "@sentry-internal/test-utils": "link:../../../test-utils",
 "@remix-run/dev": "2.7.2",
 "@remix-run/eslint-config": "2.7.2",
 "@remix-run/dev": "2.16.5",
 "@remix-run/eslint-config": "2.16.5",
 "@sentry/core": "latest || *",
 "@types/react": "^18.0.35",
 "@types/react-dom": "^18.0.11",
Expand Down

2 changes: 0 additions & 2 deletions
dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
 const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
 const loaderSpanId = httpServerTransaction?.spans?.find(span => span.op === 'function.remix.loader')?.span_id;
@onurtemizkanonurtemizkanApr 25, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a loader span here, and not anymore. This was probably a result of unnecessary rewrapping. And that span didn't contribute to the span linking on Hydrogen.

 const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
Expand All@@ -50,7 +49,6 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page

 expect(httpServerTraceId).toBeDefined();
 expect(httpServerSpanId).toBeDefined();
 expect(loaderSpanId).toBeDefined();

 expect(pageLoadTraceId).toEqual(httpServerTraceId);
 expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
Expand Down

23 changes: 12 additions & 11 deletions
packages/remix/src/server/instrumentServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,18 @@ function instrumentBuildCallback(
 for (const [id, route] of Object.entries(build.routes)) {
 const wrappedRoute = { ...route, module: { ...route.module } };

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }
 }

 const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
 if (routeAction && !routeAction.__sentry_original__) {
 fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
Expand All@@ -374,17 +386,6 @@ function instrumentBuildCallback(
 fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
 }

 // Entry module should have a loader function to provide `sentry-trace` and `baggage`
 // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
 if (!wrappedRoute.parentId) {
 if (!wrappedRoute.module.loader) {
 wrappedRoute.module.loader = () => ({});
 }

 // We want to wrap the root loader regardless of whether it's already wrapped before.
 fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
 }

 routes[id] = wrappedRoute;
 }

Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/action.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,15 +28,15 @@ describe('Remix API Actions', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/action-json-response.$id',
 'match.route.id': 'root',
 'match.params.id': '123123',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/action-json-response.$id',
 'match.params.id': '123123',
 },
 },
Expand Down

4 changes: 2 additions & 2 deletions
packages/remix/test/integration/test/server/instrumentation/loader.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -242,14 +242,14 @@ describe('Remix API Loaders', () => {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'routes/loader-defer-response.$id',
 'match.route.id': 'root',
 },
 },
 {
 data: {
 'code.function': 'loader',
 'sentry.op': 'loader.remix',
 'match.route.id': 'root',
 'match.route.id': 'routes/loader-defer-response.$id',
 },
 },
 ],
Expand Down