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/09 07:39:53 UTC
[incubator-servicecomb-java-chassis] 01/04: SCB-172 upgrade to
zipkin2
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
commit cd643cd8e91504f9dc982c3564718ff0e9a0997a
Author: Yang, Bo <ya...@huawei.com>
AuthorDate: Fri Jan 5 11:51:39 2018 +0800
SCB-172 upgrade to zipkin2
Upgrade zipkin to v2.4.2 and reporter to v2.2.
---
.../foundation/common/base/ServiceCombConstants.java | 2 +-
handlers/handler-tracing-zipkin/pom.xml | 2 +-
.../tracing/zipkin/ConsumerInvocationAdapter.java | 2 +-
.../tracing/zipkin/ProviderInvocationAdapter.java | 2 +-
.../io/servicecomb/tracing/zipkin/TracingConfiguration.java | 13 +++++++------
java-chassis-dependencies/pom.xml | 8 ++++----
tracing/tracing-zipkin/pom.xml | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/base/ServiceCombConstants.java b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/base/ServiceCombConstants.java
index de09bad..00c2cbd 100644
--- a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/base/ServiceCombConstants.java
+++ b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/base/ServiceCombConstants.java
@@ -41,7 +41,7 @@ public interface ServiceCombConstants {
String CONFIG_TRACING_ENABLED_KEY = "servicecomb.tracing.enabled";
- String CONFIG_TRACING_COLLECTOR_PATH = "/api/v1/spans";
+ String CONFIG_TRACING_COLLECTOR_PATH = "/api/v2/spans";
String DEFAULT_TRACING_COLLECTOR_ADDRESS = "http://127.0.0.1:9411";
diff --git a/handlers/handler-tracing-zipkin/pom.xml b/handlers/handler-tracing-zipkin/pom.xml
index d8d95b4..134f3b3 100644
--- a/handlers/handler-tracing-zipkin/pom.xml
+++ b/handlers/handler-tracing-zipkin/pom.xml
@@ -50,7 +50,7 @@
<artifactId>brave</artifactId>
</dependency>
<dependency>
- <groupId>io.zipkin.reporter</groupId>
+ <groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
</dependency>
<dependency>
diff --git a/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ConsumerInvocationAdapter.java b/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ConsumerInvocationAdapter.java
index e42d68c..7f7f79b 100644
--- a/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ConsumerInvocationAdapter.java
+++ b/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ConsumerInvocationAdapter.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import brave.http.HttpClientAdapter;
import io.servicecomb.core.Invocation;
import io.servicecomb.swagger.invocation.Response;
-import zipkin.internal.Nullable;
+import zipkin2.internal.Nullable;
class ConsumerInvocationAdapter extends HttpClientAdapter<Invocation, Response> {
diff --git a/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ProviderInvocationAdapter.java b/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ProviderInvocationAdapter.java
index a514ea5..6082b19 100644
--- a/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ProviderInvocationAdapter.java
+++ b/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/ProviderInvocationAdapter.java
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
import brave.http.HttpServerAdapter;
import io.servicecomb.core.Invocation;
import io.servicecomb.swagger.invocation.Response;
-import zipkin.internal.Nullable;
+import zipkin2.internal.Nullable;
class ProviderInvocationAdapter extends HttpServerAdapter<Invocation, Response> {
diff --git a/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/TracingConfiguration.java b/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/TracingConfiguration.java
index 30c1204..000d5aa 100644
--- a/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/TracingConfiguration.java
+++ b/handlers/handler-tracing-zipkin/src/main/java/io/servicecomb/tracing/zipkin/TracingConfiguration.java
@@ -31,11 +31,11 @@ import brave.context.log4j12.MDCCurrentTraceContext;
import brave.http.HttpTracing;
import brave.propagation.CurrentTraceContext;
import io.servicecomb.config.DynamicProperties;
-import zipkin.Span;
-import zipkin.reporter.AsyncReporter;
-import zipkin.reporter.Reporter;
-import zipkin.reporter.Sender;
-import zipkin.reporter.okhttp3.OkHttpSender;
+import zipkin2.Span;
+import zipkin2.reporter.AsyncReporter;
+import zipkin2.reporter.Reporter;
+import zipkin2.reporter.Sender;
+import zipkin2.reporter.okhttp3.OkHttpSender;
@Configuration
class TracingConfiguration {
@@ -56,6 +56,7 @@ class TracingConfiguration {
return AsyncReporter.builder(sender).build();
}
+
@Bean
Tracing tracing(Reporter<Span> reporter, DynamicProperties dynamicProperties,
CurrentTraceContext currentTraceContext) {
@@ -63,7 +64,7 @@ class TracingConfiguration {
.localServiceName(dynamicProperties.getStringProperty(CONFIG_QUALIFIED_MICROSERVICE_NAME_KEY,
DEFAULT_MICROSERVICE_NAME))
.currentTraceContext(currentTraceContext) // puts trace IDs into logs
- .reporter(reporter)
+ .spanReporter(reporter)
.build();
}
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
index 36adaa3..ae6efaf 100644
--- a/java-chassis-dependencies/pom.xml
+++ b/java-chassis-dependencies/pom.xml
@@ -50,8 +50,8 @@
<cxf.version>3.1.6</cxf.version>
<logback.version>1.1.7</logback.version>
<brave.version>4.13.1</brave.version>
- <zipkin.version>1.24.0</zipkin.version>
- <zipkin-reporter.version>0.10.0</zipkin-reporter.version>
+ <zipkin.version>2.4.2</zipkin.version>
+ <zipkin-reporter.version>2.2.2</zipkin-reporter.version>
</properties>
<dependencyManagement>
@@ -646,7 +646,7 @@
<!-- zipkin dependencies -->
<dependency>
- <groupId>io.zipkin.java</groupId>
+ <groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
<version>${zipkin.version}</version>
</dependency>
@@ -661,7 +661,7 @@
<version>${brave.version}</version>
</dependency>
<dependency>
- <groupId>io.zipkin.reporter</groupId>
+ <groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
<version>${zipkin-reporter.version}</version>
</dependency>
diff --git a/tracing/tracing-zipkin/pom.xml b/tracing/tracing-zipkin/pom.xml
index 005d8c2..4d707c7 100644
--- a/tracing/tracing-zipkin/pom.xml
+++ b/tracing/tracing-zipkin/pom.xml
@@ -42,7 +42,7 @@
<artifactId>brave</artifactId>
</dependency>
<dependency>
- <groupId>io.zipkin.reporter</groupId>
+ <groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.