feat(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea
, '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(core): Deprecate session APIs on hub and add global replacements - #10054

Merged
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session
Jan 5, 2024
Merged

feat(core): Deprecate session APIs on hub and add global replacements#10054
Lms24 merged 10 commits into
developfrom
lms/feat-start-end-session

Conversation

@Lms24

@Lms24Lms24 commented Jan 4, 2024

Copy link
Copy Markdown
Member

Deprecates and adds top-level replacements for

  • hub.startSession -> Sentry.startSession
  • hub.endSession -> Sentry.endSession
  • hub.captureException -> Sentry.captureSession

These APIs were mostly used in browser and node startSessionTracking functions which were called on Sentry.init. I updated these usages with the global replacements and it seems integration tests are happy with it.
For now, we not only put the session onto the isolation scope but also onto the current scope to avoid changing event processing and stuff like the ANR worker, as well as avoid "soft-breaking" users who use hub.(get|set)Session.

Also, it looks like we didn't have unit tests for session APIs before (but we did have integration tests). Therefore

  • added integration test, explicitly testing the deprecated hub.startSession API
  • previously existing session integration tests now test the new top level API
  • added basic unit tests for the deprecated API
  • added basic unit tests for the new top level API

ref #10033

Comment threadpackages/core/src/baseclient.ts Outdated
}

const session = scope && scope.getSession();
const session = (scope && scope.getSession()) || getIsolationScope().getSession();

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.

This makes me a bit uncomfortable tbh, not sure if we for now should simply still use hub.startSession in browser/node startSessionTracking. But this change seems to be necessary for browser, since scope.getSession() returned undefined

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm, is this correct in the new implementation, I wonder? Or should we simply always take the one from the isolation scope? 🤔 because the scope here would generally be the final scope being applied and can even be a temporary scope, like new Scope() 🤔

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

thinking about this, I guess it doesn't hurt, if you pass a scope that actually has a session on it I guess it makes sense that we use this. But it will/should use the isolationScope in 99% of cases I guess?

@Lms24Lms24Jan 4, 2024

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.

hmm, is this correct in the new implementation, I wonder?

You mean that we set it onto the isolation scope? I think that should be correct 🤔
EDIT: But not "complete" (see answer below)

Or should we simply always take the one from the isolation scope? 🤔

I guess it would be more correct if we're okay with not supporting people adding their own session to their current scope 🤔 Not sure if that's even a thing...

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.

Oh wait, for v7 we probably still need to set the session also on the current scope, right? So that getCurrentHub().getScope().getSession() still returns the session

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.

This probably makes calling getIsolationScope obsolete here

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

hmm I guess so, you're right! :(

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.

Reworked the top level APIs to also modify the current scope's session. For now this will work and spare us mocking with event processing

@github-actions

github-actionsBot commented Jan 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)76.26 KB (+0.16% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)67.64 KB (+0.18% 🔺)
@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)61.26 KB (+0.19% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)32.28 KB (+0.47% 🔺)
@sentry/browser (incl. Feedback) - Webpack (gzipped)30.62 KB (+0.42% 🔺)
@sentry/browser - Webpack (gzipped)22.37 KB (+0.75% 🔺)
@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)73.71 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)65.36 KB (+0.21% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)31.53 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)23.49 KB (+0.57% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)204.96 KB (+0.24% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)94.85 KB (+0.52% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)69.71 KB (+0.71% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)34.48 KB (+0.26% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)68.02 KB (+0.14% 🔺)
@sentry/react - Webpack (gzipped)22.4 KB (+0.74% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)84.75 KB (+0.19% 🔺)
@sentry/nextjs Client - Webpack (gzipped)49.36 KB (+0.34% 🔺)
@sentry-internal/feedback - Webpack (gzipped)16.73 KB (0%)

@Lms24
Lms24 requested review from lforst and mydeaJanuary 4, 2024 12:34
const client = getClient();
const isolationScope = getIsolationScope();

const { release, environment = DEFAULT_ENVIRONMENT } = (client && client.getOptions()) || {};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: should we maybe just bail out if no client is found? Doesn't matter probably, but for clarity...

@Lms24Lms24Jan 4, 2024

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.

Hmm thinking about this, if we do so, we have to return undefined which I'm not sure we want to do. Also this means the signature of the replacement would slightly differ from the deprecated hub method. Since we're only taking env and release from the client I think it's okay to continue. Obviously, no
session will be sent but to me this aligns more with the concept of no-op spans for example.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, sounds good to me!

Comment threadpackages/core/src/exports.ts Outdated
});

// End existing session if there's one
const currentSession = isolationScope.getSession && isolationScope.getSession();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

l: IMHO no need to check for getSession existance, if you have code without this everything will fail here anyhow I guess xD

@Lms24Lms24 self-assigned this Jan 4, 2024
@Lms24
Lms24 marked this pull request as ready for review January 4, 2024 15:13
@Lms24
Lms24 requested review from AbhiPrasad and mydeaJanuary 4, 2024 15:13
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch 2 times, most recently from 7c8f841 to f392633CompareJanuary 4, 2024 16:51
Comment threadpackages/node/src/integrations/anr/index.ts Outdated
@Lms24
Lms24force-pushed the lms/feat-start-end-session branch from 24181c7 to 566016dCompareJanuary 5, 2024 12:45
@Lms24
Lms24 enabled auto-merge (squash) January 5, 2024 12:57
@Lms24
Lms24 merged commit ecb4f7f into developJan 5, 2024
@Lms24
Lms24 deleted the lms/feat-start-end-session branch January 5, 2024 13:28
c298lee pushed a commit that referenced this pull request Jan 9, 2024
…#10054)
Deprecates and adds top-level replacements for
* `hub.startSession` -> `Sentry.startSession`
* `hub.endSession` -> `Sentry.endSession`
* `hub.captureException` -> `Sentry.captureSession`
These APIs were mostly used in browser and node `startSessionTracking`
functions which were called on `Sentry.init`. I updated these usages
with the global replacements and it seems integration tests are happy
with it.
For now, we not only put the session onto the isolation scope but also
onto the current scope to avoid changing event processing and stuff like
the ANR worker, as well as avoid "soft-breaking" users who use
`hub.(get|set)Session`.
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

@Lms24@mydea