Skip to content
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.

Sign up for GitHub

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

fix(core): Ensure standalone spans are not sent if SDK is disabled #14088

Merged
merged 3 commits into from
Oct 28, 2024
Merged

fix(core): Ensure standalone spans are not sent if SDK is disabled #14088

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5ce80a
fix(core): Ensure standalone spans are not sent if SDK is disabled
Lms24 Oct 28, 2024
e31ccc6
slightly change error message wording in sendEnvelope
Lms24 Oct 28, 2024
8970f42
add integration test
Lms24 Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/baseclient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {

if (this._isEnabled() && this._transport) {
return this._transport.send(envelope).then(null, reason => {
DEBUG_BUILD && logger.error('Error while sending event:', reason);
DEBUG_BUILD && logger.error('Error while sending envelope:', reason);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that sendEnvelope is called for multiple envelope item types (not just events), I opted to slightly change the message here to reflect this

return reason;
});
}
Expand Down
9 changes: 3 additions & 6 deletions packages/core/src/tracing/sentrySpan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,7 @@ function sendSpanEnvelope(envelope: SpanEnvelope): void {
return;
}

const transport = client.getTransport();
if (transport) {
transport.send(envelope).then(null, reason => {
DEBUG_BUILD && logger.error('Error while sending span:', reason);
});
}
// sendEnvelope should not throw
// eslint-disable-next-line @typescript-eslint/no-floating-promises
client.sendEnvelope(envelope);
}
Loading