replace span.transaction usages in other packages

Author: Lms24

packages/astro/src/server/meta.ts

@@ -1,6 +1,7 @@
 import {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
+  getRootSpan,
   spanToTraceHeader,
 } from '@sentry/core';
 import type { Client, Scope, Span } from '@sentry/types';
@@ -32,12 +33,12 @@ export function getTracingMetaTags(
   client: Client | undefined,
 ): { sentryTrace: string; baggage?: string } {
   const { dsc, sampled, traceId } = scope.getPropagationContext();
-  const transaction = span?.transaction;
+  const rootSpan = span && getRootSpan(span);
 
   const sentryTrace = span ? spanToTraceHeader(span) : generateSentryTraceHeader(traceId, undefined, sampled);
 
-  const dynamicSamplingContext = transaction
-    ? getDynamicSamplingContextFromSpan(transaction)
+  const dynamicSamplingContext = rootSpan
+    ? getDynamicSamplingContextFromSpan(rootSpan)
     : dsc
       ? dsc
       : client

packages/opentelemetry-node/src/propagator.ts

@@ -1,7 +1,7 @@
 import type { Baggage, Context, TextMapGetter, TextMapSetter } from '@opentelemetry/api';
 import { TraceFlags, isSpanContextValid, propagation, trace } from '@opentelemetry/api';
 import { W3CBaggagePropagator, isTracingSuppressed } from '@opentelemetry/core';
-import { getDynamicSamplingContextFromSpan, spanToTraceHeader } from '@sentry/core';
+import { getDynamicSamplingContextFromSpan, getRootSpan, spanToTraceHeader } from '@sentry/core';
 import {
   SENTRY_BAGGAGE_KEY_PREFIX,
   baggageHeaderToDynamicSamplingContext,
@@ -35,7 +35,7 @@ export class SentryPropagator extends W3CBaggagePropagator {
     if (span) {
       setter.set(carrier, SENTRY_TRACE_HEADER, spanToTraceHeader(span));
 
-      if (span.transaction) {
+      if (getRootSpan(span)) {
         const dynamicSamplingContext = getDynamicSamplingContextFromSpan(span);
         baggage = Object.entries(dynamicSamplingContext).reduce<Baggage>((b, [dscKey, dscValue]) => {
           if (dscValue) {

packages/opentelemetry-node/src/utils/spanMap.ts

@@ -1,3 +1,4 @@
+import { getRootSpan } from '@sentry/core';
 import type { Span as SentrySpan } from '@sentry/types';
 
 interface SpanMapEntry {
@@ -31,7 +32,7 @@ export function getSentrySpan(spanId: string): SentrySpan | undefined {
 export function setSentrySpan(spanId: string, sentrySpan: SentrySpan): void {
   let ref: SpanRefType = SPAN_REF_ROOT;
 
-  const rootSpanId = sentrySpan.transaction?.spanContext().spanId;
+  const rootSpanId = getRootSpan(sentrySpan)?.spanContext().spanId;
 
   if (rootSpanId && rootSpanId !== spanId) {
     const root = SPAN_MAP.get(rootSpanId);

packages/svelte/src/performance.ts

@@ -3,6 +3,7 @@ import type { Span, Transaction } from '@sentry/types';
 import { afterUpdate, beforeUpdate, onMount } from 'svelte';
 import { current_component } from 'svelte/internal';
 
+import { getRootSpan } from '@sentry/core';
 import { DEFAULT_COMPONENT_NAME, UI_SVELTE_INIT, UI_SVELTE_UPDATE } from './constants';
 import type { TrackComponentOptions } from './types';
 
@@ -74,7 +75,7 @@ function recordUpdateSpans(componentName: string, initSpan?: Span): void {
     // If we are initializing the component when the update span is started, we start it as child
     // of the init span. Else, we start it as a child of the transaction.
     const parentSpan =
-      initSpan && !initSpan.endTimestamp && initSpan.transaction === transaction ? initSpan : transaction;
+      initSpan && !initSpan.endTimestamp && getRootSpan(initSpan) === transaction ? initSpan : transaction;
 
     // eslint-disable-next-line deprecation/deprecation
     updateSpan = parentSpan.startChild({

packages/tracing-internal/src/browser/request.ts

@@ -5,6 +5,7 @@ import {
   getCurrentScope,
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
+  getRootSpan,
   hasTracingEnabled,
   spanToJSON,
   spanToTraceHeader,
@@ -21,7 +22,6 @@ import {
   stringMatchesSomePattern,
 } from '@sentry/utils';
 
-import { getRootSpan } from '@sentry/core/build/types/utils/spanUtils';
 import { instrumentFetchRequest } from '../common/fetch';
 import { addPerformanceInstrumentationHandler } from './instrument';
 

packages/tracing-internal/src/common/fetch.ts

@@ -4,6 +4,7 @@ import {
   getCurrentScope,
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
+  getRootSpan,
   hasTracingEnabled,
   spanToTraceHeader,
 } from '@sentry/core';