Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
chore: merge branch 'main' into diag
  • Loading branch information
obecny committed Jun 7, 2021
commit b073f6b7bd9a16e20c868ee0de85fcd94b12470f
4 changes: 2 additions & 2 deletions packages/opentelemetry-instrumentation-http/src/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
this._callResponseHook(span, response);
}

context.bind(response);
context.bind(context.active(), response);
this._diag.debug('outgoingRequest on response()');
response.on('end', () => {
this._diag.debug('outgoingRequest on end()');
Expand Down Expand Up @@ -570,7 +570,7 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
);

instrumentation._diag.debug('%s instrumentation outgoingRequest', component);
context.bind(request, parentContext);
context.bind(parentContext, request);
return instrumentation._traceClientRequest(
component,
request,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.