Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Closes gh-38627
This commit is contained in:
Moritz Halbritter
2023-12-01 14:43:32 +01:00
parent 0321a8a05b 3d4d1e80ca
commit 4d01d95fbc
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/TracingProperties.java
View File

@@ -31,11 +31,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties("management.tracing")
public class TracingProperties {
/**
* Whether auto-configuration of tracing is enabled.
*/
private boolean enabled = true;
/**
* Sampling configuration.
*/
@@ -56,14 +51,6 @@ public class TracingProperties {
*/
private final Brave brave = new Brave();
public boolean isEnabled() {
return this.enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
public Sampling getSampling() {
return this.sampling;
}

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/tracing.adoc
View File

@@ -70,7 +70,7 @@ Press the "Show" button to see the details of that trace.
[[actuator.micrometer-tracing.logging]]
=== Logging Correlation IDs
Correlation IDs provide a helpful way to link lines in your log files to spans/traces.
By default, as long as configprop:management.tracing.enabled[] has not been set to `false`, Spring Boot will include correlation IDs in your logs whenever you are using Micrometer Tracing.
When you are using Micrometer Tracing, Spring Boot will include correlation IDs in your logs.
The default correlation ID is built from `traceId` and `spanId` https://logback.qos.ch/manual/mdc.html[MDC] values.
For example, if Micrometer Tracing has added an MDC `traceId` of `803B448A0489F84084905D3093480352` and an MDC `spanId` of `3425F23BB2432450` the log output will include the correlation ID `[803B448A0489F84084905D3093480352-3425F23BB2432450]`.