Skip to content
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.

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

fix(ember): align span operations to new operations #5883

Merged
merged 1 commit into from Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/ember/addon/index.ts
Expand Up @@ -84,20 +84,20 @@ export const instrumentRoutePerformance = (BaseRoute: any) => {
[BaseRoute.name]: class extends BaseRoute {
beforeModel(...args: any[]) {
return instrumentFunction(
'ember.route.beforeModel',
'ui.ember.route.before_model',
(<any>this).fullRouteName,
super.beforeModel.bind(this),
args,
);
}

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

async afterModel(...args: any[]) {
return instrumentFunction(
'ember.route.afterModel',
'ui.ember.route.after_model',
(<any>this).fullRouteName,
super.afterModel.bind(this),
args,
Expand All @@ -106,7 +106,7 @@ export const instrumentRoutePerformance = (BaseRoute: any) => {

async setupController(...args: any[]) {
return instrumentFunction(
'ember.route.setupController',
'ui.ember.route.setup_controller',
(<any>this).fullRouteName,
super.setupController.bind(this),
args,
Expand Down
16 changes: 8 additions & 8 deletions packages/ember/tests/acceptance/sentry-performance-test.js
Expand Up @@ -90,42 +90,42 @@ module('Acceptance | Sentry Transactions', function (hooks) {
'ui.ember.transition | route:tracing -> route:slow-loading-route.index',
'ui.ember.component.render | component:link-to',
'ui.ember.component.render | component:link-to',
'ember.route.beforeModel | slow-loading-route',
'ui.ember.route.before_model | slow-loading-route',
'ui.ember.runloop.actions | undefined',
'ui.ember.runloop.routerTransitions | undefined',
'ui.ember.runloop.render | undefined',
'ui.ember.runloop.afterRender | undefined',
'ui.ember.runloop.destroy | undefined',
'ember.route.model | slow-loading-route',
'ui.ember.route.model | slow-loading-route',
'ui.ember.runloop.actions | undefined',
'ui.ember.runloop.routerTransitions | undefined',
'ui.ember.runloop.render | undefined',
'ui.ember.runloop.afterRender | undefined',
'ui.ember.runloop.destroy | undefined',
'ember.route.afterModel | slow-loading-route',
'ui.ember.route.after_model | slow-loading-route',
'ui.ember.runloop.actions | undefined',
'ui.ember.runloop.routerTransitions | undefined',
'ui.ember.component.render | component:link-to',
'ui.ember.component.render | component:link-to',
'ui.ember.runloop.render | undefined',
'ui.ember.runloop.afterRender | undefined',
'ui.ember.runloop.destroy | undefined',
'ember.route.beforeModel | slow-loading-route.index',
'ui.ember.route.before_model | slow-loading-route.index',
'ui.ember.runloop.actions | undefined',
'ui.ember.runloop.routerTransitions | undefined',
'ui.ember.runloop.render | undefined',
'ui.ember.runloop.afterRender | undefined',
'ui.ember.runloop.destroy | undefined',
'ember.route.model | slow-loading-route.index',
'ui.ember.route.model | slow-loading-route.index',
'ui.ember.runloop.actions | undefined',
'ui.ember.runloop.routerTransitions | undefined',
'ui.ember.runloop.render | undefined',
'ui.ember.runloop.afterRender | undefined',
'ui.ember.runloop.destroy | undefined',
'ember.route.afterModel | slow-loading-route.index',
'ui.ember.route.after_model | slow-loading-route.index',
'ui.ember.runloop.actions | undefined',
'ember.route.setupController | slow-loading-route',
'ember.route.setupController | slow-loading-route.index',
'ui.ember.route.setup_controller | slow-loading-route',
'ui.ember.route.setup_controller | slow-loading-route.index',
'ui.ember.runloop.routerTransitions | undefined',
'ui.ember.component.render | component:link-to',
'ui.ember.component.render | component:link-to',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I change ember.route.model operation in this file?

Copy link
Member

Choose a reason for hiding this comment

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

Yes we should change that to prepend ui

Expand Down