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

Polish "Upgrade to Micrometer Tracing 1.0.10"

Browse Source 
See gh-37345
This commit is contained in:
Stephane Nicoll
2023-09-12 15:10:19 +02:00
parent 11940f8fec
commit 7df79432eb
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BaggagePropagationIntegrationTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.tracing;
import java.util.function.Supplier;
import io.micrometer.tracing.BaggageInScope;
import io.micrometer.tracing.BaggageManager;
import io.micrometer.tracing.Span;
import io.micrometer.tracing.Tracer;
@@ -60,11 +61,16 @@ class BaggagePropagationIntegrationTests {
assertThatTracingContextIsInitialized(autoConfig);
try (Tracer.SpanInScope scope = tracer.withSpan(span.start())) {
BaggageManager baggageManager = context.getBean(BaggageManager.class);
baggageManager.createBaggage(COUNTRY_CODE).set(span.context(), "FO");
baggageManager.createBaggage(BUSINESS_PROCESS).set(span.context(), "ALM");
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
assertThat(MDC.get(BUSINESS_PROCESS)).isEqualTo("ALM");
try (BaggageInScope fo = baggageManager.createBaggage(COUNTRY_CODE)
.set(span.context(), "FO")
.makeCurrent();
BaggageInScope alm = baggageManager.createBaggage(BUSINESS_PROCESS)
.set(span.context(), "ALM")
.makeCurrent()) {
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
assertThat(MDC.get(BUSINESS_PROCESS)).isEqualTo("ALM");
}
}
finally {
span.end();
@@ -84,17 +90,21 @@ class BaggagePropagationIntegrationTests {
Span span = createSpan(tracer);
assertThatTracingContextIsInitialized(autoConfig);
try (Tracer.SpanInScope scope = tracer.withSpan(span.start())) {
context.getBean(BaggageManager.class).createBaggage(COUNTRY_CODE).set(span.context(), "FO");
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
try (BaggageInScope fo = context.getBean(BaggageManager.class)
.createBaggage(COUNTRY_CODE)
.set(span.context(), "FO")
.makeCurrent()) {
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
try (Tracer.SpanInScope scope2 = tracer.withSpan(null)) {
assertThatMdcContainsUnsetTraceId();
assertThat(MDC.get(COUNTRY_CODE)).isNull();
try (Tracer.SpanInScope scope2 = tracer.withSpan(null)) {
assertThatMdcContainsUnsetTraceId();
assertThat(MDC.get(COUNTRY_CODE)).isNull();
}
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
}
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
}
finally {
span.end();