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.

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

feat: support W3C TraceContext traceparent header #1587

Merged
merged 2 commits into from
Jan 14, 2020

Conversation

hmdhk
Copy link
Contributor

@hmdhk hmdhk commented Jan 10, 2020

This PR adds support for W3C TraceContext traceparent header while still keeping the elastic-apm-traceparent header. The use of the elastic header is controlled by ELASTIC_APM_USE_ELASTIC_TRACEPARENT_HEADER config option. For more see: #994

Checklist

  • Implement code
  • Add tests
  • Update TypeScript typings
  • Update documentation
  • Commit message follows commit guidelines

lib/config.js Outdated Show resolved Hide resolved
test/instrumentation/modules/http/basic.js Outdated Show resolved Hide resolved
test/instrumentation/modules/http/outgoing.js Outdated Show resolved Hide resolved
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have anything to add over what @watson already raised. Looks good with those things fixed.

@hmdhk hmdhk requested a review from watson January 13, 2020 15:50
@hmdhk
Copy link
Contributor Author

hmdhk commented Jan 14, 2020

@watson , I've rebased to include the babel test fix. Let me know what do you think.

@hmdhk hmdhk merged commit cde2dde into elastic:master Jan 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants