-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(tracing): Ensure sent spans are limited to 1000 #12252
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
dev-packages/browser-integration-tests/suites/tracing/maxSpans/init.js
This file contains hidden or 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,15 @@ | ||
import * as Sentry from '@sentry/browser'; | ||
|
||
window.Sentry = Sentry; | ||
|
||
Sentry.init({ | ||
dsn: 'https://public@dsn.ingest.sentry.io/1337', | ||
integrations: [], | ||
tracesSampleRate: 1, | ||
}); | ||
|
||
Sentry.startSpan({ name: 'parent' }, () => { | ||
for (let i = 0; i < 5000; i++) { | ||
Sentry.startInactiveSpan({ name: `child ${i}` }).end(); | ||
} | ||
}); |
20 changes: 20 additions & 0 deletions
20
dev-packages/browser-integration-tests/suites/tracing/maxSpans/test.ts
This file contains hidden or 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,20 @@ | ||
import { expect } from '@playwright/test'; | ||
import { sentryTest } from '../../../utils/fixtures'; | ||
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequestOnUrl } from '../../../utils/helpers'; | ||
|
||
sentryTest('it limits spans to 1000', async ({ getLocalTestUrl, page }) => { | ||
if (shouldSkipTracingTest()) { | ||
sentryTest.skip(); | ||
} | ||
|
||
const url = await getLocalTestUrl({ testDir: __dirname }); | ||
await page.goto(url); | ||
|
||
const req = await waitForTransactionRequestOnUrl(page, url); | ||
const transaction = envelopeRequestParser(req); | ||
|
||
expect(transaction.spans).toHaveLength(1000); | ||
expect(transaction.spans).toContainEqual(expect.objectContaining({ description: 'child 0' })); | ||
expect(transaction.spans).toContainEqual(expect.objectContaining({ description: 'child 999' })); | ||
expect(transaction.spans).not.toContainEqual(expect.objectContaining({ description: 'child 1000' })); | ||
}); |
15 changes: 15 additions & 0 deletions
15
dev-packages/node-integration-tests/suites/tracing/maxSpans/scenario.ts
This file contains hidden or 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,15 @@ | ||
import { loggingTransport } from '@sentry-internal/node-integration-tests'; | ||
import * as Sentry from '@sentry/node'; | ||
|
||
Sentry.init({ | ||
dsn: 'https://public@dsn.ingest.sentry.io/1337', | ||
release: '1.0', | ||
tracesSampleRate: 1.0, | ||
transport: loggingTransport, | ||
}); | ||
|
||
Sentry.startSpan({ name: 'parent' }, () => { | ||
for (let i = 0; i < 5000; i++) { | ||
Sentry.startInactiveSpan({ name: `child ${i}` }).end(); | ||
} | ||
}); |
19 changes: 19 additions & 0 deletions
19
dev-packages/node-integration-tests/suites/tracing/maxSpans/test.ts
This file contains hidden or 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,19 @@ | ||
import type { SpanJSON } from '@sentry/types'; | ||
import { createRunner } from '../../../utils/runner'; | ||
|
||
test('it limits spans to 1000', done => { | ||
const expectedSpans: SpanJSON[] = []; | ||
for (let i = 0; i < 1000; i++) { | ||
expectedSpans.push(expect.objectContaining({ description: `child ${i}` })); | ||
} | ||
|
||
createRunner(__dirname, 'scenario.ts') | ||
.ignore('session', 'sessions') | ||
.expect({ | ||
transaction: { | ||
transaction: 'parent', | ||
spans: expectedSpans, | ||
}, | ||
}) | ||
.start(done); | ||
}); |
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.sort() is not pure and will mutate the array. I would recommend shallow cloning the array first and making this very explicit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know, but here we already have a copy of an array that is not used anywhere else, so this is safe and "slightly more efficient". But I can leave a comment to make this clear!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added a comment here (and also in the other place) to be explicit about this! :)