Fix

Author: aliu39

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

@@ -548,57 +548,57 @@ 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 provider = getProvider();
+    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;

packages/browser/src/integrations/featureFlags/featureFlagsIntegration.ts

@@ -1,4 +1,4 @@
-import type { Client, Event, EventHint, Integration, IntegrationFn, Span } from '@sentry/core';
+import type { Client, Event, EventHint, Integration, IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import { addFeatureFlagToActiveSpan, copyFlagsFromScopeToEvent, insertFlagToScope } from '../../utils/featureFlags';
 

packages/browser/src/integrations/featureFlags/launchdarkly/integration.ts

@@ -1,10 +1,6 @@
-import type { Client, Event, EventHint, IntegrationFn, Span } from '@sentry/core';
+import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
-import {
-  addFeatureFlagToActiveSpan,
-  copyFlagsFromScopeToEvent,
-  insertFlagToScope,
-} from '../../../utils/featureFlags';
+import { addFeatureFlagToActiveSpan, copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
 import type { LDContext, LDEvaluationDetail, LDInspectionFlagUsedHandler } from './types';
 
 /**

packages/browser/src/integrations/featureFlags/openfeature/integration.ts

@@ -13,13 +13,9 @@
  * OpenFeature.addHooks(new Sentry.OpenFeatureIntegrationHook());
  * ```
  */
-import type { Client, Event, EventHint, IntegrationFn, Span } from '@sentry/core';
+import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
-import {
-  addFeatureFlagToActiveSpan,
-  copyFlagsFromScopeToEvent,
-  insertFlagToScope,
-} from '../../../utils/featureFlags';
+import { addFeatureFlagToActiveSpan, copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
 import type { EvaluationDetails, HookContext, HookHints, JsonValue, OpenFeatureHook } from './types';
 
 export const openFeatureIntegration = defineIntegration(() => {

packages/browser/src/integrations/featureFlags/statsig/integration.ts

@@ -1,4 +1,4 @@
-import type { Client, Event, EventHint, IntegrationFn, Span } from '@sentry/core';
+import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import { addFeatureFlagToActiveSpan, copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
 import type { FeatureGate, StatsigClient } from './types';

packages/browser/src/integrations/featureFlags/unleash/integration.ts

@@ -1,11 +1,7 @@
-import type { Client, Event, EventHint, IntegrationFn, Span } from '@sentry/core';
+import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
 import { defineIntegration, fill, logger } from '@sentry/core';
 import { DEBUG_BUILD } from '../../../debug-build';
-import {
-  addFeatureFlagToActiveSpan,
-  copyFlagsFromScopeToEvent,
-  insertFlagToScope,
-} from '../../../utils/featureFlags';
+import { addFeatureFlagToActiveSpan, copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
 import type { UnleashClient, UnleashClientClass } from './types';
 
 type UnleashIntegrationOptions = {

packages/browser/src/utils/featureFlags.ts

@@ -74,12 +74,7 @@ export function insertFlagToScope(name: string, value: unknown, maxSize: number
  * @param value      Value of the feature flag.
  * @param maxSize    Max number of flags the buffer should store. Default value should always be used in production.
  */
-export function insertToFlagBuffer(
-  flags: FeatureFlag[],
-  name: string,
-  value: unknown,
-  maxSize: number,
-): void {
+export function insertToFlagBuffer(flags: FeatureFlag[], name: string, value: unknown, maxSize: number): void {
   if (typeof value !== 'boolean') {
     return;
   }

packages/core/src/utils-hoist/worldwide.ts

@@ -14,7 +14,6 @@
 
 import type { Carrier } from '../carrier';
 import type { Client } from '../client';
-import type { FeatureFlag } from '../featureFlags';
 import type { SerializedLog } from '../types-hoist/log';
 import type { Span } from '../types-hoist/span';
 import type { SdkSource } from './env';