Fix and lint

aliu39 · aliu39 · commit 03699e51cc74 · 2025-06-05T17:04:29.000-04:00
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onError/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onError/basic/test.ts
@@ -1,6 +1,10 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onError/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onError/withScope/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
 import type { Scope } from '@sentry/browser';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/subject.js b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/subject.js
@@ -3,26 +3,16 @@ const btnEndSpan = document.getElementById('btnEndSpan');
 const btnStartNestedSpan = document.getElementById('btnStartNestedSpan');
 const btnEndNestedSpan = document.getElementById('btnEndNestedSpan');
 
-window.withNestedSpans = (callback) => {
-  window.Sentry.startSpan(
-    { name: 'test-root-span' },
-    rootSpan => {
-      window.traceId = rootSpan.spanContext().traceId;
+window.withNestedSpans = callback => {
+  window.Sentry.startSpan({ name: 'test-root-span' }, rootSpan => {
+    window.traceId = rootSpan.spanContext().traceId;
 
-      window.Sentry.startSpan(
-        { name: 'test-span' },
-        _span => {
-
-          window.Sentry.startSpan(
-            { name: 'test-nested-span' },
-            _nestedSpan => {
-              callback();
-            }
-          );
-        },
-      );
-    },
-  );
+    window.Sentry.startSpan({ name: 'test-span' }, _span => {
+      window.Sentry.startSpan({ name: 'test-nested-span' }, _nestedSpan => {
+        callback();
+      });
+    });
+  });
 };
 
 // btnStartNestedSpan.addEventListener('click', () => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/test.ts
@@ -1,6 +1,12 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../utils/fixtures';
-import { shouldSkipFeatureFlagsTest, shouldSkipTracingTest, getMultipleSentryEnvelopeRequests, eventAndTraceHeaderRequestParser, type EventAndTraceHeader } from '../../../../../utils/helpers';
+import {
+  type EventAndTraceHeader,
+  eventAndTraceHeaderRequestParser,
+  getMultipleSentryEnvelopeRequests,
+  shouldSkipFeatureFlagsTest,
+  shouldSkipTracingTest,
+} from '../../../../../utils/helpers';
 import { MAX_FLAGS_PER_SPAN } from '../../constants';
 
 sentryTest("Feature flags are added to active span's attributes on span end.", async ({ getLocalTestUrl, page }) => {
@@ -23,7 +29,7 @@ sentryTest("Feature flags are added to active span's attributes on span end.", a
     page,
     1,
     {}, // envelopeType: 'transaction' },
-    eventAndTraceHeaderRequestParser,  // properFullEnvelopeRequestParser
+    eventAndTraceHeaderRequestParser, // properFullEnvelopeRequestParser
   );
 
   // withNestedSpans is a util used to start 3 nested spans: root-span (not recorded in transaction_event.spans), span, and nested-span.
@@ -41,8 +47,12 @@ sentryTest("Feature flags are added to active span's attributes on span end.", a
   const event = (await envelopeRequestPromise)[0][0];
   const innerSpan = event.spans?.[0];
   const outerSpan = event.spans?.[1];
-  const outerSpanFlags = Object.entries(outerSpan?.data ?? {}).filter(([key, _val]) => key.startsWith('flag.evaluation'));
-  const innerSpanFlags = Object.entries(innerSpan?.data ?? {}).filter(([key, _val]) => key.startsWith('flag.evaluation'));
+  const outerSpanFlags = Object.entries(outerSpan?.data ?? {}).filter(([key, _val]) =>
+    key.startsWith('flag.evaluation'),
+  );
+  const innerSpanFlags = Object.entries(innerSpan?.data ?? {}).filter(([key, _val]) =>
+    key.startsWith('flag.evaluation'),
+  );
 
   expect(innerSpanFlags).toEqual([]);
 
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onError/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onError/basic/test.ts
@@ -1,6 +1,10 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onError/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onError/withScope/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
 import type { Scope } from '@sentry/browser';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/onError/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/onError/basic/test.ts
@@ -1,6 +1,10 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/onError/errorHook/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/onError/errorHook/test.ts
@@ -1,6 +1,10 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Flag evaluation error hook', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/onError/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/onError/withScope/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
 import type { Scope } from '@sentry/browser';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/onError/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/onError/basic/test.ts
@@ -1,6 +1,10 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/onError/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/onError/withScope/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
 import type { Scope } from '@sentry/browser';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/onError/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/onError/basic/test.ts
@@ -1,6 +1,10 @@
 import { expect } from '@playwright/test';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/onError/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/onError/withScope/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
 import type { Scope } from '@sentry/browser';
 import { sentryTest } from '../../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {
diff --git a/packages/browser/src/utils/featureFlags.ts b/packages/browser/src/utils/featureFlags.ts
@@ -52,7 +52,7 @@ export function copyFlagsFromScopeToEvent(event: Event): Event {
  * @param name     Name of the feature flag to insert.
  * @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 insertFlagToScope(name: string, value: unknown, maxSize: number = FLAG_BUFFER_SIZE): void {
   const scopeContexts = getCurrentScope().getScopeData().contexts;
   if (!scopeContexts.flags) {
@@ -75,7 +75,13 @@ export function insertFlagToScope(name: string, value: unknown, maxSize: number
  * @param maxSize    Max number of flags the buffer should store. Default value should always be used in production.
  * @param allowEviction  If true, the oldest flag is evicted when the buffer is full. Otherwise the new flag is dropped.
  */
-export function insertToFlagBuffer(flags: FeatureFlag[], name: string, value: unknown, maxSize: number, allowEviction: boolean = true): void {
+export function insertToFlagBuffer(
+  flags: FeatureFlag[],
+  name: string,
+  value: unknown,
+  maxSize: number,
+  allowEviction: boolean = true,
+): void {
   if (typeof value !== 'boolean') {
     return;
   }
@@ -91,15 +97,13 @@ export function insertToFlagBuffer(flags: FeatureFlag[], name: string, value: un
   if (index !== -1) {
     // The flag was found, remove it from its current position - O(n)
     flags.splice(index, 1);
-    console.log('dup flag', name);
   }
 
   if (flags.length === maxSize) {
     if (allowEviction) {
       // If at capacity, pop the earliest flag - O(n)
       flags.shift();
     } else {
-      console.log('dropping flag', name);
       return;
     }
   }
@@ -145,6 +149,8 @@ export function bufferSpanFeatureFlag(
 export function freezeSpanFeatureFlags(span: Span): void {
   const flags = GLOBAL_OBJ._spanToFlagBufferMap?.get(span);
   if (flags) {
-    span.setAttributes(Object.fromEntries(flags.map(flag => [`${SPAN_FLAG_ATTRIBUTE_PREFIX}${flag.flag}`, flag.result])));
+    span.setAttributes(
+      Object.fromEntries(flags.map(flag => [`${SPAN_FLAG_ATTRIBUTE_PREFIX}${flag.flag}`, flag.result])),
+    );
   }
 }
diff --git a/packages/browser/test/utils/featureFlags.test.ts b/packages/browser/test/utils/featureFlags.test.ts
@@ -75,9 +75,7 @@ describe('flags', () => {
       insertToFlagBuffer(buffer, 'feat1', false, maxSize, false);
       insertToFlagBuffer(buffer, 'feat1', true, maxSize, false);
 
-      expect(buffer).toEqual([
-        { flag: 'feat1', result: true },
-      ]);
+      expect(buffer).toEqual([{ flag: 'feat1', result: true }]);
     });
 
     it('does not allocate unnecessary space', () => {
