From eef4919a33dc316749df67eb660b26423beafcff Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 9 Mar 2023 17:42:47 +0000 Subject: [PATCH] Start building against Micrometer Tracing 1.1.0-M2 snapshots See gh-34547 Co-Authored-By: Marcin Grzejszczak --- .../BaggagePropagationIntegrationTests.java | 34 +++++++++++-------- .../spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BaggagePropagationIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BaggagePropagationIntegrationTests.java index e98e1083300..a9d2fa63f7c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BaggagePropagationIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BaggagePropagationIntegrationTests.java @@ -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,13 @@ 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.createBaggageInScope(span.context(), COUNTRY_CODE, "FO"); + BaggageInScope alm = baggageManager.createBaggageInScope(span.context(), BUSINESS_PROCESS, + "ALM")) { + 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 +87,20 @@ 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) + .createBaggageInScope(span.context(), COUNTRY_CODE, "FO")) { - 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"); + 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"); + } } finally { span.end(); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 053b86961b1..a0b7f432c5d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -944,7 +944,7 @@ bom { ] } } - library("Micrometer Tracing", "1.1.0-M1") { + library("Micrometer Tracing", "1.1.0-SNAPSHOT") { group("io.micrometer") { imports = [ "micrometer-tracing-bom"