SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270 from spring-cloud/zipkin-0.18

Browse Source 
Updates to zipkin 0.18
This commit is contained in:
Adrian Cole
2016-05-07 07:28:18 +08:00
parent 1f5cf02c06 7da63b9ade
commit d5e3ad1b3d
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -16,8 +16,8 @@
<properties>
<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<aspectj.version>1.8.4</aspectj.version>
<zipkin-java.version>0.17.1</zipkin-java.version>
<zipkin-ui.version>1.39.8</zipkin-ui.version>
<zipkin-java.version>0.18.0</zipkin-java.version>
<zipkin-ui.version>1.40.0</zipkin-ui.version>
</properties>
<dependencyManagement>
<dependencies>

4
spring-cloud-sleuth-samples/pom.xml
View File

@@ -59,12 +59,12 @@
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<version>0.17.1</version>
<version>0.18.0</version>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>0.17.1</version>
<version>0.18.0</version>
</dependency>
</dependencies>
</dependencyManagement>

2
spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ConvertToZipkinSpanList.java
View File

@@ -74,7 +74,7 @@ final class ConvertToZipkinSpanList {
*/
// VisibleForTesting
static zipkin.Span convert(Span span, Host host) {
Builder zipkinSpan = new zipkin.Span.Builder();
Builder zipkinSpan = zipkin.Span.builder();
Endpoint ep = Endpoint.create(host.getServiceName(), host.getIpv4(),
host.getPort().shortValue());

4
spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java
View File

@@ -81,7 +81,7 @@ public class ZipkinMessageListener {
*/
static void addZipkinAnnotations(Builder zipkinSpan, Span span, Endpoint endpoint) {
for (Log ta : span.logs()) {
Annotation zipkinAnnotation = new Annotation.Builder()
Annotation zipkinAnnotation = Annotation.builder()
.endpoint(endpoint)
.timestamp(ta.getTimestamp() * 1000) // Zipkin is in microseconds
.value(ta.getEvent())
@@ -96,7 +96,7 @@ public class ZipkinMessageListener {
static void addZipkinBinaryAnnotations(Builder zipkinSpan, Span span,
Endpoint endpoint) {
for (Map.Entry<String, String> e : span.tags().entrySet()) {
BinaryAnnotation.Builder binaryAnn = new BinaryAnnotation.Builder();
BinaryAnnotation.Builder binaryAnn = BinaryAnnotation.builder();
binaryAnn.type(Type.STRING);
binaryAnn.key(e.getKey());
try {

10
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java
View File

@@ -74,7 +74,7 @@ public class ZipkinSpanListener implements SpanReporter {
*/
// Visible for testing
zipkin.Span convert(Span span) {
zipkin.Span.Builder zipkinSpan = new zipkin.Span.Builder();
zipkin.Span.Builder zipkinSpan = zipkin.Span.builder();
// A zipkin span without any annotations cannot be queried, add special "lc" to avoid that.
if (notClientOrServer(span)) {
@@ -109,7 +109,7 @@ public class ZipkinSpanListener implements SpanReporter {
byte[] processId = span.getProcessId() != null
? span.getProcessId().toLowerCase().getBytes(UTF_8)
: UNKNOWN_BYTES;
BinaryAnnotation component = new BinaryAnnotation.Builder()
BinaryAnnotation component = BinaryAnnotation.builder()
.type(BinaryAnnotation.Type.STRING)
.key("lc") // LOCAL_COMPONENT
.value(processId)
@@ -121,7 +121,7 @@ public class ZipkinSpanListener implements SpanReporter {
String serviceName = span.tags().containsKey(Span.SPAN_PEER_SERVICE_TAG_NAME) ?
span.tags().get(Span.SPAN_PEER_SERVICE_TAG_NAME) : this.endpointLocator.local().serviceName;
zipkinSpan.addBinaryAnnotation(BinaryAnnotation.address(Constants.SERVER_ADDR,
new Endpoint.Builder(this.endpointLocator.local()).serviceName(serviceName).build()));
this.endpointLocator.local().toBuilder().serviceName(serviceName).build()));
}
private boolean notClientOrServer(Span span) {
@@ -148,7 +148,7 @@ public class ZipkinSpanListener implements SpanReporter {
private void addZipkinAnnotations(zipkin.Span.Builder zipkinSpan,
Span span, Endpoint endpoint) {
for (Log ta : span.logs()) {
Annotation zipkinAnnotation = new Annotation.Builder()
Annotation zipkinAnnotation = Annotation.builder()
.endpoint(endpoint)
.timestamp(ta.getTimestamp() * 1000) // Zipkin is in microseconds
.value(ta.getEvent()).build();
@@ -162,7 +162,7 @@ public class ZipkinSpanListener implements SpanReporter {
private void addZipkinBinaryAnnotations(zipkin.Span.Builder zipkinSpan,
Span span, Endpoint ep) {
for (Map.Entry<String, String> e : span.tags().entrySet()) {
BinaryAnnotation binaryAnn = new BinaryAnnotation.Builder()
BinaryAnnotation binaryAnn = BinaryAnnotation.builder()
.type(BinaryAnnotation.Type.STRING)
.key(e.getKey())
.value(e.getValue().getBytes(UTF_8))

2
spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java
View File

@@ -114,6 +114,6 @@ public class HttpZipkinSpanReporterTest {
}
static Span span(long traceId, String spanName) {
return new Span.Builder().traceId(traceId).id(traceId).name(spanName).build();
return Span.builder().traceId(traceId).id(traceId).name(spanName).build();
}
}