fix(span): align span operations to new operations

Signed-off-by: Outsider <[email protected]>

Author: outsideris

packages/ember/addon/index.ts

@@ -84,7 +84,7 @@ 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,
@@ -97,7 +97,7 @@ export const instrumentRoutePerformance = (BaseRoute: any) => {
 
       async afterModel(...args: any[]) {
         return instrumentFunction(
-          'ember.route.afterModel',
+          'ui.ember.route.after_model',
           (<any>this).fullRouteName,
           super.afterModel.bind(this),
           args,
@@ -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,

packages/ember/tests/acceptance/sentry-performance-test.js

@@ -90,7 +90,7 @@ 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',
@@ -102,15 +102,15 @@ module('Acceptance | Sentry Transactions', function (hooks) {
         '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',
@@ -122,10 +122,10 @@ module('Acceptance | Sentry Transactions', function (hooks) {
         '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',

packages/remix/src/utils/instrumentServer.ts

@@ -115,7 +115,7 @@ function makeWrappedDocumentRequestFunction(
 
     try {
       const span = activeTransaction?.startChild({
-        op: 'remix.server.documentRequest',
+        op: 'function.remix.document_request',
         description: activeTransaction.name,
         tags: {
           method: request.method,
@@ -147,7 +147,7 @@ function makeWrappedDataFunction(origFn: DataFunction, id: string, name: 'action
 
     try {
       const span = activeTransaction?.startChild({
-        op: `remix.server.${name}`,
+        op: `function.remix.${name}`,
         description: id,
         tags: {
           name,

packages/serverless/src/awslambda.ts

@@ -315,7 +315,7 @@ export function wrapHandler<TEvent, TResult>(
 
     const transaction = hub.startTransaction({
       name: context.functionName,
-      op: 'awslambda.handler',
+      op: 'function.aws.lambda',
       ...traceparentData,
       metadata: {
         dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,

packages/serverless/src/awsservices.ts

@@ -65,7 +65,7 @@ function wrapMakeRequest<TService extends AWSService, TResult>(
       if (transaction) {
         span = transaction.startChild({
           description: describe(this, operation, params),
-          op: 'aws.request',
+          op: 'http.client',
         });
       }
     });

packages/serverless/src/gcpfunction/cloud_events.ts

@@ -34,7 +34,7 @@ function _wrapCloudEventFunction(
 
     const transaction = hub.startTransaction({
       name: context.type || '<unknown>',
-      op: 'gcp.function.cloud_event',
+      op: 'function.gcp.cloud_event',
       metadata: { source: 'component' },
     });
 

packages/serverless/src/gcpfunction/events.ts

@@ -36,7 +36,7 @@ function _wrapEventFunction<F extends EventFunction | EventFunctionWithCallback>
 
     const transaction = hub.startTransaction({
       name: context.eventType,
-      op: 'gcp.function.event',
+      op: 'function.gcp.event',
       metadata: { source: 'component' },
     });
 

packages/serverless/src/gcpfunction/http.ts

@@ -85,7 +85,7 @@ function _wrapHttpFunction(fn: HttpFunction, wrapOptions: Partial<HttpFunctionWr
 
     const transaction = hub.startTransaction({
       name: `${reqMethod} ${reqUrl}`,
-      op: 'gcp.function.http',
+      op: 'function.gcp.http',
       ...traceparentData,
       metadata: {
         dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,

packages/serverless/src/google-cloud-grpc.ts

@@ -114,7 +114,7 @@ function fillGrpcFunction(stub: Stub, serviceIdentifier: string, methodName: str
         if (transaction) {
           span = transaction.startChild({
             description: `${callType} ${methodName}`,
-            op: `gcloud.grpc.${serviceIdentifier}`,
+            op: `grpc.${serviceIdentifier}`,
           });
         }
         ret.on('status', () => {

packages/serverless/src/google-cloud-http.ts

@@ -59,7 +59,7 @@ function wrapRequestFunction(orig: RequestFunction): RequestFunction {
       const httpMethod = reqOpts.method || 'GET';
       span = transaction.startChild({
         description: `${httpMethod} ${reqOpts.uri}`,
-        op: `gcloud.http.${identifyService(this.apiEndpoint)}`,
+        op: `http.client.${identifyService(this.apiEndpoint)}`,
       });
     }
     orig.call(this, reqOpts, (...args: Parameters<ResponseCallback>) => {