feat(opentelemetry): Use core getRootSpan functionality

Author: mydea

packages/core/src/index.ts

@@ -93,6 +93,7 @@ export {
   getStatusMessage,
   getRootSpan,
   getActiveSpan,
+  addChildSpanToSpan,
 } from './utils/spanUtils';
 export { applySdkMetadata } from './utils/sdkMetadata';
 export { DEFAULT_ENVIRONMENT } from './constants';

packages/node-experimental/src/index.ts

@@ -41,8 +41,6 @@ export { cron } from './cron';
 
 export type { NodeOptions } from './types';
 
-export { getRootSpan } from '@sentry/opentelemetry';
-
 export {
   addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
@@ -106,6 +104,7 @@ export {
   startInactiveSpan,
   getActiveSpan,
   withActiveSpan,
+  getRootSpan,
 } from '@sentry/core';
 
 export type {

packages/opentelemetry/src/index.ts

@@ -26,7 +26,7 @@ export {
 
 export { isSentryRequestSpan } from './utils/isSentryRequest';
 
-export { getActiveSpan, getRootSpan } from './utils/getActiveSpan';
+export { getActiveSpan } from './utils/getActiveSpan';
 export { startSpan, startSpanManual, startInactiveSpan, withActiveSpan } from './trace';
 
 // eslint-disable-next-line deprecation/deprecation

packages/opentelemetry/src/setupEventContextTrace.ts

@@ -1,7 +1,8 @@
+import { getRootSpan } from '@sentry/core';
 import type { Client } from '@sentry/types';
 import { dropUndefinedKeys } from '@sentry/utils';
 
-import { getActiveSpan, getRootSpan } from './utils/getActiveSpan';
+import { getActiveSpan } from './utils/getActiveSpan';
 import { spanHasName, spanHasParentId } from './utils/spanTypes';
 
 /** Ensure the `trace` context is set on all events. */

packages/opentelemetry/src/spanProcessor.ts

@@ -2,7 +2,7 @@ import type { Context } from '@opentelemetry/api';
 import { ROOT_CONTEXT, trace } from '@opentelemetry/api';
 import type { Span, SpanProcessor as SpanProcessorInterface } from '@opentelemetry/sdk-trace-base';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { getClient, getDefaultCurrentScope, getDefaultIsolationScope } from '@sentry/core';
+import { addChildSpanToSpan, getClient, getDefaultCurrentScope, getDefaultIsolationScope } from '@sentry/core';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
@@ -21,6 +21,7 @@ function onSpanStart(span: Span, parentContext: Context): void {
   // We need access to the parent span in order to be able to move up the span tree for breadcrumbs
   if (parentSpan) {
     setSpanParent(span, parentSpan);
+    addChildSpanToSpan(parentSpan, span);
   }
 
   // The root context does not have scopes stored, so we check for this specifically

packages/opentelemetry/src/trace.ts

@@ -10,6 +10,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getClient,
   getCurrentScope,
+  getRootSpan,
   handleCallbackErrors,
 } from '@sentry/core';
 import type { Client, Scope } from '@sentry/types';
@@ -19,7 +20,6 @@ import { SENTRY_TRACE_STATE_DSC } from './constants';
 import type { OpenTelemetryClient, OpenTelemetrySpanContext } from './types';
 import { getContextFromScope } from './utils/contextData';
 import { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
-import { getRootSpan } from './utils/getActiveSpan';
 import { setSpanMetadata } from './utils/spanData';
 
 /**

packages/opentelemetry/src/utils/getActiveSpan.ts

@@ -1,25 +1,9 @@
 import type { Span } from '@opentelemetry/api';
 import { trace } from '@opentelemetry/api';
 
-import { getSpanParent } from './spanData';
-
 /**
  * Returns the currently active span.
  */
 export function getActiveSpan(): Span | undefined {
   return trace.getActiveSpan();
 }
-
-/**
- * Get the root span for the given span.
- * The given span may be the root span itself.
- */
-export function getRootSpan(span: Span): Span {
-  let parent: Span = span;
-
-  while (getSpanParent(parent)) {
-    parent = getSpanParent(parent) as Span;
-  }
-
-  return parent;
-}

packages/opentelemetry/test/trace.test.ts

@@ -11,13 +11,14 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getClient,
   getCurrentScope,
+  getRootSpan,
   withScope,
 } from '@sentry/core';
 import type { Event, Scope } from '@sentry/types';
 
 import { startInactiveSpan, startSpan, startSpanManual } from '../src/trace';
 import type { AbstractSpan } from '../src/types';
-import { getActiveSpan, getRootSpan } from '../src/utils/getActiveSpan';
+import { getActiveSpan } from '../src/utils/getActiveSpan';
 import { getSpanKind } from '../src/utils/getSpanKind';
 import { getSpanMetadata } from '../src/utils/spanData';
 import { spanHasAttributes, spanHasName } from '../src/utils/spanTypes';

packages/opentelemetry/test/utils/getActiveSpan.test.ts

@@ -1,7 +1,8 @@
 import { trace } from '@opentelemetry/api';
 import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import { getRootSpan } from '@sentry/core';
 
-import { getActiveSpan, getRootSpan } from '../../src/utils/getActiveSpan';
+import { getActiveSpan } from '../../src/utils/getActiveSpan';
 import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
 import { setupOtel } from '../helpers/initOtel';
 import { cleanupOtel } from '../helpers/mockSdkInit';