Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2685577
feat: Introduce startTransaction
HazAT May 19, 2020
59586bb
fix: Correctly export interfaces
HazAT May 19, 2020
1409700
fix: Additional undefined check
HazAT May 19, 2020
95680f9
Merge branch 'master' into hazat/am-changes
HazAT May 20, 2020
5192e55
Apply suggestions from code review
HazAT May 20, 2020
0d5781a
fix: Log wording
HazAT May 20, 2020
5dcc194
fix: Don't log trace context with non transactions
HazAT May 20, 2020
e416400
fix: Doc Strings
HazAT May 20, 2020
b8dc363
feat: Added new option `startTraceForUserSession`
HazAT May 20, 2020
d44c123
fix: Typing docs
HazAT May 20, 2020
c6338cf
ref: Remove trace option
HazAT May 20, 2020
6556ae7
Update packages/types/src/span.ts
HazAT May 25, 2020
0631c5a
fix: Node, Add startChild
HazAT May 25, 2020
20ec671
fix: Tests
HazAT May 25, 2020
da67297
fix: Remove trace from apply to event
HazAT May 25, 2020
b5f16d9
fix: Lint errors + Vue Integration
HazAT May 25, 2020
0fd1fab
meta: Add changelog
HazAT May 25, 2020
78ecad8
fix: Vue integration
HazAT May 25, 2020
f088aad
fix: Transaction interface
HazAT May 25, 2020
46d2526
ref: CodeReview
HazAT May 26, 2020
de78c96
feat: Safeguard for name prop in transaction
HazAT May 26, 2020
6269bfd
fix: SampleRate and BeforeSend for Transaction
HazAT May 26, 2020
19840c3
ref: StartSpan creates a child of the span on scope
HazAT May 26, 2020
171e2a1
ref: Set unlabled transaction name
HazAT May 26, 2020
39312e8
ref: Slight refactor of startSpan
HazAT May 26, 2020
c288ad4
ref: Also fix traceHeaders
HazAT May 26, 2020
b077373
feat: Add additional tests
HazAT May 26, 2020
43940d7
fix: Small typo in tests
HazAT May 26, 2020
5446d82
fix: One off tests
HazAT May 26, 2020
0f0f051
Merge branch 'master' into hazat/am-changes
HazAT May 27, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [apm] fix: Improve bundle size by moving span status to @sentry/apm #2589
- [apm] feat: No longer discard transactions instead mark them deadline exceeded #2588
- [apm] feat: Introduce `Sentry.startTransaction` and `Transaction.startChild` #2600
- [apm] feat: Transactions no longer go through `beforeSend` #2600

## 5.15.5

Expand Down
7 changes: 5 additions & 2 deletions packages/core/src/baseclient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,11 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
return SyncPromise.reject('SDK not enabled, will not send event.');
}

const isTransaction = event.type === 'transaction';
// 1.0 === 100% events are sent
// 0.0 === 0% events are sent
if (typeof sampleRate === 'number' && Math.random() > sampleRate) {
// Sampling for transaction happens somewhere else
if (!isTransaction && typeof sampleRate === 'number' && Math.random() > sampleRate) {
return SyncPromise.reject('This event has been sampled, will not send event.');
}

Expand All @@ -409,7 +411,8 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
let finalEvent: Event | null = prepared;

const isInternalException = hint && hint.data && (hint.data as { [key: string]: any }).__sentry__ === true;
if (isInternalException || !beforeSend) {
// We skip beforeSend in case of transactions
if (isInternalException || !beforeSend || isTransaction) {
this._getBackend().sendEvent(finalEvent);
resolve(finalEvent);
return;
Expand Down