feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mydea@AbhiPrasad
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mydea@AbhiPrasad
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mydea@AbhiPrasad
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

feat(node-experimental): Keep breadcrumbs on transaction - #8967

Merged
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs
Sep 12, 2023
Merged

feat(node-experimental): Keep breadcrumbs on transaction#8967
AbhiPrasad merged 1 commit into
developfrom
fn/otel-scope-breadcrumbs

Conversation

@mydea

@mydeamydea commented Sep 7, 2023

Copy link
Copy Markdown
Member

This implements an experimental way to handle breadcrumbs for the POTEL world.

This patches stuff so that we get the breadcrumbs from the root transaction, instead of from the scope. This is how it works:

  • Patches Scope.addBreadcrumb() to fetch the current transaction, and if there is one, add breadcrumbs there
  • Patches Scope.getBreadcrumbs() to fetch breadcrumbs from current transaction (if there is one)
  • Patches hub stuff to ensure we always create a patched OtelScope
  • Patches transaction in-place via Proxy to allow to store breadcrumbs on them.
  • Patches _prepareEvent on the experimental node Client to ensure captureContext works

How does that work with breadcrumbs in practice

This means that for each isolated request (=that creates its own transaction), we'll keep the breadcrumbs in there. So anything that happens inside of this branch will get all breadcrumbs from this transaction.

This works well 98% of the time, in my testing. For most scenarios, this resulted in the most correct (subjectively speaking) breadcrumbs for both transactions as well as errors.

Note that one scenario where this may not work as expected is with parallel withScope() calls, e.g.:

app.get("/multiple-scopes",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{constinner=`scope1-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});Sentry.withScope((scope)=>{constinner=`scope2-${id}`;console.log(inner);Sentry.captureException(newError(`parallel error ${inner}`));});});

In this scenario, parallel error 2 will also show console.log(scope1-...).
For me, this is an acceptable case for now.

On the other hand, here are some cases where it works as expected:

app.get("/parallel-error",(request,reply)=>{constid=Math.floor(Math.random()*1000000);console.log(`parallel request ${id}`);Sentry.withScope((scope)=>{scope.setTag("parallel-outer",`${id}`);scope.setUser({id: `user-${id}`,email: 'test@example.com'});console.log('outer scope',scope._tags)setTimeout(()=>{makeRequest(`http://example.com/${id}`).then(()=>{Sentry.withScope((innerScope)=>{innerScope.setTag("parallel-inner",`${id}`);innerScope.setTag(`parallel-inner-${id}`,`${id}`);console.log("inner scope",innerScope._tags);Sentry.captureException(newError(`parallel error ${id}`));reply.send({hello: "world",status: 'OK', id });})})},5000);});});
app.get("/error",async(request,reply)=>{console.log('before request');awaitmakeRequest(`http://example.com/`);console.log('after request');Sentry.captureException(newError(`test error`));console.log('after capture');reply.send({status: "OK"})});

Overall, I think it works much better than the status quo of the POTEL-backed version.

TODO: What if no transactions?

With the current implementation, this means that if you do not enable tracing, you'll get "incorrect" breadcrumbs again (=the old behavior).

We actually always initialize OTEL (even if tracing is not enabled), but we do not setup any default performance integrations, thus do not generate any transactions by default etc. Probably OK for now (=it will still kind of work, but not great), something to think about later.

@mydeamydea self-assigned this Sep 7, 2023
@github-actions

github-actionsBot commented Sep 7, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.29 KB (-0.1% 🔽)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.29 KB (+0.06% 🔺)
@sentry/browser - Webpack (gzipped)21.89 KB (+0.07% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70 KB (-0.14% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.4 KB (-0.07% 🔽)
@sentry/browser - ES6 CDN Bundle (gzipped)20.47 KB (-0.06% 🔽)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)221.17 KB (-0.17% 🔽)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)85.82 KB (+0.01% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)60.67 KB (+0.02% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.28 KB (-0.06% 🔽)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.32 KB (-0.1% 🔽)
@sentry/react - Webpack (gzipped)21.92 KB (+0.07% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.18 KB (-0.08% 🔽)
@sentry/nextjs Client - Webpack (gzipped)50.85 KB (+0.04% 🔺)

@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch 2 times, most recently from 9d97db3 to 2b49b16CompareSeptember 7, 2023 10:03
This allows us to circumvent the scope/hub nesting issues we get with OTEL-backed hub forking.
@mydea
mydea marked this pull request as ready for review September 11, 2023 09:10
@mydea
mydeaforce-pushed the fn/otel-scope-breadcrumbs branch from 2b49b16 to 5859e84CompareSeptember 11, 2023 09:10

@AbhiPrasadAbhiPrasad left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Let's experiment with this, I'd be interested to see what the data looks like.

return transaction;
}

return new Proxy(transaction as TransactionWithBreadcrumbs, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

l: we can proxy patch startTransaction (hub extension) so that we don't have to rely on getActiveTransaction being used all the time.

Can skip this for now just to get it merged.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Good idea, wrote something up here: #9010

@AbhiPrasad
AbhiPrasad merged commit 789e849 into developSep 12, 2023
@AbhiPrasad
AbhiPrasad deleted the fn/otel-scope-breadcrumbs branch September 12, 2023 19:08
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mydea@AbhiPrasad