mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.1.x'
Closes gh-38627
This commit is contained in:
commit
4d01d95fbc
@ -31,11 +31,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
|
|||||||
@ConfigurationProperties("management.tracing")
|
@ConfigurationProperties("management.tracing")
|
||||||
public class TracingProperties {
|
public class TracingProperties {
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether auto-configuration of tracing is enabled.
|
|
||||||
*/
|
|
||||||
private boolean enabled = true;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sampling configuration.
|
* Sampling configuration.
|
||||||
*/
|
*/
|
||||||
@ -56,14 +51,6 @@ public class TracingProperties {
|
|||||||
*/
|
*/
|
||||||
private final Brave brave = new Brave();
|
private final Brave brave = new Brave();
|
||||||
|
|
||||||
public boolean isEnabled() {
|
|
||||||
return this.enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setEnabled(boolean enabled) {
|
|
||||||
this.enabled = enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Sampling getSampling() {
|
public Sampling getSampling() {
|
||||||
return this.sampling;
|
return this.sampling;
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ Press the "Show" button to see the details of that trace.
|
|||||||
[[actuator.micrometer-tracing.logging]]
|
[[actuator.micrometer-tracing.logging]]
|
||||||
=== Logging Correlation IDs
|
=== Logging Correlation IDs
|
||||||
Correlation IDs provide a helpful way to link lines in your log files to spans/traces.
|
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.
|
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]`.
|
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]`.
|
||||||
|
Loading…
Reference in New Issue
Block a user