Change spring-sleuth package to include version. (#1417)

15 files changed, 21 insertions, 17 deletions

diff --git a/all/build.gradle b/all/build.gradle
index b8fea898..0ba7cb66 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -22,7 +22,7 @@ def subprojects = [
         project(':opencensus-contrib-log-correlation-stackdriver'),
         project(':opencensus-contrib-monitored-resource-util'),
         project(':opencensus-contrib-spring'),
-        project(':opencensus-contrib-spring-sleuth'),
+        project(':opencensus-contrib-spring-sleuth-v1x'),
         project(':opencensus-contrib-zpages'),
         project(':opencensus-exporter-trace-logging'),
         project(':opencensus-exporter-trace-stackdriver'),
@@ -47,7 +47,7 @@ def subprojects_javadoc = [
         project(':opencensus-contrib-log-correlation-stackdriver'),
         project(':opencensus-contrib-monitored-resource-util'),
         project(':opencensus-contrib-spring'),
-        project(':opencensus-contrib-spring-sleuth'),
+        project(':opencensus-contrib-spring-sleuth-v1x'),
         project(':opencensus-contrib-zpages'),
         project(':opencensus-exporter-trace-logging'),
         project(':opencensus-exporter-trace-stackdriver'),
diff --git a/build.gradle b/build.gradle
index c7ea819a..ff5ad7ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -391,7 +391,7 @@ subprojects {
                  'opencensus-contrib-log-correlation-stackdriver',
                  'opencensus-contrib-monitored-resource-util',
                  'opencensus-contrib-spring',
-                 'opencensus-contrib-spring-sleuth',
+                 'opencensus-contrib-spring-sleuth-v1x',
                  'opencensus-contrib-zpages',
                  'opencensus-exporter-stats-prometheus',
                  'opencensus-exporter-stats-signalfx',
diff --git a/contrib/spring_sleuth/README.md b/contrib/spring_sleuth_v1x/README.md
index a05eccb4..a05eccb4 100644
--- a/contrib/spring_sleuth/README.md
+++ b/contrib/spring_sleuth_v1x/README.md
diff --git a/contrib/spring_sleuth/build.gradle b/contrib/spring_sleuth_v1x/build.gradle
index 53ff1c04..53ff1c04 100644
--- a/contrib/spring_sleuth/build.gradle
+++ b/contrib/spring_sleuth_v1x/build.gradle
diff --git a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthAutoConfiguration.java b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthAutoConfiguration.java
index 3a11cc3a..de4201fe 100644
--- a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthAutoConfiguration.java
+++ b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthAutoConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import io.opencensus.common.ExperimentalApi;
 import java.util.Random;
diff --git a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthProperties.java b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthProperties.java
index 595f4ae0..5cd0e57c 100644
--- a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthProperties.java
+++ b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import io.opencensus.common.ExperimentalApi;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpan.java b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpan.java
index 7477f98e..eeacfcb7 100644
--- a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpan.java
+++ b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpan.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import io.opencensus.common.ExperimentalApi;
 import io.opencensus.trace.Annotation;
diff --git a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpanContextHolder.java b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpanContextHolder.java
index 05238cf9..d290257b 100644
--- a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpanContextHolder.java
+++ b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpanContextHolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import io.grpc.Context;
 import io.opencensus.common.ExperimentalApi;
diff --git a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthTracer.java b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthTracer.java
index 68d59d71..bba9bab2 100644
--- a/contrib/spring_sleuth/src/main/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthTracer.java
+++ b/contrib/spring_sleuth_v1x/src/main/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthTracer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import io.opencensus.common.ExperimentalApi;
 import java.util.Random;
diff --git a/contrib/spring_sleuth/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/contrib/spring_sleuth_v1x/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index e69de29b..e69de29b 100644
--- a/contrib/spring_sleuth/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/contrib/spring_sleuth_v1x/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/contrib/spring_sleuth/src/main/resources/META-INF/spring.factories b/contrib/spring_sleuth_v1x/src/main/resources/META-INF/spring.factories
index 8028fde3..5e654514 100644
--- a/contrib/spring_sleuth/src/main/resources/META-INF/spring.factories
+++ b/contrib/spring_sleuth_v1x/src/main/resources/META-INF/spring.factories
@@ -1,6 +1,6 @@
 # Auto Configuration
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-io.opencensus.contrib.spring.sleuth.OpenCensusSleuthAutoConfiguration\
+io.opencensus.contrib.spring.sleuth.v1x.OpenCensusSleuthAutoConfiguration\
 
 # Environment Post Processor
 org.springframework.boot.env.EnvironmentPostProcessor=\
diff --git a/contrib/spring_sleuth/src/test/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpanContextHolderTest.java b/contrib/spring_sleuth_v1x/src/test/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpanContextHolderTest.java
index aaa80b63..997ed4f4 100644
--- a/contrib/spring_sleuth/src/test/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpanContextHolderTest.java
+++ b/contrib/spring_sleuth_v1x/src/test/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpanContextHolderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/contrib/spring_sleuth/src/test/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpanTest.java b/contrib/spring_sleuth_v1x/src/test/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpanTest.java
index b24af583..a4a04f97 100644
--- a/contrib/spring_sleuth/src/test/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthSpanTest.java
+++ b/contrib/spring_sleuth_v1x/src/test/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthSpanTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/contrib/spring_sleuth/src/test/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthTracerTest.java b/contrib/spring_sleuth_v1x/src/test/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthTracerTest.java
index 38172567..924c06ee 100644
--- a/contrib/spring_sleuth/src/test/java/io/opencensus/contrib/spring/sleuth/OpenCensusSleuthTracerTest.java
+++ b/contrib/spring_sleuth_v1x/src/test/java/io/opencensus/contrib/spring/sleuth/v1x/OpenCensusSleuthTracerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opencensus.contrib.spring.sleuth;
+package io.opencensus.contrib.spring.sleuth.v1x;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/settings.gradle b/settings.gradle
index fd3484d1..4a92661e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,7 +23,7 @@ include ":opencensus-contrib-log-correlation-log4j2"
 include ":opencensus-contrib-log-correlation-stackdriver"
 include ":opencensus-contrib-monitored-resource-util"
 include ":opencensus-contrib-spring"
-include ":opencensus-contrib-spring-sleuth"
+include ":opencensus-contrib-spring-sleuth-v1x"
 
 project(':opencensus-api').projectDir = "$rootDir/api" as File
 project(':opencensus-impl-core').projectDir = "$rootDir/impl_core" as File
@@ -44,7 +44,14 @@ project(':opencensus-contrib-log-correlation-stackdriver').projectDir =
 project(':opencensus-contrib-monitored-resource-util').projectDir =
         "$rootDir/contrib/monitored_resource_util" as File
 project(':opencensus-contrib-spring').projectDir = "$rootDir/contrib/spring" as File
-project(':opencensus-contrib-spring-sleuth').projectDir = "$rootDir/contrib/spring_sleuth" as File
+project(':opencensus-contrib-spring-sleuth-v1x').projectDir =
+        "$rootDir/contrib/spring_sleuth_v1x" as File
+project(':opencensus-exporter-stats-signalfx').projectDir =
+        "$rootDir/exporters/stats/signalfx" as File
+project(':opencensus-exporter-stats-stackdriver').projectDir =
+        "$rootDir/exporters/stats/stackdriver" as File
+project(':opencensus-exporter-stats-prometheus').projectDir =
+        "$rootDir/exporters/stats/prometheus" as File
 project(':opencensus-exporter-trace-instana').projectDir =
         "$rootDir/exporters/trace/instana" as File
 project(':opencensus-exporter-trace-logging').projectDir =
@@ -53,9 +60,6 @@ project(':opencensus-exporter-trace-stackdriver').projectDir =
         "$rootDir/exporters/trace/stackdriver" as File
 project(':opencensus-exporter-trace-zipkin').projectDir = "$rootDir/exporters/trace/zipkin" as File
 project(':opencensus-exporter-trace-jaeger').projectDir = "$rootDir/exporters/trace/jaeger" as File
-project(':opencensus-exporter-stats-signalfx').projectDir = "$rootDir/exporters/stats/signalfx" as File
-project(':opencensus-exporter-stats-stackdriver').projectDir = "$rootDir/exporters/stats/stackdriver" as File
-project(':opencensus-exporter-stats-prometheus').projectDir = "$rootDir/exporters/stats/prometheus" as File
 
 
 // Java8 projects only