Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source
This commit is contained in:
Moritz Halbritter 2024-06-28 12:10:24 +02:00
commit 448089f935
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,23 +62,23 @@ class BaggagePropagationIntegrationTests {
autoConfig.get().run((context) -> { autoConfig.get().run((context) -> {
Tracer tracer = tracer(context); Tracer tracer = tracer(context);
Span span = createSpan(tracer); Span span = createSpan(tracer);
BaggageManager baggageManager = baggageManager(context);
assertThatTracingContextIsInitialized(autoConfig); assertThatTracingContextIsInitialized(autoConfig);
try (Tracer.SpanInScope scope = tracer.withSpan(span.start())) { try (Tracer.SpanInScope scope = tracer.withSpan(span.start())) {
BaggageManager baggageManager = baggageManager(context); assertMdcValue("traceId", span.context().traceId());
try (BaggageInScope fo = baggageManager.createBaggageInScope(span.context(), COUNTRY_CODE, "FO"); try (BaggageInScope fo = baggageManager.createBaggageInScope(span.context(), COUNTRY_CODE, "FO");
BaggageInScope alm = baggageManager.createBaggageInScope(span.context(), BUSINESS_PROCESS, BaggageInScope alm = baggageManager.createBaggageInScope(span.context(), BUSINESS_PROCESS,
"ALM")) { "ALM")) {
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId()); assertMdcValue(COUNTRY_CODE, "FO");
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO"); assertMdcValue(BUSINESS_PROCESS, "ALM");
assertThat(MDC.get(BUSINESS_PROCESS)).isEqualTo("ALM");
} }
} }
finally { finally {
span.end(); span.end();
} }
assertThatMdcContainsUnsetTraceId(autoConfig); assertThatMdcContainsUnsetTraceId(autoConfig);
assertThat(MDC.get(COUNTRY_CODE)).isNull(); assertUnsetMdc(COUNTRY_CODE);
assertThat(MDC.get(BUSINESS_PROCESS)).isNull(); assertUnsetMdc(BUSINESS_PROCESS);
}); });
} }
@ -88,25 +88,25 @@ class BaggagePropagationIntegrationTests {
autoConfig.get().run((context) -> { autoConfig.get().run((context) -> {
Tracer tracer = tracer(context); Tracer tracer = tracer(context);
Span span = createSpan(tracer); Span span = createSpan(tracer);
BaggageManager baggageManager = baggageManager(context);
assertThatTracingContextIsInitialized(autoConfig); assertThatTracingContextIsInitialized(autoConfig);
try (Tracer.SpanInScope scope = tracer.withSpan(span.start())) { try (Tracer.SpanInScope scope = tracer.withSpan(span.start())) {
try (BaggageInScope fo = baggageManager(context).createBaggageInScope(span.context(), COUNTRY_CODE, assertMdcValue("traceId", span.context().traceId());
"FO")) { try (BaggageInScope fo = baggageManager.createBaggageInScope(span.context(), COUNTRY_CODE, "FO")) {
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId()); assertMdcValue(COUNTRY_CODE, "FO");
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO");
try (Tracer.SpanInScope scope2 = tracer.withSpan(null)) { try (Tracer.SpanInScope scope2 = tracer.withSpan(null)) {
assertThatMdcContainsUnsetTraceId(autoConfig); assertThatMdcContainsUnsetTraceId(autoConfig);
assertThat(MDC.get(COUNTRY_CODE)).isNull(); assertUnsetMdc(COUNTRY_CODE);
} }
assertThat(MDC.get("traceId")).isEqualTo(span.context().traceId()); assertMdcValue("traceId", span.context().traceId());
assertThat(MDC.get(COUNTRY_CODE)).isEqualTo("FO"); assertMdcValue(COUNTRY_CODE, "FO");
} }
} }
finally { finally {
span.end(); span.end();
} }
assertThatMdcContainsUnsetTraceId(autoConfig); assertThatMdcContainsUnsetTraceId(autoConfig);
assertThat(MDC.get(COUNTRY_CODE)).isNull(); assertUnsetMdc(COUNTRY_CODE);
}); });
} }
@ -142,6 +142,14 @@ class BaggagePropagationIntegrationTests {
} }
} }
private void assertUnsetMdc(String key) {
assertThat(MDC.get(key)).as("MDC[%s]", key).isNull();
}
private void assertMdcValue(String key, String expected) {
assertThat(MDC.get(key)).as("MDC[%s]", key).isEqualTo(expected);
}
enum AutoConfig implements Supplier<ApplicationContextRunner> { enum AutoConfig implements Supplier<ApplicationContextRunner> {
BRAVE_DEFAULT { BRAVE_DEFAULT {