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

fix: enable async hooks manager in node tracer close #226 #232

Merged
merged 4 commits into from
Sep 7, 2019
Merged

fix: enable async hooks manager in node tracer close #226 #232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4b4fe9
fix: enable async hooks manager in node tracer
vmarchaud Aug 30, 2019
dbcbfeb
Merge branch 'master' into fix-ah-enable
mayurkale22 Sep 4, 2019
5f83328
fix(node-tracer): set scope manager as optional
vmarchaud Sep 4, 2019
d185b1e
Merge branch 'master' into fix-ah-enable
mayurkale22 Sep 6, 2019
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: 3 additions & 3 deletions packages/opentelemetry-node-tracer/src/NodeTracer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ export class NodeTracer extends BasicTracer {
* Constructs a new Tracer instance.
*/
constructor(config: BasicTracerConfig) {
super(
Object.assign({}, { scopeManager: new AsyncHooksScopeManager() }, config)
);
const scopeManager = new AsyncHooksScopeManager();
super(Object.assign({}, { scopeManager }, config));
scopeManager.enable();
vmarchaud marked this conversation as resolved.
Show resolved Hide resolved

// @todo: Integrate Plugin Loader (pull/126).
}
Expand Down
21 changes: 21 additions & 0 deletions packages/opentelemetry-node-tracer/test/NodeTracer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ import {
import { AsyncHooksScopeManager } from '@opentelemetry/scope-async-hooks';
import { NodeTracer } from '../src/NodeTracer';

const sleep = (time: number) =>
new Promise(resolve => {
vmarchaud marked this conversation as resolved.
Show resolved Hide resolved
return setTimeout(resolve, time);
});

describe('NodeTracer', () => {
describe('constructor', () => {
it('should construct an instance with required only options', () => {
Expand Down Expand Up @@ -156,6 +161,22 @@ describe('NodeTracer', () => {
// @todo: below check is not running.
assert.deepStrictEqual(tracer.getCurrentSpan(), null);
});

it('should find correct scope with promises', done => {
const tracer = new NodeTracer({
scopeManager: new AsyncHooksScopeManager(),
});
const span = tracer.startSpan('my-span');
tracer.withSpan(span, async () => {
for (let i = 0; i < 3; i++) {
await sleep(5).then(() => {
assert.deepStrictEqual(tracer.getCurrentSpan(), span);
});
}
return done();
});
assert.deepStrictEqual(tracer.getCurrentSpan(), null);
});
});

describe('.bind()', () => {
Expand Down