From b4205cf4c4d1cc147342be78e212a3e74b328f01 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 18 Feb 2020 12:32:09 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/README.html | 3 +-- reference/html/appendix.html | 12 +----------- reference/html/index.html | 3 +-- reference/html/intro.html | 3 +-- reference/html/spring-cloud-sleuth.html | 3 +-- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/reference/html/README.html b/reference/html/README.html index 103724e63..b3d0d1fe9 100644 --- a/reference/html/README.html +++ b/reference/html/README.html @@ -413,8 +413,7 @@ You could see in the list of traces one trace that is red. That appears because Consequently, Sleuth no longer takes care of storing the context but delegates that work to Brave.

-

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on. -However, if you want to use the legacy Sleuth approaches, you can set the spring.sleuth.http.legacy.enabled property to true.

+

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on.

diff --git a/reference/html/appendix.html b/reference/html/appendix.html index e46a94aa6..8d9aac305 100644 --- a/reference/html/appendix.html +++ b/reference/html/appendix.html @@ -192,7 +192,7 @@ Also, you can define your own properties.

spring.sleuth.http.legacy.enabled

false

-

Enables the legacy Sleuth setup.

+

spring.sleuth.integration.enabled

@@ -210,16 +210,6 @@ Also, you can define your own properties.

Enable tracing for WebSockets.

-

spring.sleuth.keys.http.headers

- -

Additional headers that should be added as tags if they exist. If the header value is multi-valued, the tag value will be a comma-separated, single-quoted list.

- - -

spring.sleuth.keys.http.prefix

-

http.

-

Prefix for header names if they are added as tags.

- -

spring.sleuth.local-keys

Same as {@link #propagationKeys} except that this field is not propagated to remote services. @see brave.propagation.ExtraFieldPropagation.FactoryBuilder#addRedactedField(String)

diff --git a/reference/html/index.html b/reference/html/index.html index 652806c10..aed6e5b3c 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -404,8 +404,7 @@ You could see in the list of traces one trace that is red. That appears because Consequently, Sleuth no longer takes care of storing the context but delegates that work to Brave.

-

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on. -However, if you want to use the legacy Sleuth approaches, you can set the spring.sleuth.http.legacy.enabled property to true.

+

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on.

diff --git a/reference/html/intro.html b/reference/html/intro.html index 401726a0b..0b6671e61 100644 --- a/reference/html/intro.html +++ b/reference/html/intro.html @@ -313,8 +313,7 @@ You could see in the list of traces one trace that is red. That appears because Consequently, Sleuth no longer takes care of storing the context but delegates that work to Brave.

-

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on. -However, if you want to use the legacy Sleuth approaches, you can set the spring.sleuth.http.legacy.enabled property to true.

+

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on.

diff --git a/reference/html/spring-cloud-sleuth.html b/reference/html/spring-cloud-sleuth.html index 652806c10..aed6e5b3c 100644 --- a/reference/html/spring-cloud-sleuth.html +++ b/reference/html/spring-cloud-sleuth.html @@ -404,8 +404,7 @@ You could see in the list of traces one trace that is red. That appears because Consequently, Sleuth no longer takes care of storing the context but delegates that work to Brave.

-

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on. -However, if you want to use the legacy Sleuth approaches, you can set the spring.sleuth.http.legacy.enabled property to true.

+

Due to the fact that Sleuth had different naming and tagging conventions than Brave, we decided to follow Brave’s conventions from now on.