diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java index 81cf94ab6..01902c79e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java @@ -11,7 +11,7 @@ import org.springframework.cloud.sleuth.TraceAccessor; * * * * The value provided from SamplerConfiguration in terms of percentage is an estimation. It might occur that amount diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index f6894e61a..22e8795da 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -17,7 +17,7 @@ 3.4.0 1.1.0.BUILD-SNAPSHOT 1.8.4 - 0.4.1 + 0.4.3 @@ -74,18 +74,18 @@ ${aspectj.version} - io.zipkin - zipkin-java-core + io.zipkin.java + zipkin ${zipkin-java.version} - io.zipkin - zipkin-java-server + io.zipkin.java + zipkin-server ${zipkin-java.version} - io.zipkin - zipkin-java-jdbc + io.zipkin.java + spanstore-jdbc ${zipkin-java.version} diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index b48c37083..cc3cfde83 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -83,15 +83,15 @@ compile - io.zipkin - zipkin-java-core - 0.4.1 + io.zipkin.java + zipkin + 0.4.3 compile - io.zipkin - zipkin-java-server - 0.4.1 + io.zipkin.java + zipkin-server + 0.4.3 compile diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java index a78d850e0..4804152b8 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/IntegrationTestZipkinSpanReporter.java @@ -15,9 +15,9 @@ */ package integration; -import io.zipkin.Span; import lombok.extern.apachecommons.CommonsLog; import org.springframework.cloud.sleuth.zipkin.ZipkinSpanReporter; +import zipkin.Span; import java.util.Collections; import java.util.LinkedList; diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index 14b7ab226..929b113ba 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -108,8 +108,8 @@ docker-compose - io.zipkin - zipkin-java-core + io.zipkin.java + zipkin diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java index 0223d7cb2..c639ed697 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java @@ -17,11 +17,11 @@ package tools; import com.jayway.awaitility.Awaitility; import com.jayway.awaitility.core.ConditionFactory; -import io.zipkin.Codec; -import io.zipkin.Span; import lombok.extern.slf4j.Slf4j; import org.springframework.http.*; import org.springframework.web.client.RestTemplate; +import zipkin.Codec; +import zipkin.Span; import java.net.URI; import java.util.*; @@ -122,7 +122,7 @@ public abstract class AbstractIntegrationTest { }; } - protected List serviceNamesNotFoundInZipkin(List spans) { + protected List serviceNamesNotFoundInZipkin(List spans) { List serviceNamesFoundInAnnotations = spans.stream() .filter(span -> span.annotations != null) .map(span -> span.annotations) @@ -151,7 +151,7 @@ public abstract class AbstractIntegrationTest { return "unknown"; } - protected List annotationsNotFoundInZipkin(List spans) { + protected List annotationsNotFoundInZipkin(List spans) { String binaryAnnotationName = getRequiredBinaryAnnotationName(); Optional names = spans.stream() .filter(span -> span.binaryAnnotations != null) diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/example/ZipkinServerApplicationTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/example/ZipkinServerApplicationTests.java index 9af6cd43e..b314ed32d 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/example/ZipkinServerApplicationTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/example/ZipkinServerApplicationTests.java @@ -11,7 +11,7 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import example.ZipkinStreamServerApplication; -import io.zipkin.SpanStore; +import zipkin.SpanStore; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = ZipkinStreamServerApplication.class) diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml index caaff374c..0730337ed 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/docker-compose.yml @@ -3,7 +3,7 @@ mysql: ports: - 3306:3306 query: - image: openzipkin/zipkin-java:0.4.1 + image: openzipkin/zipkin-java:0.4.3 environment: # Remove TRANSPORT_TYPE to disable tracing - TRANSPORT_TYPE=http diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml index d01f28396..c3c8681b4 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml @@ -83,8 +83,8 @@ test - io.zipkin - zipkin-java-server + io.zipkin.java + zipkin-server com.github.kristofa diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java index 73bf5806b..683837b72 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java @@ -16,7 +16,6 @@ package sample; -import io.zipkin.Span; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -54,7 +53,7 @@ public class SampleZipkinApplication { public ZipkinSpanReporter spanCollector() { return new ZipkinSpanReporter() { @Override - public void report(Span span) { + public void report(zipkin.Span span) { log.info("Reporting span [{}]", span); } }; diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java index 7d38bbec2..e1e2cd2b1 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java @@ -16,7 +16,6 @@ package integration; import integration.ZipkinTests.WaitUntilZipkinIsUpConfig; -import io.zipkin.server.ZipkinServer; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.junit.Before; @@ -33,6 +32,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import sample.SampleZipkinApplication; import tools.AbstractIntegrationTest; +import zipkin.server.ZipkinServer; import java.util.Random; diff --git a/spring-cloud-sleuth-zipkin-stream/README.md b/spring-cloud-sleuth-zipkin-stream/README.md index 3f03dab06..4f55d7c20 100644 --- a/spring-cloud-sleuth-zipkin-stream/README.md +++ b/spring-cloud-sleuth-zipkin-stream/README.md @@ -2,7 +2,7 @@ There are 4 parts to Zipkin: the instrumented client apps, the web UI, the backend database and the query server. The database for this implementation is MySQL. -> There is a running instance on PWS: http://zipkin-web.cfapps.io. It is backed by a `zipkin-java-server` with a MySQL backend and RabbitMQ (Spring Cloud Stream) for span transport. +> There is a running instance on PWS: http://zipkin-web.cfapps.io. It is backed by a `zipkin-server` with a MySQL backend and RabbitMQ (Spring Cloud Stream) for span transport. ## Instrumenting Apps diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index d03dec7c1..3f6326e6f 100644 --- a/spring-cloud-sleuth-zipkin-stream/pom.xml +++ b/spring-cloud-sleuth-zipkin-stream/pom.xml @@ -58,12 +58,12 @@ spring-boot-starter-cloud-connectors - io.zipkin - zipkin-java-server + io.zipkin.java + zipkin-server - io.zipkin - zipkin-java-jdbc + io.zipkin.java + spanstore-jdbc com.h2database diff --git a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/EnableZipkinStreamServer.java b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/EnableZipkinStreamServer.java index 6970618c3..3d1d65b11 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/EnableZipkinStreamServer.java +++ b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/EnableZipkinStreamServer.java @@ -23,7 +23,7 @@ import org.springframework.cloud.sleuth.stream.SleuthSink; import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.context.annotation.Import; -import io.zipkin.server.EnableZipkinServer; +import zipkin.server.EnableZipkinServer; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIterator.java b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIterator.java index 8eb0821d1..6489185ab 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIterator.java +++ b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIterator.java @@ -15,7 +15,6 @@ */ package org.springframework.cloud.sleuth.zipkin.stream; -import io.zipkin.Sampler; import java.util.Iterator; import java.util.NoSuchElementException; import lombok.extern.apachecommons.CommonsLog; @@ -23,17 +22,18 @@ import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.stream.Host; import org.springframework.cloud.sleuth.stream.SleuthSink; import org.springframework.cloud.sleuth.stream.Spans; +import zipkin.Sampler; /** * This converts sleuth spans to zipkin ones, skipping invalid or unsampled. */ @CommonsLog -final class SamplingZipkinSpanIterator implements Iterator { +final class SamplingZipkinSpanIterator implements Iterator { private final Sampler sampler; private final Iterator delegate; private final Host host; - private io.zipkin.Span peeked; + private zipkin.Span peeked; SamplingZipkinSpanIterator(Sampler sampler, Spans input) { this.sampler = sampler; @@ -50,10 +50,10 @@ final class SamplingZipkinSpanIterator implements Iterator { } @Override - public io.zipkin.Span next() { + public zipkin.Span next() { // implicitly peeks if (!hasNext()) throw new NoSuchElementException(); - io.zipkin.Span result = peeked; + zipkin.Span result = peeked; peeked = null; return result; } @@ -64,9 +64,9 @@ final class SamplingZipkinSpanIterator implements Iterator { } /** returns a converted span or null if it is invalid or unsampled. */ - io.zipkin.Span convertAndSample(Span input, Host host) { + zipkin.Span convertAndSample(Span input, Host host) { if (!input.getName().equals("message/" + SleuthSink.INPUT)) { - io.zipkin.Span result = ZipkinMessageListener.convert(input, host); + zipkin.Span result = ZipkinMessageListener.convert(input, host); if (this.sampler.isSampled(result.traceId)) { return result; } diff --git a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java index b407ffc11..79a124bca 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java +++ b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java @@ -1,8 +1,5 @@ package org.springframework.cloud.sleuth.zipkin.stream; -import io.zipkin.*; -import io.zipkin.BinaryAnnotation.Type; -import io.zipkin.Span.Builder; import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -26,6 +23,9 @@ import org.springframework.core.type.AnnotatedTypeMetadata; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.util.StringUtils; +import zipkin.*; +import zipkin.BinaryAnnotation.Type; +import zipkin.Span.Builder; import javax.sql.DataSource; import java.io.UnsupportedEncodingException; @@ -48,7 +48,7 @@ public class ZipkinMessageListener { @ServiceActivator(inputChannel = SleuthSink.INPUT) public void sink(Spans input) { - Iterator sampled = new SamplingZipkinSpanIterator(sampler, input); + Iterator sampled = new SamplingZipkinSpanIterator(sampler, input); if (sampled.hasNext()) { this.spanStore.accept(sampled); } @@ -63,8 +63,8 @@ public class ZipkinMessageListener { * */ // VisibleForTesting - static io.zipkin.Span convert(Span span, Host host) { - Builder zipkinSpan = new io.zipkin.Span.Builder(); + static zipkin.Span convert(Span span, Host host) { + Builder zipkinSpan = new zipkin.Span.Builder(); Endpoint ep = Endpoint.create(host.getServiceName(), host.getIpv4(), host.getPort().shortValue()); diff --git a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIteratorTests.java b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIteratorTests.java index 6c50c1b39..57e13ec82 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIteratorTests.java +++ b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/SamplingZipkinSpanIteratorTests.java @@ -15,12 +15,12 @@ */ package org.springframework.cloud.sleuth.zipkin.stream; -import io.zipkin.Sampler; import org.junit.Test; import org.springframework.cloud.sleuth.MilliSpan; import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.stream.Host; import org.springframework.cloud.sleuth.stream.Spans; +import zipkin.Sampler; import java.util.Arrays; import java.util.Collections; @@ -38,7 +38,7 @@ public class SamplingZipkinSpanIteratorTests { public void skipsInputSpans() { Spans spans = new Spans(host, Arrays.asList(span("message/sleuth"))); - Iterator result = new SamplingZipkinSpanIterator(Sampler.create(1.0f), spans); + Iterator result = new SamplingZipkinSpanIterator(Sampler.create(1.0f), spans); assertThat(result).isEmpty(); } @@ -47,7 +47,7 @@ public class SamplingZipkinSpanIteratorTests { public void retainsValidSpans() { Spans spans = new Spans(host, Arrays.asList(span("foo"), span("bar"), span("baz"))); - Iterator result = new SamplingZipkinSpanIterator(Sampler.create(1.0f), spans); + Iterator result = new SamplingZipkinSpanIterator(Sampler.create(1.0f), spans); assertThat(result).extracting(s -> s.name).containsExactly("foo", "bar", "baz"); } @@ -64,7 +64,7 @@ public class SamplingZipkinSpanIteratorTests { } }; - Iterator result = new SamplingZipkinSpanIterator(everyOtherSampler, spans); + Iterator result = new SamplingZipkinSpanIterator(everyOtherSampler, spans); assertThat(result).extracting(s -> s.name).containsExactly("foo", "baz"); } diff --git a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListenerTests.java b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListenerTests.java index 1172c1c38..30757f0d8 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListenerTests.java +++ b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListenerTests.java @@ -16,9 +16,9 @@ package org.springframework.cloud.sleuth.zipkin.stream; -import io.zipkin.BinaryAnnotation; -import io.zipkin.Endpoint; import java.util.Collections; +import zipkin.BinaryAnnotation; +import zipkin.Endpoint; import org.junit.Test; import org.springframework.cloud.sleuth.MilliSpan; @@ -37,7 +37,7 @@ public class ZipkinMessageListenerTests { long start = System.currentTimeMillis(); span.log("http/request/retry"); // System.currentTimeMillis - io.zipkin.Span result = ZipkinMessageListener.convert(span, host); + zipkin.Span result = ZipkinMessageListener.convert(span, host); assertThat(result.timestamp) .isEqualTo(span.getBegin() * 1000); @@ -54,7 +54,7 @@ public class ZipkinMessageListenerTests { span.log("http/request/retry"); span.tag("spring-boot/version", "1.3.1.RELEASE"); - io.zipkin.Span result = ZipkinMessageListener.convert(span, host); + zipkin.Span result = ZipkinMessageListener.convert(span, host); assertThat(result.annotations.get(0).endpoint) .isEqualTo(endpoint); @@ -69,7 +69,7 @@ public class ZipkinMessageListenerTests { */ @Test public void spanWithoutAnnotationsLogsComponent() { - io.zipkin.Span result = ZipkinMessageListener.convert(span, host); + zipkin.Span result = ZipkinMessageListener.convert(span, host); assertThat(result.binaryAnnotations).hasSize(1); assertThat(result.binaryAnnotations.get(0)).isEqualToComparingFieldByField( @@ -81,7 +81,7 @@ public class ZipkinMessageListenerTests { public void nullProcessIdCoercesToUnknownServiceName() { MilliSpan noProcessId = MilliSpan.builder().traceId(1L).name("parent").remote(true).build(); - io.zipkin.Span result = ZipkinMessageListener.convert(noProcessId, host); + zipkin.Span result = ZipkinMessageListener.convert(noProcessId, host); assertThat(result.binaryAnnotations) .containsOnly(BinaryAnnotation.create("lc", "unknown", endpoint)); diff --git a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java index 6c2bb3845..cb7523a2e 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java +++ b/spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinServerApplicationTests.java @@ -13,7 +13,7 @@ import org.springframework.cloud.sleuth.zipkin.stream.ZipkinServerApplicationTes import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import io.zipkin.SpanStore; +import zipkin.SpanStore; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = ZipkinStreamServerApplication.class) diff --git a/spring-cloud-sleuth-zipkin/docker-compose.yml b/spring-cloud-sleuth-zipkin/docker-compose.yml index caaff374c..0730337ed 100644 --- a/spring-cloud-sleuth-zipkin/docker-compose.yml +++ b/spring-cloud-sleuth-zipkin/docker-compose.yml @@ -3,7 +3,7 @@ mysql: ports: - 3306:3306 query: - image: openzipkin/zipkin-java:0.4.1 + image: openzipkin/zipkin-java:0.4.3 environment: # Remove TRANSPORT_TYPE to disable tracing - TRANSPORT_TYPE=http diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 670ba6568..b16fa4e42 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -42,8 +42,8 @@ true - io.zipkin - zipkin-java-core + io.zipkin.java + zipkin org.projectlombok diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocator.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocator.java index a608c56f7..bd7abf065 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocator.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/DiscoveryClientEndpointLocator.java @@ -20,7 +20,7 @@ import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.util.InetUtils; -import io.zipkin.Endpoint; +import zipkin.Endpoint; /** * An {@link EndpointLocator} that tries to find local service information from a diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/EndpointLocator.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/EndpointLocator.java index e51d4d1fb..304bf1baf 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/EndpointLocator.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/EndpointLocator.java @@ -16,7 +16,7 @@ package org.springframework.cloud.sleuth.zipkin; -import io.zipkin.Endpoint; +import zipkin.Endpoint; /** * Strategy for locating a zipkin {@linkplain Endpoint} for the current process. diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java index 1fde9c058..a0dab18a6 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocator.java @@ -1,7 +1,7 @@ package org.springframework.cloud.sleuth.zipkin; -import io.zipkin.Endpoint; import lombok.extern.slf4j.Slf4j; +import zipkin.Endpoint; /** * Endpoint locator that will try to call an endpoint via Discovery Client diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java index 07556497b..3833eefbf 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporter.java @@ -1,7 +1,5 @@ package org.springframework.cloud.sleuth.zipkin; -import io.zipkin.Codec; -import io.zipkin.Span; import java.io.Closeable; import java.io.Flushable; import java.io.IOException; @@ -17,6 +15,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledExecutorService; import lombok.extern.apachecommons.CommonsLog; +import zipkin.Codec; +import zipkin.Span; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ServerPropertiesEndpointLocator.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ServerPropertiesEndpointLocator.java index de01c389f..fb8be42b5 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ServerPropertiesEndpointLocator.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ServerPropertiesEndpointLocator.java @@ -21,7 +21,7 @@ import org.springframework.boot.context.embedded.EmbeddedServletContainerInitial import org.springframework.cloud.util.InetUtils; import org.springframework.context.event.EventListener; -import io.zipkin.Endpoint; +import zipkin.Endpoint; /** * @author Dave Syer diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java index a69704ecb..f7cbd9bdf 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java @@ -16,10 +16,6 @@ package org.springframework.cloud.sleuth.zipkin; -import io.zipkin.Annotation; -import io.zipkin.BinaryAnnotation; -import io.zipkin.Constants; -import io.zipkin.Endpoint; import lombok.extern.apachecommons.CommonsLog; import org.springframework.cloud.sleuth.Log; import org.springframework.cloud.sleuth.Span; @@ -32,6 +28,10 @@ import org.springframework.cloud.sleuth.event.SpanReleasedEvent; import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; import org.springframework.util.StringUtils; +import zipkin.Annotation; +import zipkin.BinaryAnnotation; +import zipkin.Constants; +import zipkin.Endpoint; import java.nio.charset.Charset; import java.util.Map; @@ -119,8 +119,8 @@ public class ZipkinSpanListener { * */ // Visible for testing - io.zipkin.Span convert(Span span) { - io.zipkin.Span.Builder zipkinSpan = new io.zipkin.Span.Builder(); + zipkin.Span convert(Span span) { + zipkin.Span.Builder zipkinSpan = new zipkin.Span.Builder(); // A zipkin span without any annotations cannot be queried, add special "lc" to avoid that. if (span.logs().isEmpty() && span.tags().isEmpty()) { @@ -158,7 +158,7 @@ public class ZipkinSpanListener { /** * Add annotations from the sleuth Span. */ - private void addZipkinAnnotations(io.zipkin.Span.Builder zipkinSpan, + private void addZipkinAnnotations(zipkin.Span.Builder zipkinSpan, Span span, Endpoint endpoint) { for (Log ta : span.logs()) { Annotation zipkinAnnotation = new Annotation.Builder() @@ -174,7 +174,7 @@ public class ZipkinSpanListener { * * @return list of Annotations that could be added to Zipkin Span. */ - private void addZipkinBinaryAnnotations(io.zipkin.Span.Builder zipkinSpan, + private void addZipkinBinaryAnnotations(zipkin.Span.Builder zipkinSpan, Span span, Endpoint endpoint) { for (Map.Entry e : span.tags().entrySet()) { BinaryAnnotation binaryAnn = new BinaryAnnotation.Builder() diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanReporter.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanReporter.java index 5f1c44f41..610003e1a 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanReporter.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanReporter.java @@ -1,11 +1,9 @@ package org.springframework.cloud.sleuth.zipkin; -import io.zipkin.Span; - public interface ZipkinSpanReporter { /** * Receives completed spans from {@link ZipkinSpanListener} and submits them to a Zipkin * collector. */ - void report(Span span); + void report(zipkin.Span span); } diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java index f6b1fc835..9ad124cd6 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/FallbackHavingEndpointLocatorTests.java @@ -1,11 +1,11 @@ package org.springframework.cloud.sleuth.zipkin; -import io.zipkin.Endpoint; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.BDDMockito; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import zipkin.Endpoint; import static org.assertj.core.api.BDDAssertions.then; diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java index 272184331..102bc0175 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java @@ -4,11 +4,11 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import okhttp3.mockwebserver.SocketPolicy; -import io.zipkin.Codec; -import io.zipkin.Span; import java.util.List; import org.junit.Rule; import org.junit.Test; +import zipkin.Codec; +import zipkin.Span; import static org.assertj.core.api.Assertions.assertThat; @@ -59,7 +59,7 @@ public class HttpZipkinSpanReporterTest { assertThat(request.getHeader("Content-Type")).isEqualTo("application/json"); // Now, let's read back the spans we sent! - List zipkinSpans = Codec.JSON.readSpans(request.getBody().readByteArray()); + List zipkinSpans = Codec.JSON.readSpans(request.getBody().readByteArray()); assertThat(zipkinSpans).containsExactly( span(1L, "foo"), span(2L, "bar") @@ -91,6 +91,6 @@ public class HttpZipkinSpanReporterTest { } static Span span(long traceId, String spanName) { - return new io.zipkin.Span.Builder().traceId(traceId).id(traceId).name(spanName).build(); + return new Span.Builder().traceId(traceId).id(traceId).name(spanName).build(); } } diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListenerTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListenerTests.java index 2ff2b60fb..95a83a564 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListenerTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListenerTests.java @@ -80,7 +80,7 @@ public class ZipkinSpanListenerTests { long start = System.currentTimeMillis(); parent.log("http/request/retry"); // System.currentTimeMillis - io.zipkin.Span result = listener.convert(parent); + zipkin.Span result = listener.convert(parent); assertThat(result.timestamp) .isEqualTo(parent.getBegin() * 1000); @@ -97,7 +97,7 @@ public class ZipkinSpanListenerTests { parent.log("http/request/retry"); parent.tag("spring-boot/version", "1.3.1.RELEASE"); - io.zipkin.Span result = listener.convert(parent); + zipkin.Span result = listener.convert(parent); assertThat(result.annotations.get(0).endpoint) .isEqualTo(listener.localEndpoint); @@ -146,7 +146,7 @@ public class ZipkinSpanListenerTests { @Configuration protected static class ZipkinTestConfiguration { - private List spans = new ArrayList<>(); + private List spans = new ArrayList<>(); @Bean public Sampler defaultSampler() {