stop deleting sentry.source and remove attribute spread in spanToStreamedSpanJSON

Author: Lms24

packages/core/src/semanticAttributes.ts

@@ -1,16 +1,10 @@
 /**
  * Use this attribute to represent the source of a span name.
  * Must be one of: custom, url, route, view, component, task
- * TODO: Deprecate this attribute in favour of SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE
+ * TODO(v11): rename this to sentry.span.source'
  */
 export const SEMANTIC_ATTRIBUTE_SENTRY_SOURCE = 'sentry.source';
 
-/**
- * Use this attribute to represent the source of a span name.
- * Must be one of: custom, url, route, view, component, task
- */
-export const SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE = 'sentry.span.source';
-
 /**
  * Attributes that holds the sample rate that was locally applied to a span.
  * If this attribute is not defined, it means that the span inherited a sampling decision.

packages/core/src/tracing/sentrySpan.ts

@@ -264,8 +264,7 @@ export class SentrySpan implements Span {
       end_timestamp: this._endTime ?? this._startTime,
       is_segment: this._isStandaloneSpan || this === getRootSpan(this),
       status: getSimpleStatusMessage(this._status),
-      // spread to avoid mutating the original object when later processing the span
-      attributes: { ...this._attributes },
+      attributes: this._attributes,
       links: getStreamedSpanLinks(this._links),
     };
   }

packages/core/src/tracing/spans/captureSpan.ts

@@ -9,7 +9,6 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID,
   SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE,
   SEMANTIC_ATTRIBUTE_USER_EMAIL,
   SEMANTIC_ATTRIBUTE_USER_ID,
   SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS,
@@ -68,13 +67,14 @@ export function captureSpan(span: Span, client: Client): SerializedStreamedSpanW
       : spanJSON;
 
   // Backfill sentry.span.source from sentry.source. Only `sentry.span.source` is respected by Sentry.
-  // TODO(v11): Ensure we always only send `sentry.span.source` and remove this backfill.
+  // TODO(v11): Remove this backfill once we renamed SEMANTIC_ATTRIBUTE_SENTRY_SOURCE to sentry.span.source
   const spanNameSource = processedSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
   if (spanNameSource) {
     safeSetSpanJSONAttributes(processedSpan, {
-      [SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE]: spanNameSource,
+      // Purposefully not using a constant defined here like in other attributes:
+      // This will be the name for SEMANTIC_ATTRIBUTE_SENTRY_SOURCE in v11
+      'sentry.span.source': spanNameSource,
     });
-    delete processedSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
   }
 
   return {

packages/core/src/utils/spanUtils.ts

@@ -230,8 +230,7 @@ export function spanToStreamedSpanJSON(span: Span): StreamedSpanJSON {
       end_timestamp: spanTimeInputToSeconds(endTime),
       is_segment: span === INTERNAL_getSegmentSpan(span),
       status: getSimpleStatusMessage(status),
-      // spread to avoid mutating the original object when later processing the span
-      attributes: { ...attributes },
+      attributes,
       links: getStreamedSpanLinks(links),
     };
   }

packages/core/test/lib/tracing/spans/captureSpan.test.ts

@@ -11,7 +11,6 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION,
   SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID,
   SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME,
-  SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE,
   SEMANTIC_ATTRIBUTE_USER_EMAIL,
   SEMANTIC_ATTRIBUTE_USER_ID,
   SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS,
@@ -84,7 +83,7 @@ describe('captureSpan', () => {
           value: span.spanContext().spanId,
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE]: {
+        'sentry.span.source': {
           value: 'custom',
           type: 'string',
         },
@@ -174,7 +173,7 @@ describe('captureSpan', () => {
           value: span.spanContext().spanId,
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE]: {
+        'sentry.span.source': {
           value: 'custom',
           type: 'string',
         },
@@ -254,7 +253,7 @@ describe('captureSpan', () => {
           value: span.spanContext().spanId,
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_SENTRY_SPAN_SOURCE]: {
+        'sentry.span.source': {
           value: 'custom',
           type: 'string',
         },