simplify ctor logic

Author: Lms24

packages/core/src/tracing/span.ts

@@ -130,14 +130,14 @@ export class Span implements SpanInterface {
     this.tags = spanContext.tags ? { ...spanContext.tags } : {};
     // eslint-disable-next-line deprecation/deprecation
     this.data = spanContext.data ? { ...spanContext.data } : {};
-    this._attributes = spanContext.attributes ? { ...spanContext.attributes } : {};
     // eslint-disable-next-line deprecation/deprecation
     this.instrumenter = spanContext.instrumenter || 'sentry';
 
-    this.setAttribute(
-      SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-      spanContext.origin || this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] || 'manual',
-    );
+    this._attributes = {
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: spanContext.origin || 'manual',
+      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: spanContext.op,
+      ...spanContext.attributes,
+    };
 
     // eslint-disable-next-line deprecation/deprecation
     this._name = spanContext.name || spanContext.description;
@@ -149,9 +149,6 @@ export class Span implements SpanInterface {
     if ('sampled' in spanContext) {
       this._sampled = spanContext.sampled;
     }
-    if (spanContext.op) {
-      this.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, spanContext.op);
-    }
     if (spanContext.status) {
       this._status = spanContext.status;
     }

packages/core/src/tracing/trace.ts

@@ -391,17 +391,5 @@ function normalizeContext(context: StartSpanOptions): TransactionContext {
     return ctx;
   }
 
-  // TODO (v8): Remove this normalization once we remove top-level context.origin
-  // eslint-disable-next-line deprecation/deprecation
-  if (context.origin) {
-    context.attributes = {
-      // eslint-disable-next-line deprecation/deprecation
-      'sentry.origin': context.origin,
-      ...context.attributes, // potentially set attributes value takes precedence
-    };
-    // eslint-disable-next-line deprecation/deprecation
-    delete context.origin;
-  }
-
   return context;
 }