feat(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@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(core): Introduce processEvent hook on Integration - #9017

Merged
mydea merged 3 commits into
developfrom
fn/integration-processEvent
Sep 15, 2023
Merged

feat(core): Introduce processEvent hook on Integration#9017
mydea merged 3 commits into
developfrom
fn/integration-processEvent

Conversation

@mydea

Copy link
Copy Markdown
Member

This adds a new (optional) processEvent hook on the Integration interface, which allows to register an event processor for the current client only.

This has actually correct semantics in that the processor will only be registered for the client that the integration is added for. This is done by adding a new addEventProcessor method on the client, which for now are called after all global & scope event processors.

Previously, all integrations always registered a global event processor, which is not really necessary. With this, we can be much more focused & also skip checking for existence of the integration on the client etc.

Supersedes #9015

@github-actions

github-actionsBot commented Sep 13, 2023

Copy link
Copy Markdown
Contributor

size-limit report 📦

PathSize
@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)75.52 KB (+0.17% 🔺)
@sentry/browser (incl. Tracing) - Webpack (gzipped)31.39 KB (+0.22% 🔺)
@sentry/browser - Webpack (gzipped)21.99 KB (+0.33% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)70.25 KB (+0.12% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)28.59 KB (+0.31% 🔺)
@sentry/browser - ES6 CDN Bundle (gzipped)20.66 KB (+0.31% 🔺)
@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)222.09 KB (+0.14% 🔺)
@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)86.63 KB (+0.35% 🔺)
@sentry/browser - ES6 CDN Bundle (minified & uncompressed)61.48 KB (+0.5% 🔺)
@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)31.46 KB (+0.25% 🔺)
@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)75.54 KB (+0.17% 🔺)
@sentry/react - Webpack (gzipped)22.02 KB (+0.32% 🔺)
@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)93.43 KB (+0.17% 🔺)
@sentry/nextjs Client - Webpack (gzipped)51.02 KB (+0.27% 🔺)

* An optional hook that allows to process an event.
* Return `null` to drop the event, or mutate the event & return it.
*/
processEvent?(event: Event, hint: EventHint | undefined, client: Client): Event | null | PromiseLike<Event | null>;

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.

giga nit: Can we add JS doc explaining that the client arg here is the client that recorded the event?

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.

ah, true, didn't actually update the comment here yet, will do!

@Lms24Lms24 left a comment

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.

Looks good to me! Can we add some tests around registering the processEvent hooks? (Feel free to disgregard if this is done anyway in follow-up PRs).

@mydea
mydeaforce-pushed the fn/integration-processEvent branch from c2d603d to c354494CompareSeptember 14, 2023 14:42
@mydea

Copy link
Copy Markdown
MemberAuthor

I added tests for the new integration API, and actually also for setupOnce & preprocessEvent, to really make the expected/current behavior clear!

return result
.then(evt => {
// Process client-scoped event processors
return client && client.getEventProcessors ? notifyEventProcessors(client.getEventProcessors(), evt, hint) : evt;

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.

I actually noticed a problem with the implementation in one of the other PRs (for browser). Which is that we can't just call this after prepareEvent is completed in the baseclient, because then the stuff that happens in here below will not be applied correctly.

So I updated it to instead run this here. And I am wondering, what do you think is nicer:

  1. Expose getEventProcessors() on the client (like I did here)
  2. Instead expose e.g. applyToEvent() like we have on the scope and call that directly (which under the hood applies the event processors)?

cc @AbhiPrasad / @Lms24 / @lforst

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 do getEventProcessors on the client - I'd rather not show more internals than what is needed.

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.

sounds good. we maybe will adjust this for v8 anyhow if we adjust the event processing pipeline, but should be good for now I guess.

@mydea
mydea merged commit 2356e80 into developSep 15, 2023
@mydea
mydea deleted the fn/integration-processEvent branch September 15, 2023 08:07
billyvg pushed a commit that referenced this pull request Sep 15, 2023
This adds a new (optional) `processEvent` hook on the `Integration`
interface, which allows to register an event processor **for the current
client only**.
This has actually correct semantics in that the processor will only be
registered for the client that the integration is added for. This is
done by adding a new `addEventProcessor` method on the client, which for
now are called after all global & scope event processors.
Previously, all integrations always registered a _global_ event
processor, which is not really necessary. With this, we can be much more
focused & also skip checking for existence of the integration on the
client etc.
@timfish

timfish commented Oct 2, 2023

Copy link
Copy Markdown
Collaborator

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

The hint: EventHint | undefined parameter in this new hook means that it cannot be used to add attachments.

All the other event processor functions don't allow undefined here and pass an empty object so you can add attachments to events like this:

hint.attachments=hint.attachments||[];hint.attachments.push({...});

Hmm, good catch! We can update this in a backwards compatible way (just update the method signature), I think I just copied this from preprocessEvent but this works differently. I'll do this!

@mydea

mydea commented Oct 2, 2023

Copy link
Copy Markdown
MemberAuthor

See: #9151

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.

5 participants

@mydea@timfish@lforst@Lms24@AbhiPrasad