feat(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msonnb merged 7 commits into from
Jul 31, 2026
Merged

feat(ember)!: Use function and ui.task span ops for route hooks and runloop #22669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71a5e20
feat(ember)!: Use `function` span op for route hooks
msonnb Jul 27, 2026
019a544
test(e2e): Update ember route hook span assertions
msonnb Jul 27, 2026
9dcb64d
feat(ember)!: Use `ui.task` span op for runloop queues
msonnb Jul 27, 2026
8960d79
feat(ember)!: Use cross-framework span ops for component and init spans
msonnb Jul 27, 2026
d9b3e6c
use sentry.op
msonnb Jul 28, 2026
2ca3aa3
more sentry.op
msonnb Jul 28, 2026
63b4326
remove ember.route.hook
msonnb Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 29 additions & 18 deletions dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
});

const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
const beforeModelSpans = spans.filter(
span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
);
const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
const afterModelSpans = spans.filter(
span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
);
const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
expect(beforeModelSpans).toEqual([
{
data: {
'sentry.op': 'ui.ember.route.before_model',
'code.function.name': 'beforeModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route',
op: 'ui.ember.route.before_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
},
{
data: {
'sentry.op': 'ui.ember.route.before_model',
'code.function.name': 'beforeModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route.index',
op: 'ui.ember.route.before_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
expect(modelSpans).toEqual([
{
data: {
'sentry.op': 'ui.ember.route.model',
'code.function.name': 'model',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route',
op: 'ui.ember.route.model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
},
{
data: {
'sentry.op': 'ui.ember.route.model',
'code.function.name': 'model',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route.index',
op: 'ui.ember.route.model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
expect(afterModelSpans).toEqual([
{
data: {
'sentry.op': 'ui.ember.route.after_model',
'code.function.name': 'afterModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route',
op: 'ui.ember.route.after_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
},
{
data: {
'sentry.op': 'ui.ember.route.after_model',
'code.function.name': 'afterModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route.index',
op: 'ui.ember.route.after_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

expect(renderSpans).toContainEqual({
data: {
'sentry.op': 'ui.ember.runloop.render',
'ember.runloop.queue': 'render',
'sentry.op': 'ui.task',
'sentry.origin': 'auto.ui.ember',
},
description: 'runloop',
op: 'ui.ember.runloop.render',
op: 'ui.task',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand Down
47 changes: 29 additions & 18 deletions dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
});

const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
const beforeModelSpans = spans.filter(
span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
);
const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
const afterModelSpans = spans.filter(
span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
);
const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
expect(beforeModelSpans).toEqual([
{
data: {
'sentry.op': 'ui.ember.route.before_model',
'code.function.name': 'beforeModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route',
op: 'ui.ember.route.before_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
},
{
data: {
'sentry.op': 'ui.ember.route.before_model',
'code.function.name': 'beforeModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route.index',
op: 'ui.ember.route.before_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
expect(modelSpans).toEqual([
{
data: {
'sentry.op': 'ui.ember.route.model',
'code.function.name': 'model',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route',
op: 'ui.ember.route.model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
},
{
data: {
'sentry.op': 'ui.ember.route.model',
'code.function.name': 'model',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route.index',
op: 'ui.ember.route.model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
expect(afterModelSpans).toEqual([
{
data: {
'sentry.op': 'ui.ember.route.after_model',
'code.function.name': 'afterModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route',
op: 'ui.ember.route.after_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
},
{
data: {
'sentry.op': 'ui.ember.route.after_model',
'code.function.name': 'afterModel',
'sentry.op': 'function',
'sentry.origin': 'auto.ui.ember',
'sentry.source': 'custom',
},
description: 'slow-loading-route.index',
op: 'ui.ember.route.after_model',
op: 'function',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

expect(renderSpans).toContainEqual({
data: {
'sentry.op': 'ui.ember.runloop.render',
'ember.runloop.queue': 'render',
'sentry.op': 'ui.task',
'sentry.origin': 'auto.ui.ember',
},
description: 'runloop',
op: 'ui.ember.runloop.render',
op: 'ui.task',
origin: 'auto.ui.ember',
status: 'ok',
parent_span_id: spanId,
Expand Down
27 changes: 9 additions & 18 deletions packages/ember/addon/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
name: string,
fn: X,
args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
attributes: {
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
[SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
[CODE_FUNCTION_NAME]: hookName,
},
op,
name,
onlyIfParent: true,
},
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
// @ts-expect-error TS2545 We do not need to redefine a constructor here
[routeName]: class extends BaseRoute {
public beforeModel(...args: unknown[]): void | Promise<unknown> {
return instrumentFunction(
'ui.ember.route.before_model',
this.fullRouteName,
super.beforeModel.bind(this),
args,
'custom',
);
return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
}

public async model(...args: unknown[]): Promise<unknown> {
return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
}

public afterModel(...args: unknown[]): void | Promise<unknown> {
return instrumentFunction(
'ui.ember.route.after_model',
this.fullRouteName,
super.afterModel.bind(this),
args,
'custom',
);
return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
}

public setupController(...args: unknown[]): void | Promise<unknown> {
return instrumentFunction(
'ui.ember.route.setup_controller',
'setupController',
this.fullRouteName,
super.setupController.bind(this),
args,
Expand Down
19 changes: 13 additions & 6 deletions packages/ember/addon/utils/instrumentEmberGlobals.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
startInactiveSpan({
attributes: {
[SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
'ember.runloop.queue': queue,

@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?

@msonnbmsonnbJul 29, 2026•
edited
Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.
cc @Lms24

@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions

yes, all attributes sent from our SDKs should be in conventions

I'm not sure whether we want to add library-specific attributes to conventions

we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.

@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.

},
name: 'runloop',
op: `ui.ember.runloop.${queue}`,
startTime: currentQueueStart,
onlyIfParent: true,
})?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
const now = timestampInSeconds();
const componentRenderDuration = now - begin.now;

const name = payload.containerKey || payload.object;

if (componentRenderDuration * 1000 >= minComponentDuration) {
startInactiveSpan({
name: payload.containerKey || payload.object,
op,
name,
startTime: begin.now,
attributes: {
[SENTRY_OP]: op,
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
[UI_COMPONENT_NAME]: name,

@cursorcursorBotJul 30, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage

Low Severity

Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.

Additional Locations (1)
Fix in CursorFix in Web

Triggered by project rule: PR Review Guidelines for Cursor Bot

Reviewed by Cursor Bugbot for commit 63b4326. Configure here.

},
onlyIfParent: true,
})?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
},

after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
},
});
if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
},

after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
},
});
}
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
const endTime = startTime + measure.duration / 1000;

startInactiveSpan({
op: 'ui.ember.init',
name: 'init',
attributes: {
// TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
[SENTRY_OP]: 'ui.mount',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
},
startTime,
Expand Down
Loading
Loading
, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading

, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading

, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading

, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading

, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading

, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading

, '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(ember)!: Use function and ui.task span ops for route hooks and runloop#22669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msonnb
merged 7 commits into

from

Jul 31, 2026
 Merged


feat(ember)!: Use function and ui.task span ops for route hooks and runloop
#22669
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
71a5e20

feat(ember)!: Use `function` span op for route hooks


msonnb Jul 27, 2026
019a544

test(e2e): Update ember route hook span assertions


msonnb Jul 27, 2026
9dcb64d

feat(ember)!: Use `ui.task` span op for runloop queues


msonnb Jul 27, 2026
8960d79

feat(ember)!: Use cross-framework span ops for component and init spans


msonnb Jul 27, 2026
d9b3e6c

use sentry.op


msonnb Jul 28, 2026
2ca3aa3

more sentry.op


msonnb Jul 28, 2026
63b4326

remove ember.route.hook


msonnb Jul 30, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-classic/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

47 changes: 29 additions & 18 deletions
dev-packages/e2e-tests/test-applications/ember-embroider/tests/performance.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,10 +168,14 @@ test('captures correct spans for navigation', async ({ page }) => {
 });

 const transitionSpans = spans.filter(span => span.op === 'ui.ember.transition');
 const beforeModelSpans = spans.filter(span => span.op === 'ui.ember.route.before_model');
 const modelSpans = spans.filter(span => span.op === 'ui.ember.route.model');
 const afterModelSpans = spans.filter(span => span.op === 'ui.ember.route.after_model');
 const renderSpans = spans.filter(span => span.op === 'ui.ember.runloop.render');
 const beforeModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'beforeModel',
 );
 const modelSpans = spans.filter(span => span.op === 'function' && span.data?.['code.function.name'] === 'model');
 const afterModelSpans = spans.filter(
 span => span.op === 'function' && span.data?.['code.function.name'] === 'afterModel',
 );
 const renderSpans = spans.filter(span => span.op === 'ui.task' && span.data?.['ember.runloop.queue'] === 'render');

 expect(transitionSpans).toHaveLength(1);

Expand DownExpand Up@@ -202,12 +206,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(beforeModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -218,12 +223,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.before_model',
 'code.function.name': 'beforeModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.before_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -237,12 +243,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(modelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -253,12 +260,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.model',
 'code.function.name': 'model',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -272,12 +280,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 expect(afterModelSpans).toEqual([
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -288,12 +297,13 @@ test('captures correct spans for navigation', async ({ page }) => {
 },
 {
 data: {
 'sentry.op': 'ui.ember.route.after_model',
 'code.function.name': 'afterModel',
 'sentry.op': 'function',
 'sentry.origin': 'auto.ui.ember',
 'sentry.source': 'custom',
 },
 description: 'slow-loading-route.index',
 op: 'ui.ember.route.after_model',
 op: 'function',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand All@@ -306,11 +316,12 @@ test('captures correct spans for navigation', async ({ page }) => {

 expect(renderSpans).toContainEqual({
 data: {
 'sentry.op': 'ui.ember.runloop.render',
 'ember.runloop.queue': 'render',
 'sentry.op': 'ui.task',
 'sentry.origin': 'auto.ui.ember',
 },
 description: 'runloop',
 op: 'ui.ember.runloop.render',
 op: 'ui.task',
 origin: 'auto.ui.ember',
 status: 'ok',
 parent_span_id: spanId,
Expand Down

27 changes: 9 additions & 18 deletions
packages/ember/addon/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,8 @@
import { assert } from '@ember/debug';
import type Route from '@ember/routing/route';
import { getOwnConfig } from '@embroider/macros';
import { CODE_FUNCTION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
import { GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import type { BrowserOptions } from '@sentry/browser';
import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
Expand DownExpand Up@@ -54,7 +56,7 @@ type RouteConstructor = new (...args: ConstructorParameters<typeof Route>) => Ro
export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute: T): T => {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const instrumentFunction = async <X extends (...args: unknown[]) => any>(
op: string,
hookName: string,
 name: string,
 fn: X,
 args: Parameters<X>,
Expand All@@ -65,8 +67,9 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 attributes: {
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [SENTRY_OP]: GENERAL_FUNCTION_SPAN_OP,
 [CODE_FUNCTION_NAME]: hookName,
 },
 op,
 name,
 onlyIfParent: true,
 },
Expand All@@ -82,32 +85,20 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
 // @ts-expect-error TS2545 We do not need to redefine a constructor here
 [routeName]: class extends BaseRoute {
 public beforeModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.before_model',
 this.fullRouteName,
 super.beforeModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('beforeModel', this.fullRouteName, super.beforeModel.bind(this), args, 'custom');
 }

 public async model(...args: unknown[]): Promise<unknown> {
 return instrumentFunction('ui.ember.route.model', this.fullRouteName, super.model.bind(this), args, 'custom');
 return instrumentFunction('model', this.fullRouteName, super.model.bind(this), args, 'custom');
 }

 public afterModel(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.after_model',
 this.fullRouteName,
 super.afterModel.bind(this),
 args,
 'custom',
 );
 return instrumentFunction('afterModel', this.fullRouteName, super.afterModel.bind(this), args, 'custom');
 }

 public setupController(...args: unknown[]): void | Promise<unknown> {
 return instrumentFunction(
 'ui.ember.route.setup_controller',
 'setupController',
 this.fullRouteName,
 super.setupController.bind(this),
 args,
Expand Down

19 changes: 13 additions & 6 deletions
packages/ember/addon/utils/instrumentEmberGlobals.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
import { subscribe } from '@ember/instrumentation';
import { scheduleOnce } from '@ember/runloop';
import type { EmberRunQueues } from '@ember/runloop/-private/types';
import { SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
import { BROWSER_UI_RENDER_SPAN_OP, BROWSER_UI_TASK_SPAN_OP, GENERAL_FUNCTION_SPAN_OP } from '@sentry/conventions/op';
import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
Expand DownExpand Up@@ -89,10 +91,11 @@ function _instrumentEmberRunloop(config: { minimumRunloopQueueDuration?: number
 if ((now - currentQueueStart) * 1000 >= minQueueDuration) {
 startInactiveSpan({
 attributes: {
 [SENTRY_OP]: BROWSER_UI_TASK_SPAN_OP,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 'ember.runloop.queue': queue,
@nicohrubecnicohrubecJul 29, 2026

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.

m: does ember.runloop.queue also need to be added to @sentry/conventions?
@msonnbmsonnbJul 29, 2026•

edited

Loading

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'm not sure whether we want to add library-specific attributes to conventions (I don't think so). If yes we'll probably wanna add it to #18895.

cc @Lms24
@Lms24Lms24Jul 30, 2026

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.

does ember.runloop.queue also need to be added to @sentry/conventions
yes, all attributes sent from our SDKs should be in conventions
I'm not sure whether we want to add library-specific attributes to conventions
we should always use a more generic attribute if possible that isn't tied to a specific lib or framework. I'm not sure if there's a specific replacement for ember.runloop.queue. If there's none, we can add an ember-specific attribute. There's precedence for framework-specific attributes, for example, Remix.
@msonnbmsonnbJul 30, 2026

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'm not really familiar with ember but from a quick search i couldn't find any fitting generic attribute and from this guide it looks like the run queue is a pretty specific/unique concept, so yes we should probably add this ember-specific attribute to conventions then.
 },
 name: 'runloop',
 op: `ui.ember.runloop.${queue}`,
 startTime: currentQueueStart,
 onlyIfParent: true,
 })?.end(now);
Expand DownExpand Up@@ -147,13 +150,16 @@ function processComponentRenderAfter(
 const now = timestampInSeconds();
 const componentRenderDuration = now - begin.now;

 const name = payload.containerKey || payload.object;

 if (componentRenderDuration * 1000 >= minComponentDuration) {
 startInactiveSpan({
 name: payload.containerKey || payload.object,
 op,
 name,
 startTime: begin.now,
 attributes: {
 [SENTRY_OP]: op,
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 [UI_COMPONENT_NAME]: name,
@cursorcursorBotJul 30, 2026

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

New attribute lacks test coverage
Low Severity
Newly added ui.component_name on Ember component spans is never asserted. Acceptance checks only match op | description, so a regression that drops the attribute would still pass. Per the testing conventions rule, newly added payload data needs thorough assertions.
Additional Locations (1)
Fix in CursorFix in Web
Triggered by project rule: PR Review Guidelines for Cursor Bot
Reviewed by Cursor Bugbot for commit 63b4326. Configure here.
 },
 onlyIfParent: true,
 })?.end(now);
Expand All@@ -178,7 +184,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeEntries, 'ui.ember.component.render', minComponentDuration);
 processComponentRenderAfter(payload, beforeEntries, BROWSER_UI_RENDER_SPAN_OP, minComponentDuration);
 },
 });
 if (enableComponentDefinitions) {
Expand All@@ -188,7 +194,7 @@ function _instrumentComponents(config: {
 },

 after(_name: string, _timestamp: number, payload: Payload, _beganIndex: number) {
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, 'ui.ember.component.definition', 0);
 processComponentRenderAfter(payload, beforeComponentDefinitionEntries, GENERAL_FUNCTION_SPAN_OP, 0);
 },
 });
 }
Expand DownExpand Up@@ -230,9 +236,10 @@ function _instrumentInitialLoad(): void {
 const endTime = startTime + measure.duration / 1000;

 startInactiveSpan({
 op: 'ui.ember.init',
 name: 'init',
 attributes: {
 // TODO(v11): Replace with the `ui.mount` constant from `@sentry/conventions/op` once it is registered there.
 [SENTRY_OP]: 'ui.mount',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
 },
 startTime,
Expand Down
Loading
Loading