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

GH-77 - Upgrade to Spring Boot 3.0.

Browse Source 
Adapt to API changes in Micrometer and Spring Boot's test context loader API now exposing a checked ContextLoadException to signal failures during ApplicationContext bootstraps.
This commit is contained in:
Oliver Drotbohm
2022-11-24 22:31:49 +01:00
parent 065db76547
commit b402f00c77
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-modulith-observability/src/main/java/org/springframework/modulith/observability/ModuleEntryInterceptor.java
View File

@@ -15,7 +15,7 @@
*/
package org.springframework.modulith.observability;
import io.micrometer.tracing.BaggageInScope;
import io.micrometer.tracing.Baggage;
import io.micrometer.tracing.Span;
import io.micrometer.tracing.Tracer;
import io.micrometer.tracing.Tracer.SpanInScope;
@@ -59,7 +59,7 @@ class ModuleEntryInterceptor implements MethodInterceptor {
if (currentSpan != null) {
BaggageInScope currentBaggage = tracer.getBaggage(ModuleTracingBeanPostProcessor.MODULE_BAGGAGE_KEY);
Baggage currentBaggage = tracer.getBaggage(ModuleTracingBeanPostProcessor.MODULE_BAGGAGE_KEY);
if (currentBaggage != null && moduleName.equals(currentBaggage.get())) {
return invocation.proceed();
@@ -76,10 +76,9 @@ class ModuleEntryInterceptor implements MethodInterceptor {
.tag(ModuleTracingBeanPostProcessor.MODULE_BAGGAGE_KEY, moduleName)
.start();
try (
SpanInScope ws = tracer.withSpan(span); //
BaggageInScope baggage = tracer.createBaggage(ModuleTracingBeanPostProcessor.MODULE_BAGGAGE_KEY, moduleName); //
) {
tracer.createBaggage(ModuleTracingBeanPostProcessor.MODULE_BAGGAGE_KEY, moduleName);
try (SpanInScope ws = tracer.withSpan(span)) {
return invocation.proceed();