Skip to content

Commit 6adbbb4

Browse files
committed
make logic more clear
1 parent 9e040cd commit 6adbbb4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

packages/core/src/tracing/idletransaction.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ export class IdleTransaction extends Transaction {
159159
}
160160

161161
const spanStartedBeforeTransactionFinish = span.startTimestamp < endTimestamp;
162-
const spanEndedBeforeFinalTimeout = span.endTimestamp < (this._finalTimeout + this._idleTimeout) / 1000;
162+
163+
const timeoutWithDelta = (this._finalTimeout + this._idleTimeout) / 1000;
164+
165+
const transactionDidNotExceedTimeout = endTimestamp - this.startTimestamp < timeoutWithDelta;
166+
const spanDidNotExceedTimeout = span.endTimestamp - span.startTimestamp < timeoutWithDelta;
167+
const spanEndedBeforeFinalTimeout = transactionDidNotExceedTimeout && spanDidNotExceedTimeout;
163168

164169
if (__DEBUG_BUILD__) {
165170
const stringifiedSpan = JSON.stringify(span, undefined, 2);

packages/tracing/test/idletransaction.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ describe('IdleTransaction', () => {
209209
const span = transaction.startChild({ startTimestamp: transaction.startTimestamp + 2 });
210210
span.finish(span.startTimestamp + 10 + 30 + 1);
211211

212-
transaction.finish(transaction.startTimestamp + 10);
212+
transaction.finish(transaction.startTimestamp + 50);
213213

214214
expect(transaction.spanRecorder).toBeDefined();
215215
expect(transaction.spanRecorder!.spans).toHaveLength(1);

0 commit comments

Comments
 (0)