Fix more tests

Author: timfish

packages/node/test/integration/breadcrumbs.test.ts

@@ -9,8 +9,8 @@ import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
 describe('Integration | breadcrumbs', () => {
   const beforeSendTransaction = vi.fn(() => null);
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   describe('without tracing', () => {

packages/node/test/integration/scope.test.ts

@@ -8,8 +8,8 @@ import type { NodeClient } from '../../src/sdk/client';
 import { cleanupOtel, mockSdkInit, resetGlobals } from '../helpers/mockSdkInit';
 
 describe('Integration | Scope', () => {
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   describe.each([

packages/node/test/integration/transactions.test.ts

@@ -10,9 +10,9 @@ import * as Sentry from '../../src';
 import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit';
 
 describe('Integration | Transactions', () => {
-  afterEach(() => {
+  afterEach(async () => {
     vi.restoreAllMocks();
-    cleanupOtel();
+    await cleanupOtel();
   });
 
   it('correctly creates transaction & spans', async () => {

packages/node/test/sdk/api.test.ts

@@ -3,9 +3,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import { getActiveSpan, getClient, startInactiveSpan, startSpan, withActiveSpan } from '../../src';
 import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
 
-afterEach(() => {
+afterEach(async () => {
   vi.restoreAllMocks();
-  cleanupOtel();
+  await cleanupOtel();
 });
 
 describe('withActiveSpan()', () => {

packages/node/test/sdk/client.test.ts

@@ -18,9 +18,9 @@ describe('NodeClient', () => {
     setOpenTelemetryContextAsyncContextStrategy();
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     vi.restoreAllMocks();
-    cleanupOtel();
+    await cleanupOtel();
   });
 
   it('sets correct metadata', () => {

packages/node/test/sdk/init.test.ts

@@ -31,8 +31,8 @@ describe('init()', () => {
     mockAutoPerformanceIntegrations = vi.spyOn(auto, 'getAutoPerformanceIntegrations').mockImplementation(() => []);
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
 
     vi.clearAllMocks();
   });
@@ -152,9 +152,9 @@ describe('init()', () => {
 });
 
 describe('validateOpenTelemetrySetup', () => {
-  afterEach(() => {
+  afterEach(async () => {
     global.__SENTRY__ = {};
-    cleanupOtel();
+    await cleanupOtel();
     vi.clearAllMocks();
   });
 

packages/node/test/utils/ensureIsWrapped.test.ts

@@ -12,9 +12,9 @@ const wrappedfunction = Object.assign(() => {}, {
 });
 
 describe('ensureIsWrapped', () => {
-  afterEach(() => {
+  afterEach(async () => {
     vi.restoreAllMocks();
-    cleanupOtel();
+    await cleanupOtel();
     resetGlobals();
   });
 

packages/opentelemetry/test/helpers/mockSdkInit.ts

@@ -1,12 +1,14 @@
 import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
 import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
-import type { ClientOptions, Options } from '@sentry/core';
+import type { ClientOptions, Options} from '@sentry/core';
+import { getClient } from '@sentry/core';
 
-import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
+import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
 import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
 import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
 import { init as initTestClient } from './TestClient';
 import { initOtel } from './initOtel';
+import type { OpenTelemetryClient } from '../../src/types';
 
 const PUBLIC_DSN = 'https://username@domain/123';
 
@@ -33,25 +35,26 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
   init({ dsn: PUBLIC_DSN, ...options });
 }
 
-export function cleanupOtel(_provider?: BasicTracerProvider): void {
+export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
   clearOpenTelemetrySetupCheck();
+
   const provider = getProvider(_provider);
 
-  if (!provider) {
-    return;
+  if (provider) {
+    await provider.forceFlush();
+    await provider.shutdown();
   }
 
-  void provider.forceFlush();
-  void provider.shutdown();
-
   // Disable all globally registered APIs
   trace.disable();
   context.disable();
   propagation.disable();
+
+  await flush();
 }
 
 export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
-  let provider = _provider || trace.getTracerProvider();
+  let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 
   if (provider instanceof ProxyTracerProvider) {
     provider = provider.getDelegate();

packages/opentelemetry/test/integration/breadcrumbs.test.ts

@@ -8,8 +8,8 @@ import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
 describe('Integration | breadcrumbs', () => {
   const beforeSendTransaction = vi.fn(() => null);
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   describe('without tracing', () => {

packages/opentelemetry/test/integration/scope.test.ts

@@ -15,8 +15,8 @@ import type { TestClientInterface } from '../helpers/TestClient';
 import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
 
 describe('Integration | Scope', () => {
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   describe.each([

packages/opentelemetry/test/integration/transactions.test.ts

@@ -24,10 +24,10 @@ import type { TestClientInterface } from '../helpers/TestClient';
 import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit';
 
 describe('Integration | Transactions', () => {
-  afterEach(() => {
+  afterEach(async () => {
     vi.restoreAllMocks();
     vi.useRealTimers();
-    cleanupOtel();
+    await cleanupOtel();
   });
 
   it('correctly creates transaction & spans', async () => {

packages/opentelemetry/test/propagator.test.ts

@@ -31,8 +31,8 @@ describe('SentryPropagator', () => {
     });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   it('returns fields set', () => {

packages/opentelemetry/test/sampler.test.ts

@@ -11,8 +11,8 @@ import { TestClient, getDefaultTestClientOptions } from './helpers/TestClient';
 import { cleanupOtel } from './helpers/mockSdkInit';
 
 describe('SentrySampler', () => {
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   it('works with tracesSampleRate=0', () => {

packages/opentelemetry/test/spanExporter.test.ts

@@ -12,8 +12,8 @@ describe('createTransactionForOtelSpan', () => {
     });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   it('works with a basic span', () => {

packages/opentelemetry/test/trace.test.ts

@@ -38,8 +38,8 @@ describe('trace', () => {
     mockSdkInit({ tracesSampleRate: 1 });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   describe('startSpan', () => {
@@ -1352,8 +1352,8 @@ describe('trace (tracing disabled)', () => {
     mockSdkInit({ tracesSampleRate: 0 });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+   await cleanupOtel();
   });
 
   it('startSpan calls callback without span', () => {
@@ -1376,8 +1376,8 @@ describe('trace (tracing disabled)', () => {
 });
 
 describe('trace (sampling)', () => {
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
     vi.clearAllMocks();
   });
 
@@ -1707,8 +1707,8 @@ describe('HTTP methods (sampling)', () => {
     mockSdkInit({ tracesSampleRate: 1 });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   it('does sample when HTTP method is other than OPTIONS or HEAD', () => {
@@ -1762,8 +1762,8 @@ describe('continueTrace', () => {
     mockSdkInit({ tracesSampleRate: 1 });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   it('works without trace & baggage data', () => {
@@ -1864,8 +1864,8 @@ describe('suppressTracing', () => {
     mockSdkInit({ tracesSampleRate: 1 });
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
   });
 
   it('works for a root span', () => {

packages/opentelemetry/test/utils/getTraceData.test.ts

@@ -12,8 +12,8 @@ describe('getTraceData', () => {
     mockSdkInit();
   });
 
-  afterEach(() => {
-    cleanupOtel();
+  afterEach(async () => {
+    await cleanupOtel();
     vi.clearAllMocks();
   });