more replacements

Author: Lms24

packages/astro/src/server/middleware.ts

@@ -1,4 +1,4 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
 import {
   captureException,
   continueTrace,
@@ -119,9 +119,11 @@ async function instrumentRequest(
     const res = await startSpan(
       {
         ...traceCtx,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.astro',
+        },
         name: `${method} ${interpolatedRoute || ctx.url.pathname}`,
         op: 'http.server',
-        origin: 'auto.http.astro',
         status: 'ok',
         metadata: {
           // eslint-disable-next-line deprecation/deprecation

packages/bun/src/integrations/bunserver.ts

@@ -1,4 +1,5 @@
 import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   Transaction,
   captureException,
@@ -69,9 +70,11 @@ function instrumentBunServeOptions(serveOptions: Parameters<typeof Bun.serve>[0]
           ctx => {
             return startSpan(
               {
+                attributes: {
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.bun.serve',
+                },
                 op: 'http.server',
                 name: `${request.method} ${parsedUrl.path || '/'}`,
-                origin: 'auto.http.bun.serve',
                 ...ctx,
                 data,
                 metadata: {

packages/ember/addon/index.ts

@@ -5,7 +5,7 @@ import { getOwnConfig, isDevelopingApp, macroCondition } from '@embroider/macros
 import { startSpan } from '@sentry/browser';
 import type { BrowserOptions } from '@sentry/browser';
 import * as Sentry from '@sentry/browser';
-import { applySdkMetadata } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, applySdkMetadata } from '@sentry/core';
 import { GLOBAL_OBJ } from '@sentry/utils';
 import Ember from 'ember';
 
@@ -82,9 +82,11 @@ export const instrumentRoutePerformance = <T extends RouteConstructor>(BaseRoute
   ): Promise<ReturnType<X>> => {
     return startSpan(
       {
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'ember',
+        },
         op,
         name: description,
-        origin: 'auto.ui.ember',
       },
       () => {
         return fn(...args);

packages/nextjs/src/common/utils/edgeWrapperUtils.ts

@@ -1,4 +1,5 @@
 import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   addTracingExtensions,
   captureException,
@@ -40,8 +41,10 @@ export function withEdgeWrapping<H extends EdgeRouteHandler>(
         ...transactionContext,
         name: options.spanDescription,
         op: options.spanOp,
-        origin: 'auto.function.nextjs.withEdgeWrapping',
-        attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route' },
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs.withEdgeWrapping',
+        },
         metadata: {
           // eslint-disable-next-line deprecation/deprecation
           ...transactionContext.metadata,

packages/remix/src/utils/instrumentServer.ts

@@ -1,5 +1,6 @@
 /* eslint-disable max-lines */
 import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   getActiveSpan,
   getActiveTransaction,
   getClient,
@@ -411,7 +412,9 @@ export function startRequestHandlerTransaction(
   const transaction = hub.startTransaction({
     name,
     op: 'http.server',
-    origin: 'auto.http.remix',
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.remix',
+    },
     tags: {
       method: request.method,
     },

packages/sveltekit/src/client/load.ts

@@ -80,7 +80,9 @@ export function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T)
       return startSpan(
         {
           op: 'function.sveltekit.load',
-          origin: 'auto.function.sveltekit',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+          },
           name: routeId ? routeId : event.url.pathname,
           status: 'ok',
           metadata: {

packages/sveltekit/src/server/handle.ts

@@ -1,4 +1,10 @@
-import { getActiveSpan, getCurrentScope, getDynamicSamplingContextFromSpan, spanToTraceHeader } from '@sentry/core';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  getActiveSpan,
+  getCurrentScope,
+  getDynamicSamplingContextFromSpan,
+  spanToTraceHeader,
+} from '@sentry/core';
 import { getActiveTransaction, runWithAsyncContext, startSpan } from '@sentry/core';
 import { captureException } from '@sentry/node';
 /* eslint-disable @sentry-internal/sdk/no-optional-chaining */
@@ -169,7 +175,9 @@ async function instrumentHandle(
     const resolveResult = await startSpan(
       {
         op: 'http.server',
-        origin: 'auto.http.sveltekit',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltekit',
+        },
         name: `${event.request.method} ${event.route?.id || event.url.pathname}`,
         status: 'ok',
         ...traceparentData,

packages/sveltekit/src/server/load.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @sentry-internal/sdk/no-optional-chaining */
-import { getCurrentScope, startSpan } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getCurrentScope, startSpan } from '@sentry/core';
 import { captureException } from '@sentry/node';
-import type { TransactionContext } from '@sentry/types';
+import type { StartSpanOptions, TransactionContext } from '@sentry/types';
 import { addNonEnumerableProperty, objectify } from '@sentry/utils';
 import type { LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
 
@@ -65,9 +65,11 @@ export function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T)
 
       const routeId = event.route && event.route.id;
 
-      const traceLoadContext: TransactionContext = {
+      const traceLoadContext: StartSpanOptions = {
         op: 'function.sveltekit.load',
-        origin: 'auto.function.sveltekit',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+        },
         name: routeId ? routeId : event.url.pathname,
         status: 'ok',
         metadata: {
@@ -132,9 +134,11 @@ export function wrapServerLoadWithSentry<T extends (...args: any) => any>(origSe
       const { dynamicSamplingContext, traceparentData, propagationContext } = getTracePropagationData(event);
       getCurrentScope().setPropagationContext(propagationContext);
 
-      const traceLoadContext: TransactionContext = {
+      const traceLoadContext: StartSpanOptions = {
         op: 'function.sveltekit.server.load',
-        origin: 'auto.function.sveltekit',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+        },
         name: routeId ? routeId : event.url.pathname,
         status: 'ok',
         metadata: {