Skip to content

use invalid to check asyncState #27

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
kezhenxu94 merged 2 commits into from
Jan 27, 2021
Merged

use invalid to check asyncState #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31fe595
use invalid to check asyncState
zijin-m Jan 27, 2021
9f9badd
add invalid flag for AsyncState
zijin-m Jan 27, 2021
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
17 changes: 9 additions & 8 deletions src/trace/context/ContextManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import SpanContext from '../../trace/context/SpanContext';

import async_hooks from 'async_hooks';

type AsyncState = { context: Context, spans: Span[] };
type AsyncState = { context: Context, spans: Span[], invalid: boolean };

let store: {
getStore(): AsyncState | undefined;
Expand Down Expand Up @@ -59,9 +59,9 @@ if (async_hooks.AsyncLocalStorage) {
class ContextManager {
get asyncState(): AsyncState {
let asyncState = store.getStore();

if (asyncState === undefined) {
asyncState = { context: new SpanContext(), spans: [] };
// since `AsyncLocalStorage.getStore` may get previous state, see issue https://github.com/nodejs/node/issues/35286#issuecomment-697207158, so recreate when asyncState is invalid
if (asyncState === undefined || asyncState.invalid) {
asyncState = { context: new SpanContext(), spans: [], invalid: false };
store.enterWith(asyncState);
}

Expand All @@ -79,10 +79,10 @@ class ContextManager {
spansDup(): Span[] {
let asyncState = store.getStore();

if (asyncState === undefined) {
asyncState = { context: new SpanContext(), spans: [] };
if (asyncState === undefined || asyncState.invalid) {
asyncState = { context: new SpanContext(), spans: [], invalid: false };
} else {
asyncState = { context: asyncState.context, spans: [...asyncState.spans] };
asyncState = { context: asyncState.context, spans: [...asyncState.spans], invalid: asyncState.invalid };
}

store.enterWith(asyncState);
Expand All @@ -91,11 +91,12 @@ class ContextManager {
}

clear(): void {
this.asyncState.invalid = true;
store.enterWith(undefined as unknown as AsyncState);
}

restore(context: Context, spans: Span[]): void {
store.enterWith({ context, spans: spans || [] });
store.enterWith({ context, spans: spans || [], invalid: this.asyncState.invalid });
}

withSpan(span: Span, callback: (...args: any[]) => any, ...args: any[]): any {
Expand Down