You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/01/02 00:50:05 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-146
Upgarded Zipkin Brave to 4.13.1
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 5ae1e63 SCB-146 Upgarded Zipkin Brave to 4.13.1
5ae1e63 is described below
commit 5ae1e63fd3b16d790b02dd56b7546107492af92c
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 29 22:25:15 2017 +0800
SCB-146 Upgarded Zipkin Brave to 4.13.1
---
java-chassis-dependencies/pom.xml | 2 +-
.../test/java/io/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java | 3 ++-
.../java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index 26ccb6a..78ea724 100644
--- 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
index cbcf5c0..a05cf1f 100644
--- 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.context.annotation.Configuration;
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/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
index 6574ec3..0040b81 100644
--- a/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
+++ b/tracing/tracing-zipkin/src/test/java/io/servicecomb/tracing/zipkin/ZipkinTracingAdviserTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
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 {
--
To stop receiving notification emails like this one, please contact
['"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>'].