Skip to content

fix(vue): Move ROOT_SPAN_TIMER into Vue context. #4081

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

Merged
merged 1 commit into from
Oct 25, 2021
Merged

fix(vue): Move ROOT_SPAN_TIMER into Vue context. #4081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions packages/vue/src/tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ interface VueSentry extends ViewModel {
[key: string]: Span;
};
$_sentryRootSpan?: Span;
$_sentryRootSpanTimer?: ReturnType<typeof setTimeout>;
}

// Mappings from operation to corresponding lifecycle hook.
Expand All @@ -23,7 +24,6 @@ const HOOKS: { [key in Operation]: Hook[] } = {
mount: ['beforeMount', 'mounted'],
update: ['beforeUpdate', 'updated'],
};
let ROOT_SPAN_TIMER: ReturnType<typeof setTimeout>;

/** Grabs active transaction off scope, if any */
function getActiveTransaction(): Transaction | undefined {
Expand All @@ -34,11 +34,11 @@ function getActiveTransaction(): Transaction | undefined {

/** Finish top-level span and activity with a debounce configured using `timeout` option */
function finishRootSpan(vm: VueSentry, timestamp: number, timeout: number): void {
if (ROOT_SPAN_TIMER) {
clearTimeout(ROOT_SPAN_TIMER);
if (vm.$_sentryRootSpanTimer) {
clearTimeout(vm.$_sentryRootSpanTimer);
}

ROOT_SPAN_TIMER = setTimeout(() => {
vm.$_sentryRootSpanTimer = setTimeout(() => {
if (vm.$root?.$_sentryRootSpan) {
vm.$root.$_sentryRootSpan.finish(timestamp);
vm.$root.$_sentryRootSpan = undefined;
Expand Down