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

Fix the special case for jaeger format traceid extraction #338

Merged
merged 2 commits into from
Sep 17, 2020

Conversation

nvx
Copy link
Contributor

@nvx nvx commented Sep 17, 2020

PR #262 introduces a regression where special parsing for the jaeger format traceid extraction is overridden with the unparsed value later in the same file.

Where a header matches the traceHeaderName it is preferred over the other matching types using partial string matches.

Copy link
Collaborator

@johanbrandhorst johanbrandhorst left a comment

Choose a reason for hiding this comment

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

Thanks for this! Could you please add a test that exercises this fix, e.g. something that would've failed before this fix was applied?

@nvx
Copy link
Contributor Author

nvx commented Sep 17, 2020

I looked at doing that but couldn't spot a way to do it end-to-end, unless you're happy with just a test that calls the function directly?

@johanbrandhorst
Copy link
Collaborator

I think that'd be alright, just something to protect us from regressions and to show a case that was broken.

@nvx
Copy link
Contributor Author

nvx commented Sep 17, 2020

Added. Any chance of having a look at PR #327 while you're at it? That one's been bugging me for a while, has a unit test already too.

@johanbrandhorst johanbrandhorst merged commit 80c2552 into grpc-ecosystem:master Sep 17, 2020
@johanbrandhorst
Copy link
Collaborator

Thanks for your contribution! Could you cherry pick this against the v2 branch please?

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.

2 participants