move to captureSpan

Author: msonnb

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

@@ -1,6 +1,7 @@
 import type { RawAttributes } from '../../attributes';
 import type { Client } from '../../client';
 import type { ScopeData } from '../../scope';
+import { SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME } from '../../semanticAttributes';
 import type { SerializedStreamedSpan, Span, SpanAttributeValue, SpanJSON, StreamedSpanJSON } from '../../types/span';
 import { getCombinedScopeData } from '../../utils/scopeData';
 import {
@@ -45,6 +46,10 @@ export type SerializedStreamedSpanWithSegmentSpan = SerializedStreamedSpan & {
 export function captureSpan(span: Span, client: Client): SerializedStreamedSpanWithSegmentSpan {
   // Convert to JSON FIRST - we cannot write to an already-ended span
   const spanJSON = spanToJSON(span);
+  if (spanJSON.attributes) {
+    // oxlint-disable-next-line typescript/no-dynamic-delete
+    delete spanJSON.attributes[SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME];
+  }
 
   const segmentSpan = INTERNAL_getSegmentSpan(span);
   const serializedSegmentSpan = spanToJSON(segmentSpan);

packages/core/src/utils/spanUtils.ts

@@ -270,16 +270,12 @@ function getOtelParentSpanId(span: OpenTelemetrySdkTraceBaseSpan): string | unde
  * The returned serilaized spans must not be consumed by users or SDK integrations.
  */
 export function streamedSpanJsonToSerializedSpan(spanJson: StreamedSpanJSON): SerializedStreamedSpan {
-  const attributes = serializeAttributes(spanJson.attributes);
-  // oxlint-disable-next-line typescript/no-dynamic-delete
-  delete attributes[SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME];
-
   return {
     ...spanJson,
     // We only ever send ended spans, but fall back to the start time (i.e. duration 0) so that
     // sent spans always carry an end timestamp.
     end_timestamp: spanJson.end_timestamp ?? spanJson.start_timestamp,
-    attributes,
+    attributes: serializeAttributes(spanJson.attributes),
     links: spanJson.links?.map(link => ({
       ...link,
       attributes: serializeAttributes(link.attributes),

packages/core/test/lib/utils/spanUtils.test.ts

@@ -6,7 +6,6 @@ import {
   Scope,
   SentryNonRecordingSpan,
   SentrySpan,
-  SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME,
   setCurrentClient,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
@@ -682,7 +681,6 @@ describe('spanToStaticSpanJSON', () => {
           attr2: 2,
           attr3: true,
           attr4: [1, 2, 3],
-          [SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME]: 'test name',
           [SENTRY_OP]: 'test op',
           [SENTRY_ORIGIN]: 'auto',
         },