Skip to content

fix(tracing): respect idleTimeout after last finished activity #4442

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

Closed
aabidos wants to merge 2 commits into from
Closed

fix(tracing): respect idleTimeout after last finished activity #4442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be936c
fix(tracing): respect idleTimeout after last finished activity
aabidos Jan 21, 2022
ac85bf6
fixup! fix(tracing): respect idleTimeout after last finished activity
aabidos Jan 21, 2022
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
6 changes: 5 additions & 1 deletion packages/tracing/src/idletransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,11 @@ export class IdleTransaction extends Transaction {
// Remember timestampWithMs is in seconds, timeout is in ms
const end = timestampWithMs() + timeout / 1000;

setTimeout(() => {
if (this._initTimeout) {
clearTimeout(this._initTimeout);
}

this._initTimeout = setTimeout(() => {
if (!this._finished) {
this.setTag(FINISH_REASON_TAG, IDLE_TRANSACTION_FINISH_REASONS[1]);
this.finish(end);
Expand Down
36 changes: 36 additions & 0 deletions packages/tracing/test/idletransaction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,42 @@ describe('IdleTransaction', () => {
jest.advanceTimersByTime(DEFAULT_IDLE_TIMEOUT);
expect(transaction.endTimestamp).toBeUndefined();
});

it('does not finish when idleTimeout is not exceed after last activity finished', () => {
const idleTimeout = 10;
const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, hub, idleTimeout);
transaction.initSpanRecorder(10);

const span = transaction.startChild({});
span.finish();

jest.advanceTimersByTime(2);

const span2 = transaction.startChild({});
span2.finish();

jest.advanceTimersByTime(8);

expect(transaction.endTimestamp).toBeUndefined();
});

it('finish when idleTimeout is exceeded after last activity finished', () => {
const idleTimeout = 10;
const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, hub, idleTimeout);
transaction.initSpanRecorder(10);

const span = transaction.startChild({});
span.finish();

jest.advanceTimersByTime(2);

const span2 = transaction.startChild({});
span2.finish();

jest.advanceTimersByTime(10);

expect(transaction.endTimestamp).toBeDefined();
});
});

describe('heartbeat', () => {
Expand Down