move to dedicated file

Author: Lms24

packages/core/src/index.ts

@@ -81,6 +81,7 @@ export {
   spanToJSON,
   spanIsSampled,
 } from './utils/spanUtils';
+export { getRootSpan } from './utils/getRootSpan';
 export { DEFAULT_ENVIRONMENT } from './constants';
 export { ModuleMetadata } from './integrations/metadata';
 export { RequestData } from './integrations/requestdata';

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

@@ -26,7 +26,8 @@ import {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
 } from './tracing';
-import { getRootSpan, spanToTraceContext } from './utils/spanUtils';
+import { getRootSpan } from './utils/getRootSpan';
+import { spanToTraceContext } from './utils/spanUtils';
 
 export interface ServerRuntimeClientOptions extends ClientOptions<BaseTransportOptions> {
   platform?: string;

packages/core/src/tracing/dynamicSamplingContext.ts

@@ -3,7 +3,8 @@ import { dropUndefinedKeys } from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from '../constants';
 import { getClient, getCurrentScope } from '../exports';
-import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
+import { getRootSpan } from '../utils/getRootSpan';
+import { spanIsSampled, spanToJSON } from '../utils/spanUtils';
 
 /**
  * Creates a dynamic sampling context from a client.

packages/core/src/tracing/span.ts

@@ -16,10 +16,10 @@ import type {
 import { dropUndefinedKeys, logger, timestampInSeconds, uuid4 } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
+import { getRootSpan } from '../utils/getRootSpan';
 import {
   TRACE_FLAG_NONE,
   TRACE_FLAG_SAMPLED,
-  getRootSpan,
   spanTimeInputToSeconds,
   spanToJSON,
   spanToTraceContext,

packages/core/src/utils/applyScopeDataToEvent.ts

@@ -1,7 +1,8 @@
 import type { Breadcrumb, Event, PropagationContext, ScopeData, Span } from '@sentry/types';
 import { arrayify } from '@sentry/utils';
 import { getDynamicSamplingContextFromSpan } from '../tracing/dynamicSamplingContext';
-import { getRootSpan, spanToJSON, spanToTraceContext } from './spanUtils';
+import { getRootSpan } from './getRootSpan';
+import { spanToJSON, spanToTraceContext } from './spanUtils';
 
 /**
  * Applies data from the scope to the event and runs all event processors on it.

packages/core/src/utils/getRootSpan.ts

@@ -0,0 +1,15 @@
+import type { Span } from '@sentry/types';
+
+/**
+ * Returns the root span of a given span.
+ *
+ * As long as we use `Transaction`s internally, the returned root span
+ * will be a `Transaction` but be aware that this might change in the future.
+ *
+ * If the given span has no root span or transaction, `undefined` is returned.
+ */
+export function getRootSpan(span: Span): Span | undefined {
+  // TODO (v8): Remove this check and just return span
+  // eslint-disable-next-line deprecation/deprecation
+  return span.transaction;
+}

packages/core/src/utils/spanUtils.ts

@@ -107,17 +107,3 @@ export function spanIsSampled(span: Span): boolean {
   // eslint-disable-next-line no-bitwise
   return Boolean(traceFlags & TRACE_FLAG_SAMPLED);
 }
-
-/**
- * Returns the root span of a given span.
- *
- * As long as we use `Transaction`s internally, the returned root span
- * will be a `Transaction` but be aware that this might change in the future.
- *
- * If the given span has no root span or transaction, `undefined` is returned.
- */
-export function getRootSpan(span: Span): Span | undefined {
-  // TODO (v8): Remove this check and just return span
-  // eslint-disable-next-line deprecation/deprecation
-  return span.transaction;
-}

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

@@ -0,0 +1,36 @@
+import { Span, Transaction, getRootSpan } from '../../../src';
+
+describe('getRootSpan', () => {
+  it('returns the root span of a span (Span)', () => {
+    const root = new Span({ name: 'test' });
+    // @ts-expect-error this is highly illegal and shouldn't happen IRL
+    // eslint-disable-next-line deprecation/deprecation
+    root.transaction = root;
+
+    // eslint-disable-next-line deprecation/deprecation
+    const childSpan = root.startChild({ name: 'child' });
+    expect(getRootSpan(childSpan)).toBe(root);
+  });
+
+  it('returns the root span of a span (Transaction)', () => {
+    // eslint-disable-next-line deprecation/deprecation
+    const root = new Transaction({ name: 'test' });
+
+    // eslint-disable-next-line deprecation/deprecation
+    const childSpan = root.startChild({ name: 'child' });
+    expect(getRootSpan(childSpan)).toBe(root);
+  });
+
+  it('returns the span itself if it is a root span', () => {
+    // eslint-disable-next-line deprecation/deprecation
+    const span = new Transaction({ name: 'test' });
+
+    expect(getRootSpan(span)).toBe(span);
+  });
+
+  it('returns undefined if span has no root span', () => {
+    const span = new Span({ name: 'test' });
+
+    expect(getRootSpan(span)).toBe(undefined);
+  });
+});

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

@@ -1,6 +1,6 @@
 import { TRACEPARENT_REGEXP, timestampInSeconds } from '@sentry/utils';
-import { Span, Transaction, spanToTraceHeader } from '../../../src';
-import { getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../../../src/utils/spanUtils';
+import { Span, spanToTraceHeader } from '../../../src';
+import { spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../../../src/utils/spanUtils';
 
 describe('spanToTraceHeader', () => {
   test('simple', () => {
@@ -127,38 +127,3 @@ describe('spanIsSampled', () => {
     expect(spanIsSampled(span)).toBe(false);
   });
 });
-
-describe('getRootSpan', () => {
-  it('returns the root span of a span (Span)', () => {
-    const root = new Span({ name: 'test' });
-    // @ts-expect-error this is highly illegal and shouldn't happen IRL
-    // eslint-disable-next-line deprecation/deprecation
-    root.transaction = root;
-
-    // eslint-disable-next-line deprecation/deprecation
-    const childSpan = root.startChild({ name: 'child' });
-    expect(getRootSpan(childSpan)).toBe(root);
-  });
-
-  it('returns the root span of a span (Transaction)', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const root = new Transaction({ name: 'test' });
-
-    // eslint-disable-next-line deprecation/deprecation
-    const childSpan = root.startChild({ name: 'child' });
-    expect(getRootSpan(childSpan)).toBe(root);
-  });
-
-  it('returns the span itself if it is a root span', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const span = new Transaction({ name: 'test' });
-
-    expect(getRootSpan(span)).toBe(span);
-  });
-
-  it('returns undefined if span has no root span', () => {
-    const span = new Span({ name: 'test' });
-
-    expect(getRootSpan(span)).toBe(undefined);
-  });
-});

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

@@ -21,6 +21,7 @@ import {
   stringMatchesSomePattern,
 } from '@sentry/utils';
 
+import { getRootSpan } from '@sentry/core/build/types/utils/spanUtils';
 import { instrumentFetchRequest } from '../common/fetch';
 import { addPerformanceInstrumentationHandler } from './instrument';
 
@@ -298,7 +299,7 @@ export function xhrCallback(
 
   if (xhr.setRequestHeader && shouldAttachHeaders(sentryXhrData.url)) {
     if (span) {
-      const transaction = span && span.transaction;
+      const transaction = span && getRootSpan(span);
       const dynamicSamplingContext = transaction && getDynamicSamplingContextFromSpan(transaction);
       const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
       setHeaderOnXhr(xhr, spanToTraceHeader(span), sentryBaggageHeader);

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

@@ -134,7 +134,7 @@ export function addTracingHeadersToFetchRequest(
   // eslint-disable-next-line deprecation/deprecation
   const span = requestSpan || scope.getSpan();
 
-  const transaction = span && span.transaction;
+  const transaction = span && getRootSpan(span);
 
   const { traceId, sampled, dsc } = scope.getPropagationContext();