Made ZIpkin 2 default

fixes #785

Author: marcingrzejszczak

README.adoc

@@ -401,7 +401,7 @@ the Spring BOM
 
 ==== Sleuth with Zipkin via HTTP
 
-If you want both Sleuth and Zipkin just add the `spring-cloud-starter-zipkin2` dependency.
+If you want both Sleuth and Zipkin just add the `spring-cloud-starter-zipkin` dependency.
 
 [source,xml,indent=0,subs="verbatim,attributes",role="primary"]
 .Maven
@@ -420,12 +420,12 @@ If you want both Sleuth and Zipkin just add the `spring-cloud-starter-zipkin2` d
 
     <dependency> <2>
         <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-zipkin2</artifactId>
+        <artifactId>spring-cloud-starter-zipkin</artifactId>
     </dependency>
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2`
+<2> Add the dependency to `spring-cloud-starter-zipkin`
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="secondary"]
 .Gradle
@@ -437,12 +437,12 @@ dependencyManagement { <1>
 }
 
 dependencies { <2>
-    compile "org.springframework.cloud:spring-cloud-starter-zipkin2"
+    compile "org.springframework.cloud:spring-cloud-starter-zipkin"
 }
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2`
+<2> Add the dependency to `spring-cloud-starter-zipkin`
 
 ==== Sleuth with Zipkin via RabbitMQ or Kafka
 
@@ -451,7 +451,7 @@ dependencies. The default destination name is `zipkin`.
 
 _Note: `spring-cloud-sleuth-stream` is deprecated and incompatible with these destinations_
 
-If you want Sleuth over RabbitMQ add the `spring-cloud-starter-zipkin2` and `spring-rabbit`
+If you want Sleuth over RabbitMQ add the `spring-cloud-starter-zipkin` and `spring-rabbit`
 dependencies.
 
 [source,xml,indent=0,subs="verbatim,attributes",role="primary"]
@@ -471,7 +471,7 @@ dependencies.
 
     <dependency> <2>
         <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-zipkin2</artifactId>
+        <artifactId>spring-cloud-starter-zipkin</artifactId>
     </dependency>
     <dependency> <3>
         <groupId>org.springframework.amqp</groupId>
@@ -480,7 +480,7 @@ dependencies.
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2` - that way all dependent dependencies will be downloaded
+<2> Add the dependency to `spring-cloud-starter-zipkin` - that way all dependent dependencies will be downloaded
 <3> To automatically configure rabbit, simply add the spring-rabbit dependency
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="secondary"]
@@ -493,13 +493,13 @@ dependencyManagement { <1>
 }
 
 dependencies {
-    compile "org.springframework.cloud:spring-cloud-starter-zipkin2" <2>
+    compile "org.springframework.cloud:spring-cloud-starter-zipkin" <2>
     compile "org.springframework.amqp:spring-rabbit" <3>
 }
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2` - that way all dependent dependencies will be downloaded
+<2> Add the dependency to `spring-cloud-starter-zipkin` - that way all dependent dependencies will be downloaded
 <3> To automatically configure rabbit, simply add the spring-rabbit dependency
 
 == Additional resources
@@ -553,7 +553,7 @@ a baggage element then it will be sent downstream either via HTTP or messaging t
 
 * Provides simple metrics of accepted / dropped spans.
 
-* If `spring-cloud-sleuth-zipkin2` then the app will generate and collect Zipkin-compatible traces.
+* If `spring-cloud-sleuth-zipkin` then the app will generate and collect Zipkin-compatible traces.
 By default it sends them via HTTP to a Zipkin server on localhost (port 9411).
 Configure the location of the service using `spring.zipkin.baseUrl`.
   - If you depend on `spring-rabbit` or `spring-kafka` your app will send traces to a broker instead of http.

docs/src/main/asciidoc/features.adoc

@@ -41,11 +41,11 @@ a baggage element then it will be sent downstream either via HTTP or messaging t
 
 * Provides simple metrics of accepted / dropped spans.
 
-* If `spring-cloud-sleuth-zipkin2` then the app will generate and collect Zipkin-compatible traces.
+* If `spring-cloud-sleuth-zipkin` then the app will generate and collect Zipkin-compatible traces.
 By default it sends them via HTTP to a Zipkin server on localhost (port 9411).
 Configure the location of the service using `spring.zipkin.baseUrl`.
   - If you depend on `spring-rabbit` or `spring-kafka` your app will send traces to a broker instead of http.
-  - Note: `spring-cloud-sleuth-stream` is deprecated and should no longer be used. 
+  - Note: `spring-cloud-sleuth-stream` is deprecated and should no longer be used.
 
 IMPORTANT: If using Zipkin, configure the percentage of spans exported using `spring.sleuth.sampler.percentage`
 (default 0.1, i.e. 10%). *Otherwise you might think that Sleuth is not working cause it's omitting some spans.*

docs/src/main/asciidoc/intro.adoc

@@ -280,7 +280,7 @@ the Spring BOM
 
 ==== Sleuth with Zipkin via HTTP
 
-If you want both Sleuth and Zipkin just add the `spring-cloud-starter-zipkin2` dependency.
+If you want both Sleuth and Zipkin just add the `spring-cloud-starter-zipkin` dependency.
 
 [source,xml,indent=0,subs="verbatim,attributes",role="primary"]
 .Maven
@@ -299,12 +299,12 @@ If you want both Sleuth and Zipkin just add the `spring-cloud-starter-zipkin2` d
 
     <dependency> <2>
         <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-zipkin2</artifactId>
+        <artifactId>spring-cloud-starter-zipkin</artifactId>
     </dependency>
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2`
+<2> Add the dependency to `spring-cloud-starter-zipkin`
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="secondary"]
 .Gradle
@@ -316,12 +316,12 @@ dependencyManagement { <1>
 }
 
 dependencies { <2>
-    compile "org.springframework.cloud:spring-cloud-starter-zipkin2"
+    compile "org.springframework.cloud:spring-cloud-starter-zipkin"
 }
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2`
+<2> Add the dependency to `spring-cloud-starter-zipkin`
 
 ==== Sleuth with Zipkin via RabbitMQ or Kafka
 
@@ -330,7 +330,7 @@ dependencies. The default destination name is `zipkin`.
 
 _Note: `spring-cloud-sleuth-stream` is deprecated and incompatible with these destinations_
 
-If you want Sleuth over RabbitMQ add the `spring-cloud-starter-zipkin2` and `spring-rabbit`
+If you want Sleuth over RabbitMQ add the `spring-cloud-starter-zipkin` and `spring-rabbit`
 dependencies.
 
 [source,xml,indent=0,subs="verbatim,attributes",role="primary"]
@@ -350,7 +350,7 @@ dependencies.
 
     <dependency> <2>
         <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-zipkin2</artifactId>
+        <artifactId>spring-cloud-starter-zipkin</artifactId>
     </dependency>
     <dependency> <3>
         <groupId>org.springframework.amqp</groupId>
@@ -359,7 +359,7 @@ dependencies.
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2` - that way all dependent dependencies will be downloaded
+<2> Add the dependency to `spring-cloud-starter-zipkin` - that way all dependent dependencies will be downloaded
 <3> To automatically configure rabbit, simply add the spring-rabbit dependency
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="secondary"]
@@ -372,13 +372,13 @@ dependencyManagement { <1>
 }
 
 dependencies {
-    compile "org.springframework.cloud:spring-cloud-starter-zipkin2" <2>
+    compile "org.springframework.cloud:spring-cloud-starter-zipkin" <2>
     compile "org.springframework.amqp:spring-rabbit" <3>
 }
 ----
 <1> In order not to pick versions by yourself it's much better if you add the dependency management via
 the Spring BOM
-<2> Add the dependency to `spring-cloud-starter-zipkin2` - that way all dependent dependencies will be downloaded
+<2> Add the dependency to `spring-cloud-starter-zipkin` - that way all dependent dependencies will be downloaded
 <3> To automatically configure rabbit, simply add the spring-rabbit dependency
 
 == Additional resources

pom.xml

@@ -28,14 +28,14 @@
 	<modules>
 		<module>spring-cloud-sleuth-dependencies</module>
 		<module>spring-cloud-sleuth-core</module>
+		<module>spring-cloud-sleuth-zipkin-legacy</module>
 		<module>spring-cloud-sleuth-zipkin</module>
-		<module>spring-cloud-sleuth-zipkin2</module>
 		<module>spring-cloud-sleuth-stream</module>
 		<module>spring-cloud-sleuth-reactor</module>
 		<module>spring-cloud-sleuth-zipkin-stream</module>
 		<module>spring-cloud-starter-sleuth</module>
+		<module>spring-cloud-starter-zipkin-legacy</module>
 		<module>spring-cloud-starter-zipkin</module>
-		<module>spring-cloud-starter-zipkin2</module>
 		<module>spring-cloud-sleuth-samples</module>
 		<module>docs</module>
 	</modules>

spring-cloud-sleuth-dependencies/pom.xml

@@ -32,12 +32,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-sleuth-zipkin</artifactId>
+				<artifactId>spring-cloud-sleuth-zipkin-legacy</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+				<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
@@ -52,12 +52,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-zipkin</artifactId>
+				<artifactId>spring-cloud-starter-zipkin-legacy</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-zipkin2</artifactId>
+				<artifactId>spring-cloud-starter-zipkin</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>

spring-cloud-sleuth-samples/README.adoc

@@ -6,7 +6,7 @@ There are a few samples with slightly different features. You can run all of the
 
 * `spring-cloud-sleuth-sample`: vanilla (no zipkin) web app that calls back to itself on various endpoints ("/", "/call", "/async")
 
-* `spring-cloud-sleuth-sample-zipkin2`: same as vanilla sample but with zipkin (set `sample.zipkin.enabled=true` if you have a collector running)
+* `spring-cloud-sleuth-sample-zipkin`: same as vanilla sample but with zipkin (set `sample.zipkin.enabled=true` if you have a collector running)
 
 * `spring-cloud-sleuth-sample-messaging`: a Spring Integration application with two HTTP endpoints ("/" and "/xform")
 
@@ -16,7 +16,7 @@ The Ribbon sample makes an interesting demo or playground for learning about zip
 
 === Running samples with Zipkin
 
-1. Optionally run the https://github.com/openzipkin/zipkin[Zipkin] Server, e.g. via docker compose (there's a `docker-compose.yml` in https://github.com/spring-cloud/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin2[Spring Cloud Sleuth], or in https://github.com/openzipkin/docker-zipkin[Docker Zipkin]
+1. Optionally run the https://github.com/openzipkin/zipkin[Zipkin] Server, e.g. via docker compose (there's a `docker-compose.yml` in https://github.com/spring-cloud/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin[Spring Cloud Sleuth], or in https://github.com/openzipkin/docker-zipkin[Docker Zipkin]
 7. Run the zipkin sample application (set `sample.zipkin.enabled=false` if you have no Zipkin running). If you are using a VM to run docker you might need to tunnel port 9411 to localhost, or change the `spring.zipkin.baseUrl`.
 8. Hit `http://localhost:3380`, `http://localhost:3380/call`, `http://localhost:3380/async` for some interesting sample traces (the app callas back to itself).
 9. Go to `http://localhost:9411` for Zipkin's UI (if you are using boot2docker the host will be different)

spring-cloud-sleuth-samples/pom.xml

@@ -23,7 +23,7 @@
 		<module>spring-cloud-sleuth-sample-websocket</module>
 		<module>spring-cloud-sleuth-sample-feign</module>
 		<module>spring-cloud-sleuth-sample-ribbon</module>
-		<module>spring-cloud-sleuth-sample-zipkin2</module>
+		<module>spring-cloud-sleuth-sample-zipkin</module>
 	</modules>
 
 	<build>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ~ Copyright 2013-2017 the original author or authors. ~ ~ Licensed under
-	the Apache License, Version 2.0 (the "License"); ~ you may not use this file 
-	except in compliance with the License. ~ You may obtain a copy of the License 
-	at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by 
-	applicable law or agreed to in writing, software ~ distributed under the 
-	License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. ~ See the License for the specific 
+	the Apache License, Version 2.0 (the "License"); ~ you may not use this file
+	except in compliance with the License. ~ You may obtain a copy of the License
+	at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
+	applicable law or agreed to in writing, software ~ distributed under the
+	License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
+	OF ANY KIND, either express or implied. ~ See the License for the specific
 	language governing permissions and ~ limitations under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -61,14 +61,14 @@
 			<artifactId>spring-cloud-starter-feign</artifactId>
 		</dependency>
 		<dependency>
-			<!-- Including Eureka is a good test, even if there is no service to connect 
+			<!-- Including Eureka is a good test, even if there is no service to connect
 				with because it exercises slightly different code paths in Ribbon -->
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-eureka</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml

@@ -82,7 +82,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml

@@ -70,7 +70,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-sleuth-zipkin2</artifactId>
+			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>