SCB-146 Upgarded Zipkin Brave to 4.13.1

apache · Jan 2, 2018 · 5ae1e63 · 5ae1e63
1 parent b28b602
commit 5ae1e63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
@@ -48,7 +48,7 @@
     <narayana.version>5.3.2.Final</narayana.version>
     <cxf.version>3.1.6</cxf.version>
     <logback.version>1.1.7</logback.version>
-    <brave.version>4.4.0</brave.version>
+    <brave.version>4.13.1</brave.version>
     <zipkin.version>1.24.0</zipkin.version>
     <zipkin-reporter.version>0.10.0</zipkin-reporter.version>
   </properties>

diff --git a/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java
@@ -39,7 +39,8 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 import brave.Tracing;
-import brave.internal.StrictCurrentTraceContext;
+import brave.propagation.StrictCurrentTraceContext;
+
 import io.servicecomb.tracing.zipkin.ZipkinSpanAspectTest.TracingConfig;
 import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication;
 import io.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask;

diff --git a/.../tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/.../tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -44,7 +44,7 @@
 import brave.Span;
 import brave.Tracer.SpanInScope;
 import brave.Tracing;
-import brave.internal.StrictCurrentTraceContext;
+import brave.propagation.StrictCurrentTraceContext;
 import io.servicecomb.tracing.zipkin.ZipkinTracingAdviser.ThrowableSupplier;
 
 public class ZipkinTracingAdviserTest {