split into two methods

Author: mydea

packages/core/src/server-runtime-client.ts

@@ -257,7 +257,7 @@ export class ServerRuntimeClient<
     if (span) {
       const rootSpan = getRootSpan(span);
       const samplingContext = getDynamicSamplingContextFromSpan(rootSpan);
-      return [samplingContext, spanToTraceContext(rootSpan, false)];
+      return [samplingContext, spanToTraceContext(rootSpan)];
     }
 
     const { traceId, spanId, parentSpanId, dsc } = scope.getPropagationContext();

packages/core/src/tracing/sentrySpan.ts

@@ -32,7 +32,7 @@ import {
   getStatusMessage,
   spanTimeInputToSeconds,
   spanToJSON,
-  spanToTraceContext,
+  spanToTransactionTraceContext,
 } from '../utils/spanUtils';
 import { getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 import { logSpanEnd } from './logSpans';
@@ -275,7 +275,7 @@ export class SentrySpan implements Span {
 
     const transaction: TransactionEvent = {
       contexts: {
-        trace: spanToTraceContext(this, true),
+        trace: spanToTransactionTraceContext(this),
       },
       spans,
       start_timestamp: this._startTime,

packages/core/src/utils/applyScopeDataToEvent.ts

@@ -162,7 +162,7 @@ function applySdkMetadataToEvent(event: Event, sdkProcessingMetadata: ScopeData[
 
 function applySpanToEvent(event: Event, span: Span): void {
   event.contexts = {
-    trace: spanToTraceContext(span, false),
+    trace: spanToTraceContext(span),
     ...event.contexts,
   };
 

packages/core/src/utils/spanUtils.ts

@@ -34,15 +34,29 @@ export const TRACE_FLAG_SAMPLED = 0x1;
  * By default, this will only include trace_id, span_id & parent_span_id.
  * If `includeAllData` is true, it will also include data, op, status & origin.
  */
-export function spanToTraceContext(span: Span, includeAllData = false): TraceContext {
+export function spanToTransactionTraceContext(span: Span): TraceContext {
   const { spanId: span_id, traceId: trace_id } = span.spanContext();
   const { data, op, parent_span_id, status, origin } = spanToJSON(span);
 
-  const reqFields = { parent_span_id, span_id, trace_id };
-  // These are only included if `includeAllData` is true
-  const optFields = { data, op, status, origin };
+  return dropUndefinedKeys({
+    parent_span_id,
+    span_id,
+    trace_id,
+    data,
+    op,
+    status,
+    origin,
+  });
+}
+
+/**
+ * Convert a span to a trace context, which can be sent as the `trace` context in a non-transaction event.
+ */
+export function spanToTraceContext(span: Span): TraceContext {
+  const { spanId: span_id, traceId: trace_id } = span.spanContext();
+  const { parent_span_id } = spanToJSON(span);
 
-  return dropUndefinedKeys(includeAllData ? { ...reqFields, ...optFields } : reqFields);
+  return dropUndefinedKeys({ parent_span_id, span_id, trace_id });
 }
 
 /**