From c30147b130b17a3fd833db504de929fe4211992b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 6 Apr 2020 11:42:02 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- reference/html/README.html | 9 +++-- reference/html/appendix.html | 5 --- reference/html/index.html | 46 +++++++++++++++++++------ reference/html/intro.html | 9 +++-- reference/html/spring-cloud-sleuth.html | 46 +++++++++++++++++++------ 5 files changed, 80 insertions(+), 35 deletions(-) diff --git a/reference/html/README.html b/reference/html/README.html index 9a0d86ded..0c670467d 100644 --- a/reference/html/README.html +++ b/reference/html/README.html @@ -705,8 +705,8 @@ In extreme cases, too much baggage can crash the application, due to exceeding t 
Span initialSpan = this.tracer.nextSpan().name("span").start();
-COUNTRY_CODE.updateValue(initialSpan.context(), "FO");
-bar.updateValue(initialSpan.context(), "2");
+BUSINESS_PROCESS.updateValue(initialSpan.context(), "ALM"); +COUNTRY_CODE.updateValue(initialSpan.context(), "FO");
@@ -753,14 +753,13 @@ The span must be in scope.
The setup
-
Unresolved directive in intro.adoc - include::/opt/jenkins/data/workspace/spring-cloud-jdk11-spring-cloud-sleuth-master-ci/spring-cloud-sleuth-core/src/test/resources/application-baggage.yml[indent=0]
+
Unresolved directive in intro.adoc - include::/opt/jenkins/data/workspace/spring-cloud-sleuth-master-ci/spring-cloud-sleuth-core/src/test/resources/application-baggage.yml[indent=0]
The code
-
Tags.BAGGAGE_FIELD.tag(COUNTRY_CODE, initialSpan);
-Tags.BAGGAGE_FIELD.tag(bar, initialSpan);
+
Tags.BAGGAGE_FIELD.tag(BUSINESS_PROCESS, initialSpan);
diff --git a/reference/html/appendix.html b/reference/html/appendix.html index aab4eac32..0dcc204a1 100644 --- a/reference/html/appendix.html +++ b/reference/html/appendix.html @@ -174,11 +174,6 @@ Also, you can define your own properties.

List of {@link java.util.concurrent.Executor} bean names that should be ignored and not wrapped in a trace representation.

-

spring.sleuth.baggage-keys

- -

List of baggage key names that should be propagated out of process. These keys will be prefixed with baggage before the actual key. This property is set in order to be backward compatible with previous Sleuth versions. @see brave.propagation.ExtraFieldPropagation.FactoryBuilder#addPrefixedFields(String, java.util.Collection)

- -

spring.sleuth.circuitbreaker.enabled

true

Enable Spring Cloud CircuitBreaker instrumentation.

diff --git a/reference/html/index.html b/reference/html/index.html index 76e7380a2..99fef69c1 100644 --- a/reference/html/index.html +++ b/reference/html/index.html @@ -135,7 +135,11 @@ $(globalSwitch);
  • 5. Sampling
    • -
  • 6. Baggage
    • +
  • 6. Baggage + +
  • 7. Instrumentation
  • 8. Span lifecycle
  • 5. Sampling
    • -
  • 6. Baggage
    • +
  • 6. Baggage + +
  • 7. Instrumentation
  • 8. Span lifecycle