From fa321310292442cf64863dbf61bae58151376cb9 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 8 Mar 2016 16:32:51 +0100 Subject: [PATCH] Updated docs --- README.adoc | 9 ++++++++- docs/src/main/asciidoc/README.adoc | 2 +- docs/src/main/asciidoc/intro.adoc | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 8df91b1b3..372190e6e 100644 --- a/README.adoc +++ b/README.adoc @@ -128,6 +128,13 @@ filter { } } +=== Adding to the project + +In general if you want to profit only from Spring Cloud Sleuth without the Zipkin integration just add +the *spring-cloud-starter-sleuth* module to your project. + +If you want both Sleuth and Zipkin just add the *spring-cloud-starter-zipkin* dependency. + == Features * Adds trace and span ids to the Slf4J MDC, so you can extract all the logs from a given trace or span in a log aggregator. Example logs: @@ -220,7 +227,7 @@ The UI should look like the screenshot above. == Building -:jdkversion: 1.7 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 1bd9b4874..839512520 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -47,7 +47,7 @@ The UI should look like the screenshot above. == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[] IMPORTANT: There are 2 different versions of language level used in Spring Cloud Sleuth. Java 1.7 is used for main sources and Java 1.8 is used for tests. When importing your project to an IDE please activate the `ide` Maven profile to turn on diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc index 6ec072514..15ff0b563 100644 --- a/docs/src/main/asciidoc/intro.adoc +++ b/docs/src/main/asciidoc/intro.adoc @@ -122,4 +122,11 @@ filter { grok { match => { "message" => "(?m)OUT\s+%{TIMESTAMP_ISO8601:timestamp}\s+%{LOGLEVEL:severity}\s+\[%{DATA:service},%{DATA:trace},%{DATA:span},%{DATA:exportable}\]\s+%{DATA:pid}---\s+\[%{DATA:thread}\]\s+%{DATA:class}\s+:\s+%{GREEDYDATA:rest}" } } -} \ No newline at end of file +} + +=== Adding to the project + +In general if you want to profit only from Spring Cloud Sleuth without the Zipkin integration just add +the *spring-cloud-starter-sleuth* module to your project. + +If you want both Sleuth and Zipkin just add the *spring-cloud-starter-zipkin* dependency. \ No newline at end of file