From 576424a5147f0c2e654599143e906d9b16887da2 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 17 Nov 2015 12:34:31 +0000 Subject: [PATCH] Update to 1.0.0.M3 --- README.adoc | 24 ++++++++++++++----- docs/pom.xml | 2 +- pom.xml | 6 ++--- spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 13 files changed, 32 insertions(+), 20 deletions(-) diff --git a/README.adoc b/README.adoc index e8a7b17e7..c738fa909 100644 --- a/README.adoc +++ b/README.adoc @@ -26,7 +26,7 @@ Spans are started and stopped, and they keep track of their timing information. ---- logging: pattern: - console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}] [%15.15t] %-40.40logger{39}: %m%n' + level: '[trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}] %5p' ---- + (notice the `%X` entries from the MDC). @@ -39,6 +39,8 @@ logging: * If `spring-cloud-sleuth-zipkin` then the app will generate and collect Zipkin-compatible traces (using Brave). By default it sends them via Thrift to a Zipkin collector service on localhost (port 9410). Configure the location of the service using `spring.zipkin.[host,port]`. +* If `spring-cloud-sleuth-stream` then the app will generate and collect traces via Spring Cloud Stream. Your app automatically becomes a producer of tracer messages that are sent over your broker of choice (e.g. RabbitMQ, Apache Kafka, Redis). + == Running the samples 1. Optionally run https://github.com/openzipkin/zipkin[Zipkin], e.g. via docker compose (there's a `docker-compose.yml` in https://github.com/spring-cloud-incubator/spring-cloud-sleuth[Spring Cloud Sleuth], or in https://github.com/openzipkin/docker-zipkin[Docker Zipkin] @@ -109,10 +111,8 @@ https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, rabbit and redis. -NOTE: migration to the Maven wrapper (`./mvnw`) is underway. If you -find a project that doesn't have it yet, raise an issue to get it -added, and build with the command from `.travis.yml` (usually -`mvn install -s .settings.xml`). +NOTE: If all else fails, build with the command from `.travis.yml` (usually +`./mvnw install`). === Documentation @@ -180,6 +180,18 @@ The method getId() is undefined for the type ProxyRouteLocator.ProxyRouteSpec The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteSpec PreDecorationFilter.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 55 Java Problem ---- +==== Importing into Intellij +Spring Cloud projects use annotation processing, particularly Lombok, which requires configuration +or you will encounter compile problems. It also needs a specific version of maven and a profile +enabled. Intellij 14.1+ requires some configuration to ensure these are setup properly. + + 1. Click Preferences, Plugins. *Ensure Lombok is installed* + 2. Click New, Project from Existing Sources, choose your spring-cloud-sleuth directory + 3. Choose Maven, and select Environment Settings. *Ensure you are using Maven 3.3.3* + 4. In the next screen, *Select the profile `spring`* click Next until Finish. + 5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. *Click Enable Annotation Processing* + 6. Click Build, Rebuild Project, and you are ready to go! + ==== Importing into other IDEs Maven is well supported by most Java IDEs. Refer to you vendor documentation. @@ -207,7 +219,7 @@ added after the original pull request but before a merge. * Use the Spring Framework code format conventions. If you use Eclipse you can import formatter settings using the `eclipse-code-formatter.xml` file from the - https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring + https://github.com/spring-cloud/spring-cloud-build/blob/master/spring-cloud-build/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. diff --git a/docs/pom.xml b/docs/pom.xml index 688ba6342..f589e9a5b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 spring-cloud-sleuth-docs diff --git a/pom.xml b/pom.xml index 3c54f3aa9..45f37daf5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 @@ -203,7 +203,7 @@ 3.0.0 - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 1.8.4 1.0-groovy-2.4 diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 9a434aa66..ac932f7ea 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 3e5520cbb..b5036cb4d 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index 74f4669cc..f157d3876 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml index c571a411e..f11d5c4db 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. 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 8e4a9d787..a00f6612f 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 @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml index 81ab18288..1e8d43b09 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 29be0ec13..a9a6959c3 100644 --- a/spring-cloud-sleuth-stream/pom.xml +++ b/spring-cloud-sleuth-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 38e92f145..c55d90fb6 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 89e28b5ec..947ed9e48 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index d8f1c0bd4..9e2d98c60 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M3 .. spring-cloud-starter-zipkin