chore(otel-v2-tests): Fix formatting and linting errors

dev-packages/opentelemetry-v2-tests/package.json

@@ -7,6 +7,8 @@
     "node": ">=18"
   },
   "scripts": {
+    "lint": "eslint . --format stylish",
+    "fix": "eslint . --format stylish --fix",
     "test": "vitest run",
     "test:watch": "vitest --watch"
   },

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

@@ -1,5 +1,5 @@
 import type { Span } from '@opentelemetry/api';
-import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';
+import { type SpanContext, INVALID_SPANID, INVALID_TRACEID } from '@opentelemetry/api';
 
 export const isSpan = (value: unknown): value is Span => {
   return (

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

@@ -3,11 +3,11 @@ import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
 import type { ClientOptions, Options } from '@sentry/core';
 import { flush, getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
 import { setOpenTelemetryContextAsyncContextStrategy } from '../../../../packages/opentelemetry/src/asyncContextStrategy';
+import { SentrySpanProcessor } from '../../../../packages/opentelemetry/src/spanProcessor';
 import type { OpenTelemetryClient } from '../../../../packages/opentelemetry/src/types';
 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';
 

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

@@ -16,7 +16,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import { SENTRY_TRACE_STATE_DSC } from '../../../../packages/opentelemetry/src/constants';
 import { startInactiveSpan, startSpan } from '../../../../packages/opentelemetry/src/trace';
 import { makeTraceState } from '../../../../packages/opentelemetry/src/utils/makeTraceState';
-import { cleanupOtel, getProvider, getSpanProcessor, mockSdkInit } from '../helpers/mockSdkInit';
+import { cleanupOtel, getSpanProcessor, mockSdkInit } from '../helpers/mockSdkInit';
 import type { TestClientInterface } from '../helpers/TestClient';
 
 describe('Integration | Transactions', () => {
@@ -514,7 +514,6 @@ describe('Integration | Transactions', () => {
       },
     });
 
-    const provider = getProvider();
     const spanProcessor = getSpanProcessor();
 
     const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
@@ -548,57 +547,56 @@ describe('Integration | Transactions', () => {
     expect(finishedSpans.length).toBe(0);
   });
 
-it('collects child spans that are finished within 5 minutes their parent span has been sent', async () => {
-  const timeout = 5 * 60 * 1000;
-  const now = Date.now();
-  vi.useFakeTimers();
-  vi.setSystemTime(now);
+  it('collects child spans that are finished within 5 minutes their parent span has been sent', async () => {
+    const timeout = 5 * 60 * 1000;
+    const now = Date.now();
+    vi.useFakeTimers();
+    vi.setSystemTime(now);
 
-  const logs: unknown[] = [];
-  vi.spyOn(logger, 'log').mockImplementation(msg => logs.push(msg));
+    const logs: unknown[] = [];
+    vi.spyOn(logger, 'log').mockImplementation(msg => logs.push(msg));
 
-  const transactions: Event[] = [];
+    const transactions: Event[] = [];
 
-  mockSdkInit({
-    tracesSampleRate: 1,
-    beforeSendTransaction: event => {
-      transactions.push(event);
-      return null;
-    },
-  });
+    mockSdkInit({
+      tracesSampleRate: 1,
+      beforeSendTransaction: event => {
+        transactions.push(event);
+        return null;
+      },
+    });
 
-  const provider = getProvider();
-  const spanProcessor = getSpanProcessor();
+    const spanProcessor = getSpanProcessor();
 
-  const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
+    const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;
 
-  if (!exporter) {
-    throw new Error('No exporter found, aborting test...');
-  }
+    if (!exporter) {
+      throw new Error('No exporter found, aborting test...');
+    }
 
-  startSpanManual({ name: 'test name' }, async span => {
-    const subSpan = startInactiveSpan({ name: 'inner span 1' });
-    subSpan.end();
+    startSpanManual({ name: 'test name' }, async span => {
+      const subSpan = startInactiveSpan({ name: 'inner span 1' });
+      subSpan.end();
 
-    const subSpan2 = startInactiveSpan({ name: 'inner span 2' });
+      const subSpan2 = startInactiveSpan({ name: 'inner span 2' });
 
-    span.end();
+      span.end();
 
-    setTimeout(() => {
-      subSpan2.end();
-    }, timeout - 2);
-  });
+      setTimeout(() => {
+        subSpan2.end();
+      }, timeout - 2);
+    });
 
-  vi.advanceTimersByTime(timeout - 1);
+    vi.advanceTimersByTime(timeout - 1);
 
-  expect(transactions).toHaveLength(2);
-  expect(transactions[0]?.spans).toHaveLength(1);
+    expect(transactions).toHaveLength(2);
+    expect(transactions[0]?.spans).toHaveLength(1);
 
-  const finishedSpans: any = exporter['_finishedSpanBuckets'].flatMap(bucket =>
-    bucket ? Array.from(bucket.spans) : [],
-  );
-  expect(finishedSpans.length).toBe(0);
-});
+    const finishedSpans: any = exporter['_finishedSpanBuckets'].flatMap(bucket =>
+      bucket ? Array.from(bucket.spans) : [],
+    );
+    expect(finishedSpans.length).toBe(0);
+  });
 
   it('discards child spans that are finished after 5 minutes their parent span has been sent', async () => {
     const timeout = 5 * 60 * 1000;
@@ -619,7 +617,6 @@ it('collects child spans that are finished within 5 minutes their parent span ha
       },
     });
 
-    const provider = getProvider();
     const spanProcessor = getSpanProcessor();
 
     const exporter = spanProcessor ? spanProcessor['_exporter'] : undefined;

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

@@ -28,13 +28,13 @@ import {
 } from '../../../packages/opentelemetry/src/trace';
 import type { AbstractSpan } from '../../../packages/opentelemetry/src/types';
 import { getActiveSpan } from '../../../packages/opentelemetry/src/utils/getActiveSpan';
+import { getParentSpanId } from '../../../packages/opentelemetry/src/utils/getParentSpanId';
 import { getSamplingDecision } from '../../../packages/opentelemetry/src/utils/getSamplingDecision';
 import { getSpanKind } from '../../../packages/opentelemetry/src/utils/getSpanKind';
 import { makeTraceState } from '../../../packages/opentelemetry/src/utils/makeTraceState';
 import { spanHasAttributes, spanHasName } from '../../../packages/opentelemetry/src/utils/spanTypes';
-import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
 import { isSpan } from './helpers/isSpan';
-import { getParentSpanId } from '../../../packages/opentelemetry/src/utils/getParentSpanId';
+import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
 
 describe('trace', () => {
   beforeEach(() => {