Skip to content
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

Jump to bottom

AsyncLocalStorage based ContextManager #1210

Merged
merged 6 commits into from
Jun 26, 2020
Merged

AsyncLocalStorage based ContextManager #1210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f9e8f2
feat: improve ContextManager performance using AsyncLocalStorage
johanneswuerbach Jun 17, 2020
9be115c
fix: feedback
johanneswuerbach Jun 23, 2020
7e7d9d8
fix: more feedback
johanneswuerbach Jun 23, 2020
24b7d43
fix: add v prefix to version check
johanneswuerbach Jun 23, 2020
b0ccd01
fix: linter
johanneswuerbach Jun 24, 2020
e7af114
Merge branch 'master' into async-local-storage
dyladan Jun 25, 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
11 changes: 6 additions & 5 deletions ...ext-async-hooks/src/BaseContextManager.ts → ...s/src/AbstractAsyncHooksContextManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,19 @@ const ADD_LISTENER_METHODS = [
'prependOnceListener' as 'prependOnceListener',
];

export abstract class BaseContextManager implements ContextManager {
export abstract class AbstractAsyncHooksContextManager
implements ContextManager {
abstract active(): Context;

abstract with<T extends (...args: unknown[]) => ReturnType<T>>(
dyladan marked this conversation as resolved.
Show resolved Hide resolved
context: Context,
fn: T
): ReturnType<T>;

abstract enable(): this;

abstract disable(): this;

bind<T>(target: T, context?: Context): T {
// if no specific context to propagate is given, we use the current one
if (context === undefined) {
Expand All @@ -57,10 +62,6 @@ export abstract class BaseContextManager implements ContextManager {
return target;
}

abstract enable(): this;

abstract disable(): this;

private _bindFunction<T extends Function>(target: T, context: Context): T {
const manager = this;
const contextWrapper = function (this: {}, ...args: unknown[]) {
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-async-hooks/src/AsyncHooksContextManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import { Context } from '@opentelemetry/context-base';
import * as asyncHooks from 'async_hooks';
import { BaseContextManager } from './BaseContextManager';
import { AbstractAsyncHooksContextManager } from './AbstractAsyncHooksContextManager';

export class AsyncHooksContextManager extends BaseContextManager {
export class AsyncHooksContextManager extends AbstractAsyncHooksContextManager {
private _asyncHook: asyncHooks.AsyncHook;
private _contexts: Map<number, Context | undefined> = new Map();
private _stack: Array<Context | undefined> = [];
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-async-hooks/src/AsyncLocalStorageContextManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import { Context } from '@opentelemetry/context-base';
import { AsyncLocalStorage } from 'async_hooks';
import { BaseContextManager } from './BaseContextManager';
import { AbstractAsyncHooksContextManager } from './AbstractAsyncHooksContextManager';

export class AsyncLocalStorageContextManager extends BaseContextManager {
export class AsyncLocalStorageContextManager extends AbstractAsyncHooksContextManager {
private _asyncLocalStorage: AsyncLocalStorage<Context>;

constructor() {
Expand Down