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

DefaultTracer: Fix noParent being ignored after explicit parent. #1617

Merged

Conversation

Oberon00
Copy link
Member

@Oberon00 Oberon00 commented Sep 2, 2020

@@ -114,6 +114,22 @@ void testSpanContextPropagation_fromContext() {
assertThat(span.getContext()).isSameAs(spanContext);
}

@Test
void testSpanContextPropagation_fromContextAfterNoParent() {
Copy link
Member Author

Choose a reason for hiding this comment

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

I believed this test would fail before this PR initially, but it's the other way round. Still adding this test to cover this case too.

Copy link
Contributor

@anuraaga anuraaga left a comment

Choose a reason for hiding this comment

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

Thanks!

@codecov
Copy link

codecov bot commented Sep 2, 2020

Codecov Report

Merging #1617 into master will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1617      +/-   ##
============================================
+ Coverage     86.64%   86.66%   +0.01%     
  Complexity     1404     1404              
============================================
  Files           163      163              
  Lines          5535     5535              
  Branches        551      551              
============================================
+ Hits           4796     4797       +1     
  Misses          542      542              
+ Partials        197      196       -1     
Impacted Files Coverage Δ Complexity Δ
...ain/java/io/opentelemetry/trace/DefaultTracer.java 97.61% <100.00%> (+2.38%) 5.00 <0.00> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 225acce...e86013b. Read the comment docs.

Copy link
Contributor

@jkwatson jkwatson left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks!

@jkwatson jkwatson merged commit 8418753 into open-telemetry:master Sep 2, 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.

6 participants