diff --git a/README.adoc b/README.adoc index 71493d83d..6d0814a03 100644 --- a/README.adoc +++ b/README.adoc @@ -46,7 +46,7 @@ could set `logging.level.org.springframework.web.servlet.DispatcherServlet=DEBUG NOTE: Set `spring.application.name=myService` (for instance) to see the service name as well as the trace and span IDs. -:branch: master +:branch: 2.2.x == Introduction diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc index 34e0fc27b..0919c28d9 100644 --- a/docs/src/main/asciidoc/intro.adoc +++ b/docs/src/main/asciidoc/intro.adoc @@ -1,4 +1,4 @@ -:branch: master +:branch: 2.2.x == Introduction diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 114248188..39bc45aad 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -511,6 +511,7 @@ Doing so forces a new child span on `Tracer.joinSpan()`. `TraceContext.Extractor` is implemented by a `Propagation.Factory` plugin. Internally, this code creates the union type, `TraceContextOrSamplingFlags`, with one of the following: + * `TraceContext` if trace and span IDs were present. * `TraceIdContext` if a trace ID was present but span IDs were not present. * `SamplingFlags` if no identifiers were present. @@ -518,6 +519,7 @@ Internally, this code creates the union type, `TraceContextOrSamplingFlags`, wit Some `Propagation` implementations carry extra data from the point of extraction (for example, reading incoming headers) to injection (for example, writing outgoing headers). For example, it might carry a request ID. When implementations have extra data, they handle it as follows: + * If a `TraceContext` were extracted, add the extra data as `TraceContext.extra()`. * Otherwise, add it as `TraceContextOrSamplingFlags.extra()`, which `Tracer.nextSpan` handles.