Set the span processor on client in tests.

Author: onurtemizkan

dev-packages/opentelemetry-v2-tests/test/asyncContextStrategy.test.ts

@@ -23,7 +23,7 @@ describe('asyncContextStrategy', () => {
 
     const options = getDefaultTestClientOptions();
     const client = new TestClient(options);
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
     setOpenTelemetryContextAsyncContextStrategy();
   });
 

dev-packages/opentelemetry-v2-tests/test/helpers/initOtel.ts

@@ -1,6 +1,6 @@
 import { context, diag, DiagLogLevel, propagation, trace } from '@opentelemetry/api';
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
-import { resourceFromAttributes, defaultResource } from '@opentelemetry/resources';
+import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
 import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
 import {
   ATTR_SERVICE_NAME,
@@ -45,12 +45,14 @@ export function initOtel(): void {
   setupEventContextTrace(client);
   enhanceDscWithOpenTelemetryRootSpanName(client);
 
-  const provider = setupOtel(client);
+  const [provider, spanProcessor] = setupOtel(client);
   client.traceProvider = provider;
+  client.spanProcessor = spanProcessor;
 }
 
 /** Just exported for tests. */
-export function setupOtel(client: TestClientInterface): BasicTracerProvider {
+export function setupOtel(client: TestClientInterface): [BasicTracerProvider, SentrySpanProcessor] {
+  const spanProcessor = new SentrySpanProcessor();
   // Create and configure NodeTracerProvider
   const provider = new BasicTracerProvider({
     sampler: new SentrySampler(client),
@@ -63,7 +65,7 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
       }),
     ),
     forceFlushTimeoutMillis: 500,
-    spanProcessors: [new SentrySpanProcessor()],
+    spanProcessors: [spanProcessor],
   });
 
   // We use a custom context manager to keep context in sync with sentry scope
@@ -73,5 +75,5 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
   propagation.setGlobalPropagator(new SentryPropagator());
   context.setGlobalContextManager(new SentryContextManager());
 
-  return provider;
+  return [provider, spanProcessor];
 }

dev-packages/opentelemetry-v2-tests/test/helpers/mockSdkInit.ts

@@ -7,6 +7,7 @@ import type { OpenTelemetryClient } from '../../../../packages/opentelemetry/src
 import { clearOpenTelemetrySetupCheck } from '../../../../packages/opentelemetry/src/utils/setupCheck';
 import { initOtel } from './initOtel';
 import { init as initTestClient } from './TestClient';
+import { SentrySpanProcessor } from '../../../../packages/opentelemetry/src/spanProcessor';
 
 const PUBLIC_DSN = 'https://username@domain/123';
 
@@ -51,6 +52,20 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
   await flush();
 }
 
+export function getSpanProcessor(): SentrySpanProcessor | undefined {
+  const client = getClient<OpenTelemetryClient>();
+  if (!client) {
+    return undefined;
+  }
+
+  const spanProcessor = client.spanProcessor;
+  if (spanProcessor instanceof SentrySpanProcessor) {
+    return spanProcessor;
+  }
+
+  return undefined;
+}
+
 export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
   let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 

dev-packages/opentelemetry-v2-tests/test/integration/transactions.test.ts

@@ -18,7 +18,7 @@ import { SENTRY_TRACE_STATE_DSC } from '../../../../packages/opentelemetry/src/c
 import { SentrySpanProcessor } from '../../../../packages/opentelemetry/src/spanProcessor';
 import { startInactiveSpan, startSpan } from '../../../../packages/opentelemetry/src/trace';
 import { makeTraceState } from '../../../../packages/opentelemetry/src/utils/makeTraceState';
-import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit';
+import { cleanupOtel, getProvider, getSpanProcessor, mockSdkInit } from '../helpers/mockSdkInit';
 import type { TestClientInterface } from '../helpers/TestClient';
 
 describe('Integration | Transactions', () => {
@@ -444,13 +444,7 @@ describe('Integration | Transactions', () => {
 
     mockSdkInit({ tracesSampleRate: 1, beforeSendTransaction });
 
-    const provider = getProvider();
-    const multiSpanProcessor = provider?.activeSpanProcessor as
-      | (SpanProcessor & { _spanProcessors?: SpanProcessor[] })
-      | undefined;
-    const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
-      spanProcessor => spanProcessor instanceof SentrySpanProcessor,
-    ) as SentrySpanProcessor | undefined;
+    const spanProcessor = getSpanProcessor();
 
     const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
 
@@ -523,12 +517,7 @@ describe('Integration | Transactions', () => {
     });
 
     const provider = getProvider();
-    const multiSpanProcessor = provider?.activeSpanProcessor as
-      | (SpanProcessor & { _spanProcessors?: SpanProcessor[] })
-      | undefined;
-    const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
-      spanProcessor => spanProcessor instanceof SentrySpanProcessor,
-    ) as SentrySpanProcessor | undefined;
+    const spanProcessor = getSpanProcessor();
 
     const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
 
@@ -580,12 +569,7 @@ describe('Integration | Transactions', () => {
     });
 
     const provider = getProvider();
-    const multiSpanProcessor = provider?.activeSpanProcessor as
-      | (SpanProcessor & { _spanProcessors?: SpanProcessor[] })
-      | undefined;
-    const spanProcessor = multiSpanProcessor?.['_spanProcessors']?.find(
-      spanProcessor => spanProcessor instanceof SentrySpanProcessor,
-    ) as SentrySpanProcessor | undefined;
+    const spanProcessor = getSpanProcessor();
 
     const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
 

dev-packages/opentelemetry-v2-tests/test/utils/getActiveSpan.test.ts

@@ -12,7 +12,7 @@ describe('getActiveSpan', () => {
 
   beforeEach(() => {
     const client = new TestClient(getDefaultTestClientOptions());
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
   });
 
   afterEach(() => {
@@ -97,7 +97,7 @@ describe('getRootSpan', () => {
 
   beforeEach(() => {
     const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
   });
 
   afterEach(async () => {

dev-packages/opentelemetry-v2-tests/test/utils/getRequestSpanData.test.ts

@@ -14,7 +14,7 @@ describe('getRequestSpanData', () => {
 
   beforeEach(() => {
     const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
   });
 
   afterEach(() => {

dev-packages/opentelemetry-v2-tests/test/utils/groupSpansWithParents.test.ts

@@ -13,7 +13,7 @@ describe('groupSpansWithParents', () => {
 
   beforeEach(() => {
     const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
   });
 
   afterEach(() => {

dev-packages/opentelemetry-v2-tests/test/utils/mapStatus.test.ts

@@ -16,7 +16,7 @@ describe('mapStatus', () => {
 
   beforeEach(() => {
     const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
   });
 
   afterEach(() => {

dev-packages/opentelemetry-v2-tests/test/utils/setupCheck.test.ts

@@ -25,10 +25,10 @@ describe('openTelemetrySetupCheck', () => {
 
   it('returns all setup parts', () => {
     const client = new TestClient(getDefaultTestClientOptions());
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
 
     const setup = openTelemetrySetupCheck();
-    expect(setup).toEqual(['SentrySampler', 'SentrySpanProcessor', 'SentryPropagator', 'SentryContextManager']);
+    expect(setup).toEqual(['SentrySpanProcessor', 'SentrySampler', 'SentryPropagator', 'SentryContextManager']);
   });
 
   it('returns partial setup parts', () => {

dev-packages/opentelemetry-v2-tests/test/utils/setupEventContextTrace.test.ts

@@ -29,7 +29,7 @@ describe('setupEventContextTrace', () => {
     client.init();
 
     setupEventContextTrace(client);
-    provider = setupOtel(client);
+    [provider] = setupOtel(client);
   });
 
   afterEach(() => {

dev-packages/opentelemetry-v2-tests/test/utils/spanToJSON.test.ts

@@ -18,7 +18,7 @@ describe('spanToJSON', () => {
 
     beforeEach(() => {
       const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
-      provider = setupOtel(client);
+      [provider] = setupOtel(client);
     });
 
     afterEach(() => {