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

fix(http): do not set outgoing http span as active in the context #1479 #1546

Merged
merged 5 commits into from
Oct 13, 2020
+26 −13
Merged

fix(http): do not set outgoing http span as active in the context #1479 #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bc8019
fix: do not set outgoing http span as active in the context #1479
vmarchaud Sep 19, 2020
e9e1cbe
chore: update test to check context inside http callback
vmarchaud Oct 6, 2020
9c9c087
chore: lint
vmarchaud Oct 6, 2020
3c97626
Merge branch 'master' into fix-http-outgoing-callback
vmarchaud Oct 10, 2020
cf3a91e
Merge branch 'master' into fix-http-outgoing-callback
vmarchaud Oct 13, 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
30 changes: 17 additions & 13 deletions packages/opentelemetry-plugin-http/src/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
SpanContext,
TraceFlags,
getExtractedSpanContext,
setActiveSpan,
} from '@opentelemetry/api';
import { BasePlugin, NoRecordingSpan } from '@opentelemetry/core';
import type {
Expand Down Expand Up @@ -410,21 +411,24 @@ export class HttpPlugin extends BasePlugin<Http> {
kind: SpanKind.CLIENT,
};
const span = plugin._startHttpSpan(operationName, spanOptions);
if (!optionsParsed.headers) {
optionsParsed.headers = {};
}
propagation.inject(
optionsParsed.headers,
undefined,
setActiveSpan(context.active(), span)
);

return plugin._tracer.withSpan(span, () => {
if (!optionsParsed.headers) optionsParsed.headers = {};
propagation.inject(optionsParsed.headers);

const request: ClientRequest = plugin._safeExecute(
span,
() => original.apply(this, [optionsParsed, ...args]),
true
);
const request: ClientRequest = plugin._safeExecute(
span,
() => original.apply(this, [optionsParsed, ...args]),
true
);

plugin._logger.debug('%s plugin outgoingRequest', plugin.moduleName);
plugin._tracer.bind(request);
return plugin._traceClientRequest(request, optionsParsed, span);
});
plugin._logger.debug('%s plugin outgoingRequest', plugin.moduleName);
plugin._tracer.bind(request);
return plugin._traceClientRequest(request, optionsParsed, span);
};
}

Expand Down
9 changes: 9 additions & 0 deletions packages/opentelemetry-plugin-http/test/functionals/http-enable.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
propagation,
Span as ISpan,
SpanKind,
getActiveSpan,
} from '@opentelemetry/api';
import { NoopLogger } from '@opentelemetry/core';
import { NodeTracerProvider } from '@opentelemetry/node';
Expand Down Expand Up @@ -709,6 +710,14 @@ describe('HttpPlugin', () => {
SpanKind.CLIENT
);
});

it('should not set span as active in context for outgoing request', done => {
assert.deepStrictEqual(getActiveSpan(context.active()), undefined);
http.get(`${protocol}://${hostname}:${serverPort}/test`, res => {
assert.deepStrictEqual(getActiveSpan(context.active()), undefined);
done();
});
});
});

describe('with require parent span', () => {
Expand Down