-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'getsentry:develop' into feat/graphqlClientIntegration
- Loading branch information
Showing
22 changed files
with
270 additions
and
303 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
dev-packages/browser-integration-tests/suites/integrations/featureFlags/constants.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export const FLAG_BUFFER_SIZE = 100; // Corresponds to constant in featureFlags.ts, in browser utils. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...packages/browser-integration-tests/suites/integrations/featureFlags/statsig/basic/test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { expect } from '@playwright/test'; | ||
|
|
||
| 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()) { | ||
| sentryTest.skip(); | ||
| } | ||
|
|
||
| await page.route('https://dsn.ingest.sentry.io/**/*', route => { | ||
| return route.fulfill({ | ||
| status: 200, | ||
| contentType: 'application/json', | ||
| body: JSON.stringify({ id: 'test-id' }), | ||
| }); | ||
| }); | ||
|
|
||
| const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true }); | ||
| await page.goto(url); | ||
|
|
||
| await page.evaluate(bufferSize => { | ||
| const client = (window as any).statsigClient; | ||
| for (let i = 1; i <= bufferSize; i++) { | ||
| client.checkGate(`feat${i}`); // values default to false | ||
| } | ||
|
|
||
| client.setMockGateValue(`feat${bufferSize + 1}`, true); | ||
| client.checkGate(`feat${bufferSize + 1}`); // eviction | ||
|
|
||
| client.setMockGateValue('feat3', true); | ||
| client.checkGate('feat3'); // update | ||
| }, FLAG_BUFFER_SIZE); | ||
|
|
||
| const reqPromise = waitForErrorRequest(page); | ||
| await page.locator('#error').click(); | ||
| const req = await reqPromise; | ||
| const event = envelopeRequestParser(req); | ||
|
|
||
| const expectedFlags = [{ flag: 'feat2', result: false }]; | ||
| for (let i = 4; i <= FLAG_BUFFER_SIZE; i++) { | ||
| expectedFlags.push({ flag: `feat${i}`, result: false }); | ||
| } | ||
| expectedFlags.push({ flag: `feat${FLAG_BUFFER_SIZE + 1}`, result: true }); | ||
| expectedFlags.push({ flag: 'feat3', result: true }); | ||
|
|
||
| expect(event.contexts?.flags?.values).toEqual(expectedFlags); | ||
| }); |
35 changes: 35 additions & 0 deletions
35
dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/init.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import * as Sentry from '@sentry/browser'; | ||
|
|
||
| class MockStatsigClient { | ||
| constructor() { | ||
| this._gateEvaluationListeners = []; | ||
| this._mockGateValues = {}; | ||
| } | ||
|
|
||
| on(event, listener) { | ||
| this._gateEvaluationListeners.push(listener); | ||
| } | ||
|
|
||
| checkGate(name) { | ||
| const value = this._mockGateValues[name] || false; // unknown features default to false. | ||
| this._gateEvaluationListeners.forEach(listener => { | ||
| listener({ gate: { name, value } }); | ||
| }); | ||
| return value; | ||
| } | ||
|
|
||
| setMockGateValue(name, value) { | ||
| this._mockGateValues[name] = value; | ||
| } | ||
| } | ||
|
|
||
| window.statsigClient = new MockStatsigClient(); | ||
|
|
||
| window.Sentry = Sentry; | ||
| window.sentryStatsigIntegration = Sentry.statsigIntegration({ featureFlagClient: window.statsigClient }); | ||
|
|
||
| Sentry.init({ | ||
| dsn: 'https://[email protected]/1337', | ||
| sampleRate: 1.0, | ||
| integrations: [window.sentryStatsigIntegration], | ||
| }); |
3 changes: 3 additions & 0 deletions
3
dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/subject.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| document.getElementById('error').addEventListener('click', () => { | ||
| throw new Error('Button triggered error'); | ||
| }); |
9 changes: 9 additions & 0 deletions
9
...packages/browser-integration-tests/suites/integrations/featureFlags/statsig/template.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| </head> | ||
| <body> | ||
| <button id="error">Throw Error</button> | ||
| </body> | ||
| </html> |
69 changes: 69 additions & 0 deletions
69
...ages/browser-integration-tests/suites/integrations/featureFlags/statsig/withScope/test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import { expect } from '@playwright/test'; | ||
|
|
||
| import { sentryTest } from '../../../../../utils/fixtures'; | ||
|
|
||
| import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers'; | ||
|
|
||
| import type { Scope } from '@sentry/browser'; | ||
|
|
||
| sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => { | ||
| if (shouldSkipFeatureFlagsTest()) { | ||
| sentryTest.skip(); | ||
| } | ||
|
|
||
| await page.route('https://dsn.ingest.sentry.io/**/*', route => { | ||
| return route.fulfill({ | ||
| status: 200, | ||
| contentType: 'application/json', | ||
| body: JSON.stringify({ id: 'test-id' }), | ||
| }); | ||
| }); | ||
|
|
||
| const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true }); | ||
| await page.goto(url); | ||
|
|
||
| const forkedReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === true); | ||
| const mainReqPromise = waitForErrorRequest(page, event => !!event.tags?.isForked === false); | ||
|
|
||
| await page.evaluate(() => { | ||
| const Sentry = (window as any).Sentry; | ||
| const errorButton = document.querySelector('#error') as HTMLButtonElement; | ||
| const client = (window as any).statsigClient; | ||
|
|
||
| client.setMockGateValue('shared', true); | ||
| client.setMockGateValue('main', true); | ||
|
|
||
| client.checkGate('shared'); | ||
|
|
||
| Sentry.withScope((scope: Scope) => { | ||
| client.setMockGateValue('forked', true); | ||
| client.setMockGateValue('shared', false); // override the value in the parent scope. | ||
|
|
||
| client.checkGate('forked'); | ||
| client.checkGate('shared'); | ||
| scope.setTag('isForked', true); | ||
| errorButton.click(); | ||
| }); | ||
|
|
||
| client.checkGate('main'); | ||
| Sentry.getCurrentScope().setTag('isForked', false); | ||
| errorButton.click(); | ||
| return true; | ||
| }); | ||
|
|
||
| const forkedReq = await forkedReqPromise; | ||
| const forkedEvent = envelopeRequestParser(forkedReq); | ||
|
|
||
| const mainReq = await mainReqPromise; | ||
| const mainEvent = envelopeRequestParser(mainReq); | ||
|
|
||
| expect(forkedEvent.contexts?.flags?.values).toEqual([ | ||
| { flag: 'forked', result: true }, | ||
| { flag: 'shared', result: false }, | ||
| ]); | ||
|
|
||
| expect(mainEvent.contexts?.flags?.values).toEqual([ | ||
| { flag: 'shared', result: true }, | ||
| { flag: 'main', result: true }, | ||
| ]); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 0 additions & 61 deletions
61
...kages/node-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/scenario.ts
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.