getsentry · aliu39 · Jun 4, 2025 · Jun 4, 2025 · Jun 4, 2025 · Jun 4, 2025
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/constants.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/constants.ts
@@ -1 +1,3 @@
-export const FLAG_BUFFER_SIZE = 100; // Corresponds to constant in featureFlags.ts, in browser utils.
+// Corresponds to constants in featureFlags.ts, in browser utils.
+export const FLAG_BUFFER_SIZE = 100;
+export const MAX_FLAGS_PER_SPAN = 10;
diff --git a/...s/featureFlags/featureFlags/basic/test.ts → ...eFlags/featureFlags/onError/basic/test.ts b/...s/featureFlags/featureFlags/basic/test.ts → ...eFlags/featureFlags/onError/basic/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
-import { sentryTest } from '../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import { FLAG_BUFFER_SIZE } from '../../constants';
+import { sentryTest } from '../../../../../../utils/fixtures';
+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 }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...rations/featureFlags/featureFlags/init.js → ...featureFlags/featureFlags/onError/init.js b/...rations/featureFlags/featureFlags/init.js → ...featureFlags/featureFlags/onError/init.js
diff --git a/...ions/featureFlags/featureFlags/subject.js → ...tureFlags/featureFlags/onError/subject.js b/...ions/featureFlags/featureFlags/subject.js → ...tureFlags/featureFlags/onError/subject.js
diff --git a/...s/featureFlags/featureFlags/template.html → ...eFlags/featureFlags/onError/template.html b/...s/featureFlags/featureFlags/template.html → ...eFlags/featureFlags/onError/template.html
diff --git a/...atureFlags/featureFlags/withScope/test.ts → ...gs/featureFlags/onError/withScope/test.ts b/...atureFlags/featureFlags/withScope/test.ts → ...gs/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 { sentryTest } from '../../../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...es/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/init.js b/...es/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/init.js
@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  sampleRate: 1.0,
+  tracesSampleRate: 1.0,
+  integrations: [
+    Sentry.browserTracingIntegration({ instrumentNavigation: false, instrumentPageLoad: false }),
+    Sentry.featureFlagsIntegration(),
+  ],
+});
diff --git a/...browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/subject.js b/...browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/subject.js
@@ -0,0 +1,16 @@
+const btnStartSpan = document.getElementById('btnStartSpan');
+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.Sentry.startSpan({ name: 'test-span' }, _span => {
+      window.Sentry.startSpan({ name: 'test-nested-span' }, _nestedSpan => {
+        callback();
+      });
+    });
+  });
+};
diff --git a/...wser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/template.html b/...wser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/template.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="btnStartSpan">Start Span</button>
+    <button id="btnEndSpan">End Span</button>
+    <button id="btnStartNestedSpan">Start Nested Span</button>
+    <button id="btnEndNestedSpan">End Nested Span</button>
+  </body>
+</html>
diff --git a/...es/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/test.ts b/...es/browser-integration-tests/suites/integrations/featureFlags/featureFlags/onSpan/test.ts
@@ -0,0 +1,69 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../../utils/fixtures';
+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 }) => {
+  if (shouldSkipFeatureFlagsTest() || shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({}),
+    });
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
+  await page.goto(url);
+
+  const envelopeRequestPromise = getMultipleSentryEnvelopeRequests<EventAndTraceHeader>(
+    page,
+    1,
+    {},
+    eventAndTraceHeaderRequestParser,
+  );
+
+  // withNestedSpans is a util used to start 3 nested spans: root-span (not recorded in transaction_event.spans), span, and nested-span.
+  await page.evaluate(maxFlags => {
+    (window as any).withNestedSpans(() => {
+      const flagsIntegration = (window as any).Sentry.getClient().getIntegrationByName('FeatureFlags');
+      for (let i = 1; i <= maxFlags; i++) {
+        flagsIntegration.addFeatureFlag(`feat${i}`, false);
+      }
+      flagsIntegration.addFeatureFlag(`feat${maxFlags + 1}`, true); // dropped flag
+      flagsIntegration.addFeatureFlag('feat3', true); // update
+    });
+    return true;
+  }, MAX_FLAGS_PER_SPAN);
+
+  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'),
+  );
+
+  expect(innerSpanFlags).toEqual([]);
+
+  const expectedOuterSpanFlags = [];
+  for (let i = 1; i <= 2; i++) {
+    expectedOuterSpanFlags.push([`flag.evaluation.feat${i}`, false]);
+  }
+  for (let i = 4; i <= MAX_FLAGS_PER_SPAN; i++) {
+    expectedOuterSpanFlags.push([`flag.evaluation.feat${i}`, false]);
+  }
+  expectedOuterSpanFlags.push(['flag.evaluation.feat3', true]);
+  expect(outerSpanFlags).toEqual(expectedOuterSpanFlags);
+});
diff --git a/...s/featureFlags/launchdarkly/basic/test.ts → ...eFlags/launchdarkly/onError/basic/test.ts b/...s/featureFlags/launchdarkly/basic/test.ts → ...eFlags/launchdarkly/onError/basic/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
-import { sentryTest } from '../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import { FLAG_BUFFER_SIZE } from '../../constants';
+import { sentryTest } from '../../../../../../utils/fixtures';
+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 }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...rations/featureFlags/launchdarkly/init.js → ...featureFlags/launchdarkly/onError/init.js b/...rations/featureFlags/launchdarkly/init.js → ...featureFlags/launchdarkly/onError/init.js
diff --git a/...ions/featureFlags/launchdarkly/subject.js → ...tureFlags/launchdarkly/onError/subject.js b/...ions/featureFlags/launchdarkly/subject.js → ...tureFlags/launchdarkly/onError/subject.js
diff --git a/...s/featureFlags/launchdarkly/template.html → ...eFlags/launchdarkly/onError/template.html b/...s/featureFlags/launchdarkly/template.html → ...eFlags/launchdarkly/onError/template.html
diff --git a/...atureFlags/launchdarkly/withScope/test.ts → ...gs/launchdarkly/onError/withScope/test.ts b/...atureFlags/launchdarkly/withScope/test.ts → ...gs/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 { sentryTest } from '../../../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...es/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/init.js b/...es/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/init.js
@@ -0,0 +1,39 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.sentryLDIntegration = Sentry.launchDarklyIntegration();
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  sampleRate: 1.0,
+  tracesSampleRate: 1.0,
+  integrations: [
+    Sentry.browserTracingIntegration({ instrumentNavigation: false, instrumentPageLoad: false }),
+    window.sentryLDIntegration,
+  ],
+});
+
+// Manually mocking this because LD only has mock test utils for the React SDK.
+// Also, no SDK has mock utils for FlagUsedHandler's.
+const MockLaunchDarkly = {
+  initialize(_clientId, context, options) {
+    const flagUsedHandler = options.inspectors ? options.inspectors[0].method : undefined;
+
+    return {
+      variation(key, defaultValue) {
+        if (flagUsedHandler) {
+          flagUsedHandler(key, { value: defaultValue }, context);
+        }
+        return defaultValue;
+      },
+    };
+  },
+};
+
+window.initializeLD = () => {
+  return MockLaunchDarkly.initialize(
+    'example-client-id',
+    { kind: 'user', key: 'example-context-key' },
+    { inspectors: [Sentry.buildLaunchDarklyFlagUsedHandler()] },
+  );
+};
diff --git a/...browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/subject.js b/...browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/subject.js
@@ -0,0 +1,16 @@
+const btnStartSpan = document.getElementById('btnStartSpan');
+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.Sentry.startSpan({ name: 'test-span' }, _span => {
+      window.Sentry.startSpan({ name: 'test-nested-span' }, _nestedSpan => {
+        callback();
+      });
+    });
+  });
+};
diff --git a/...wser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/template.html b/...wser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/template.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="btnStartSpan">Start Span</button>
+    <button id="btnEndSpan">End Span</button>
+    <button id="btnStartNestedSpan">Start Nested Span</button>
+    <button id="btnEndNestedSpan">End Nested Span</button>
+  </body>
+</html>
diff --git a/...es/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/test.ts b/...es/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/onSpan/test.ts
@@ -0,0 +1,69 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../../utils/fixtures';
+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 }) => {
+  if (shouldSkipFeatureFlagsTest() || shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({}),
+    });
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
+  await page.goto(url);
+
+  const envelopeRequestPromise = getMultipleSentryEnvelopeRequests<EventAndTraceHeader>(
+    page,
+    1,
+    {},
+    eventAndTraceHeaderRequestParser,
+  );
+
+  // withNestedSpans is a util used to start 3 nested spans: root-span (not recorded in transaction_event.spans), span, and nested-span.
+  await page.evaluate(maxFlags => {
+    (window as any).withNestedSpans(() => {
+      const ldClient = (window as any).initializeLD();
+      for (let i = 1; i <= maxFlags; i++) {
+        ldClient.variation(`feat${i}`, false);
+      }
+      ldClient.variation(`feat${maxFlags + 1}`, true); // dropped
+      ldClient.variation('feat3', true); // update
+    });
+    return true;
+  }, MAX_FLAGS_PER_SPAN);
+
+  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'),
+  );
+
+  expect(innerSpanFlags).toEqual([]);
+
+  const expectedOuterSpanFlags = [];
+  for (let i = 1; i <= 2; i++) {
+    expectedOuterSpanFlags.push([`flag.evaluation.feat${i}`, false]);
+  }
+  for (let i = 4; i <= MAX_FLAGS_PER_SPAN; i++) {
+    expectedOuterSpanFlags.push([`flag.evaluation.feat${i}`, false]);
+  }
+  expectedOuterSpanFlags.push(['flag.evaluation.feat3', true]);
+  expect(outerSpanFlags).toEqual(expectedOuterSpanFlags);
+});
diff --git a/...ns/featureFlags/openfeature/basic/test.ts → ...reFlags/openfeature/onError/basic/test.ts b/...ns/featureFlags/openfeature/basic/test.ts → ...reFlags/openfeature/onError/basic/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
-import { sentryTest } from '../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import { FLAG_BUFFER_SIZE } from '../../constants';
+import { sentryTest } from '../../../../../../utils/fixtures';
+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 }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...eatureFlags/openfeature/errorHook/init.js → ...ags/openfeature/onError/errorHook/init.js b/...eatureFlags/openfeature/errorHook/init.js → ...ags/openfeature/onError/errorHook/init.js
diff --git a/...eatureFlags/openfeature/errorHook/test.ts → ...ags/openfeature/onError/errorHook/test.ts b/...eatureFlags/openfeature/errorHook/test.ts → ...ags/openfeature/onError/errorHook/test.ts
@@ -1,7 +1,11 @@
 import { expect } from '@playwright/test';
-import { sentryTest } from '../../../../../utils/fixtures';
-import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import { FLAG_BUFFER_SIZE } from '../../constants';
+import { sentryTest } from '../../../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
+import { FLAG_BUFFER_SIZE } from '../../../constants';
 
 sentryTest('Flag evaluation error hook', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...grations/featureFlags/openfeature/init.js → .../featureFlags/openfeature/onError/init.js b/...grations/featureFlags/openfeature/init.js → .../featureFlags/openfeature/onError/init.js
diff --git a/...tions/featureFlags/openfeature/subject.js → ...atureFlags/openfeature/onError/subject.js b/...tions/featureFlags/openfeature/subject.js → ...atureFlags/openfeature/onError/subject.js
diff --git a/...ns/featureFlags/openfeature/template.html → ...reFlags/openfeature/onError/template.html b/...ns/featureFlags/openfeature/template.html → ...reFlags/openfeature/onError/template.html
diff --git a/...eatureFlags/openfeature/withScope/test.ts → ...ags/openfeature/onError/withScope/test.ts b/...eatureFlags/openfeature/withScope/test.ts → ...ags/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 { sentryTest } from '../../../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipFeatureFlagsTest,
+  waitForErrorRequest,
+} from '../../../../../../utils/helpers';
 
 sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
   if (shouldSkipFeatureFlagsTest()) {

diff --git a/...ges/browser-integration-tests/suites/integrations/featureFlags/openfeature/onSpan/init.js b/...ges/browser-integration-tests/suites/integrations/featureFlags/openfeature/onSpan/init.js
@@ -0,0 +1,24 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.sentryOpenFeatureIntegration = Sentry.openFeatureIntegration();
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  sampleRate: 1.0,
+  tracesSampleRate: 1.0,
+  integrations: [
+    window.sentryOpenFeatureIntegration,
+    Sentry.browserTracingIntegration({ instrumentNavigation: false, instrumentPageLoad: false }),
+  ],
+});
+
+window.initialize = () => {
+  return {
+    getBooleanValue(flag, value) {
+      let hook = new Sentry.OpenFeatureIntegrationHook();
+      hook.after(null, { flagKey: flag, value: value });
+      return value;
+    },
+  };
+};