Upgrade to OpenTracing java 0.30.0 with in-process propagation support #188

objectiser · 2017-05-22T13:30:23Z

Resolves #179

Changed all calls to SpanBuilder.start() method to startManual() to avoid deprecation warnings.

codecov-io · 2017-05-23T08:11:30Z

Codecov Report

Merging #188 into master will increase coverage by 0.5%.
The diff coverage is 94.44%.

@@             Coverage Diff             @@
##             master     #188     +/-   ##
===========================================
+ Coverage     80.98%   81.48%   +0.5%     
- Complexity      462      463      +1     
===========================================
  Files            77       77             
  Lines          1793     1804     +11     
  Branches        210      211      +1     
===========================================
+ Hits           1452     1470     +18     
+ Misses          251      244      -7     
  Partials         90       90

Impacted Files	Coverage Δ	Complexity Δ
...aeger-core/src/main/java/com/uber/jaeger/Span.java	`81.44% <ø> (+1.64%)`	`36 <0> (ø)`	⬇️
...a/com/uber/jaeger/filters/jaxrs2/ServerFilter.java	`95% <100%> (ø)`	`7 <0> (ø)`	⬇️
...r/jaeger/httpclient/TracingRequestInterceptor.java	`84.61% <100%> (ø)`	`5 <0> (ø)`	⬇️
...a/com/uber/jaeger/filters/jaxrs2/ClientFilter.java	`82.14% <100%> (ø)`	`5 <0> (ø)`	⬇️
...ger-core/src/main/java/com/uber/jaeger/Tracer.java	`87.78% <93.33%> (+0.28%)`	`17 <3> (+1)`	⬆️
...java/com/uber/jaeger/reporters/RemoteReporter.java	`90% <0%> (+2.85%)`	`9% <0%> (ø)`	⬇️
...jaeger/reporters/protocols/ThriftUdpTransport.java	`81.35% <0%> (+3.38%)`	`14% <0%> (ø)`	⬇️
...c/main/java/com/uber/jaeger/senders/UdpSender.java	`74.54% <0%> (+3.63%)`	`11% <0%> (ø)`	⬇️

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 700f744...7d9ce5c. Read the comment docs.

yurishkuro · 2017-05-26T22:49:50Z

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

@@ -188,7 +208,7 @@ public void close() {
    }

    @Override
-    public io.opentracing.Tracer.SpanBuilder asChildOf(io.opentracing.Span parent) {
+    public io.opentracing.Tracer.SpanBuilder asChildOf(BaseSpan<?> parent) {


not io.opentracing.BaseSpan?

It is io.opentracing.BaseSpan.

yurishkuro

given my comments about the build, it seems we're missing unit tests for various scenarios involving the active span

yurishkuro · 2017-05-30T23:09:35Z

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

+
+        // Check if active span should be established as CHILD_OF relationship
+        if (!ignoreActiveSpan && null != activeSpanSource.activeSpan()) {
+          asChildOf(activeSpanSource.activeSpan());


this seems too late, since the new context was already created above.

maybe move it into createNewContext(), to cover the case below

yurishkuro · 2017-05-30T23:10:07Z

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

+        // Check if active span should be established as CHILD_OF relationship
+        if (!ignoreActiveSpan && null != activeSpanSource.activeSpan()) {
+          asChildOf(activeSpanSource.activeSpan());
+        }
      } else if (debugId != null) {
        context = createNewContext(debugId);


technically this also qualifies for active-spanness

objectiser · 2017-05-31T07:59:53Z

Ok thanks @yurishkuro I will sort it out when back next week.

pavolloffay · 2017-05-31T08:13:41Z

We should start deprecating instrumentations and context propagation. It can be done in a separate PR.

Resolves jaegertracing#179

…o cater for debug context

objectiser · 2017-06-06T13:01:08Z

@yurishkuro Moved the code into the createNewContext method. What additional unit tests were you thinking about - the PropagationTest has various tests for dealing with the active span?

yurishkuro

Sorry for slow response, this week has been very busy.

yurishkuro · 2017-06-08T02:41:58Z

jaeger-core/src/main/java/com/uber/jaeger/Span.java

@@ -169,7 +169,6 @@ private void finishWithDuration(long durationMicros) {
    }
  }

-  @Override
  public void close() {


should we even have this method? IIRC the OT Span is no longer closable

yurishkuro · 2017-06-08T02:46:16Z

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

+      if (!ignoreActiveSpan && null != activeSpanSource.activeSpan()) {
+        asChildOf(activeSpanSource.activeSpan());
+      }
+
      return new SpanContext(id, id, 0, flags);


parentID == 0 and traceID == random() are incorrect if we have a parent span

yurishkuro · 2017-06-08T02:47:32Z

jaeger-core/src/test/java/com/uber/jaeger/PropagationTest.java

+      tracer.buildSpan("child").startActive().deactivate();
+    }
+    assertEquals(2, reporter.getSpans().size());
+    assertEquals("child", reporter.getSpans().get(0).getOperationName());


nit: extract to vars to make the code easier to read

Span childSpan = reporter.getSpans().get(0); Span parentSpan = reporter.getSpans().get(1);

yurishkuro · 2017-06-08T02:49:28Z

jaeger-core/src/test/java/com/uber/jaeger/PropagationTest.java

+    assertTrue(reporter.getSpans().get(1).getReferences().isEmpty());
+    assertEquals(References.CHILD_OF, reporter.getSpans().get(0).getReferences().get(0).getType());
+    assertEquals(reporter.getSpans().get(1).context(),
+        reporter.getSpans().get(0).getReferences().get(0).getSpanContext());


missing checks:

parentSpan.traceID == childSpan.traceID

parentSpan.spanID == childSpan.parentID

yurishkuro · 2017-06-08T02:50:35Z

jaeger-core/src/test/java/com/uber/jaeger/PropagationTest.java

+    }
+    assertEquals(2, reporter.getSpans().size());
+    assertTrue(reporter.getSpans().get(0).getReferences().isEmpty());
+    assertTrue(reporter.getSpans().get(1).getReferences().isEmpty());


missing:

outerSpan.traceID != inner.traceID

innerSpan.parentID == 0

… and add further checks in tests

yurishkuro · 2017-06-08T16:44:17Z

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

+        parentId = parentContext.getSpanId();
+      }
+
+      return new SpanContext(traceId, id, parentId, flags);


I think there's another issue - span ID can be unique or inherited from parent depending on zipkinSharedRpcSpan flag. Looking at this with a fresh eye, perhaps this child logic does not belong to createNewContext. Instead, of we move it to the beginning of startManual would the rest just work automatically?

public io.opentracing.Span startManual() { // move here if (!ignoreActiveSpan && null != activeSpanSource.activeSpan()) { asChildOf((SpanContext) activeSpanSource.activeSpan().context()); } SpanContext context; String debugId = debugId(); if (references.isEmpty()) { context = createNewContext(null); } else if (debugId != null) { context = createNewContext(debugId); } else { context = createChildContext(); }

@yurishkuro Update applied - although not sure it is right, as the conditions for adding the childOf for the active span is that no other explicit references have been added? Possibly it just needs an extract condition - e.g. references.isEmpty() && !ignoreActiveSpan && ... ?

yurishkuro · 2017-06-08T18:51:51Z

jaeger-core/src/main/java/com/uber/jaeger/Tracer.java

+      // Check if active span should be established as CHILD_OF relationship
+      if (!ignoreActiveSpan && null != activeSpanSource.activeSpan()) {
+        asChildOf(activeSpanSource.activeSpan());
+      }


lgtm. Just one more thing - reading the API docs, the active span should only be used as a parent if there are no other references added explicitly. So need to add && references. isEmpty

And probably a respective unit test is missing for this scenario.

Will add test soon - have to sign off for a while.

yurishkuro · 2017-06-09T19:23:18Z

Thanks @objectiser !

objectiser force-pushed the otj030 branch from be70497 to 6538138 Compare May 23, 2017 08:06

objectiser force-pushed the otj030 branch from 6538138 to 03b7669 Compare May 26, 2017 20:06

yurishkuro reviewed May 26, 2017

View reviewed changes

yurishkuro reviewed May 30, 2017

View reviewed changes

pavolloffay mentioned this pull request Jun 5, 2017

check if activeSpanStack is empty before pop opentracing-contrib/java-spring-web#23

Closed

objectiser added 2 commits June 6, 2017 11:04

Upgrade to OpenTracing java 0.30.0 with in-process propagation support

149ef6b

Resolves jaegertracing#179

Moved location for setting up active span ChildOf relationship to als…

2b5a9fc

…o cater for debug context

objectiser force-pushed the otj030 branch from 03b7669 to 2b5a9fc Compare June 6, 2017 12:58

yurishkuro reviewed Jun 8, 2017

View reviewed changes

Fix setup of traceId and parentId when establishing auto childOf ref,…

4c75232

… and add further checks in tests

yurishkuro reviewed Jun 8, 2017

View reviewed changes

Update ChildOf check location as suggested

05efbe9

yurishkuro reviewed Jun 8, 2017

View reviewed changes

objectiser added 2 commits June 8, 2017 19:59

Check for no references

6ae9e9b

Test for active span, but explicitly provided references

7d9ce5c

yurishkuro approved these changes Jun 8, 2017

View reviewed changes

black-adder approved these changes Jun 9, 2017

View reviewed changes

yurishkuro merged commit e97081c into jaegertracing:master Jun 9, 2017

yurishkuro mentioned this pull request Jan 21, 2018

[jaeger-client-java/jax-rs2] Remove jaeger-context dependence for JAX-RS2 jaeger instrumentation #319

Merged

debosmit mentioned this pull request Jan 24, 2018

[jaeger-client-java/apache instrumentation] Completely remove apache instrumentation dependence on jaeger-context #320

Merged

pavolloffay mentioned this pull request May 10, 2019

Automatically generate changelog #629

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to OpenTracing java 0.30.0 with in-process propagation support #188

Upgrade to OpenTracing java 0.30.0 with in-process propagation support #188

objectiser commented May 22, 2017 •

edited

Loading

codecov-io commented May 23, 2017 •

edited

Loading

yurishkuro May 26, 2017

objectiser May 27, 2017

yurishkuro left a comment

yurishkuro May 30, 2017

yurishkuro May 30, 2017

yurishkuro May 30, 2017

objectiser commented May 31, 2017

pavolloffay commented May 31, 2017

objectiser commented Jun 6, 2017

yurishkuro left a comment

yurishkuro Jun 8, 2017

yurishkuro Jun 8, 2017

yurishkuro Jun 8, 2017

yurishkuro Jun 8, 2017

yurishkuro Jun 8, 2017

yurishkuro Jun 8, 2017

objectiser Jun 8, 2017

yurishkuro Jun 8, 2017

yurishkuro Jun 8, 2017

objectiser Jun 8, 2017

objectiser Jun 8, 2017

yurishkuro commented Jun 9, 2017

Upgrade to OpenTracing java 0.30.0 with in-process propagation support #188

Upgrade to OpenTracing java 0.30.0 with in-process propagation support #188

Conversation

objectiser commented May 22, 2017 • edited Loading

codecov-io commented May 23, 2017 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yurishkuro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

objectiser commented May 31, 2017

pavolloffay commented May 31, 2017

objectiser commented Jun 6, 2017

yurishkuro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yurishkuro commented Jun 9, 2017

objectiser commented May 22, 2017 •

edited

Loading

codecov-io commented May 23, 2017 •

edited

Loading