From 11cff48271d0af35ea52b8b30e78a172efd0006c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 1 Nov 2022 10:56:26 +0000 Subject: [PATCH] Start building against Micrometer Tracing 1.0.0 snapshots See gh-32937 --- .../WavefrontTracingAutoConfiguration.java | 6 ++--- .../BaggagePropagationIntegrationTests.java | 15 +++++-------- ...avefrontTracingAutoConfigurationTests.java | 22 +++++++++---------- .../spring-boot-dependencies/build.gradle | 2 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfiguration.java index 333bec2316..4b86760af2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfiguration.java @@ -24,7 +24,7 @@ import com.wavefront.sdk.common.application.ApplicationTags; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.tracing.reporter.wavefront.SpanMetrics; import io.micrometer.tracing.reporter.wavefront.WavefrontBraveSpanHandler; -import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanHandler; +import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanExporter; import io.micrometer.tracing.reporter.wavefront.WavefrontSpanHandler; import io.opentelemetry.sdk.trace.export.SpanExporter; @@ -129,8 +129,8 @@ public class WavefrontTracingAutoConfiguration { @Bean @ConditionalOnMissingBean - WavefrontOtelSpanHandler wavefrontOtelSpanHandler(WavefrontSpanHandler wavefrontSpanHandler) { - return new WavefrontOtelSpanHandler(wavefrontSpanHandler); + WavefrontOtelSpanExporter wavefrontOtelSpanExporter(WavefrontSpanHandler wavefrontSpanHandler) { + return new WavefrontOtelSpanExporter(wavefrontSpanHandler); } } 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 82ae93d585..24deee892c 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,7 +18,6 @@ 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; @@ -59,11 +58,10 @@ class BaggagePropagationIntegrationTests { Tracer tracer = tracer(context); Span span = createSpan(tracer); assertThatTracingContextIsInitialized(autoConfig); - try (Tracer.SpanInScope scope = tracer.withSpan(span.start()); - BaggageInScope fo = context.getBean(BaggageManager.class).createBaggage(COUNTRY_CODE) - .set(span.context(), "FO"); - BaggageInScope bp = context.getBean(BaggageManager.class).createBaggage(BUSINESS_PROCESS) - .set(span.context(), "ALM")) { + 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"); @@ -85,9 +83,8 @@ class BaggagePropagationIntegrationTests { Tracer tracer = tracer(context); Span span = createSpan(tracer); assertThatTracingContextIsInitialized(autoConfig); - try (Tracer.SpanInScope scope = tracer.withSpan(span.start()); - BaggageInScope fo = context.getBean(BaggageManager.class).createBaggage(COUNTRY_CODE) - .set(span.context(), "FO")) { + 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"); diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfigurationTests.java index 138218c3e0..2999861b24 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfigurationTests.java @@ -22,7 +22,7 @@ import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import io.micrometer.tracing.reporter.wavefront.SpanMetrics; import io.micrometer.tracing.reporter.wavefront.WavefrontBraveSpanHandler; -import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanHandler; +import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanExporter; import io.micrometer.tracing.reporter.wavefront.WavefrontSpanHandler; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ class WavefrontTracingAutoConfigurationTests { assertThat(context).hasSingleBean(WavefrontSpanHandler.class); assertThat(context).hasSingleBean(SpanMetrics.class); assertThat(context).hasSingleBean(WavefrontBraveSpanHandler.class); - assertThat(context).hasSingleBean(WavefrontOtelSpanHandler.class); + assertThat(context).hasSingleBean(WavefrontOtelSpanExporter.class); }); } @@ -63,7 +63,7 @@ class WavefrontTracingAutoConfigurationTests { assertThat(context).doesNotHaveBean(WavefrontSpanHandler.class); assertThat(context).doesNotHaveBean(SpanMetrics.class); assertThat(context).doesNotHaveBean(WavefrontBraveSpanHandler.class); - assertThat(context).doesNotHaveBean(WavefrontOtelSpanHandler.class); + assertThat(context).doesNotHaveBean(WavefrontOtelSpanExporter.class); }); } @@ -74,7 +74,7 @@ class WavefrontTracingAutoConfigurationTests { assertThat(context).doesNotHaveBean(WavefrontSpanHandler.class); assertThat(context).doesNotHaveBean(SpanMetrics.class); assertThat(context).doesNotHaveBean(WavefrontBraveSpanHandler.class); - assertThat(context).doesNotHaveBean(WavefrontOtelSpanHandler.class); + assertThat(context).doesNotHaveBean(WavefrontOtelSpanExporter.class); }); } @@ -86,7 +86,7 @@ class WavefrontTracingAutoConfigurationTests { assertThat(context).doesNotHaveBean(WavefrontSpanHandler.class); assertThat(context).doesNotHaveBean(SpanMetrics.class); assertThat(context).doesNotHaveBean(WavefrontBraveSpanHandler.class); - assertThat(context).doesNotHaveBean(WavefrontOtelSpanHandler.class); + assertThat(context).doesNotHaveBean(WavefrontOtelSpanExporter.class); }); } @@ -107,10 +107,10 @@ class WavefrontTracingAutoConfigurationTests { } @Test - void shouldNotSupplyWavefrontOtelSpanHandlerIfOtelIsMissing() { + void shouldNotSupplyWavefrontOtelSpanExporterIfOtelIsMissing() { this.contextRunner.withClassLoader(new FilteredClassLoader("io.opentelemetry.sdk.trace")) .withUserConfiguration(WavefrontSenderConfiguration.class) - .run((context) -> assertThat(context).doesNotHaveBean(WavefrontOtelSpanHandler.class)); + .run((context) -> assertThat(context).doesNotHaveBean(WavefrontOtelSpanExporter.class)); } @Test @@ -145,8 +145,8 @@ class WavefrontTracingAutoConfigurationTests { assertThat(context).hasSingleBean(SpanMetrics.class); assertThat(context).hasBean("customWavefrontBraveSpanHandler"); assertThat(context).hasSingleBean(WavefrontBraveSpanHandler.class); - assertThat(context).hasBean("customWavefrontOtelSpanHandler"); - assertThat(context).hasSingleBean(WavefrontOtelSpanHandler.class); + assertThat(context).hasBean("customWavefrontOtelSpanExporter"); + assertThat(context).hasSingleBean(WavefrontOtelSpanExporter.class); }); } @@ -174,8 +174,8 @@ class WavefrontTracingAutoConfigurationTests { } @Bean - WavefrontOtelSpanHandler customWavefrontOtelSpanHandler() { - return mock(WavefrontOtelSpanHandler.class); + WavefrontOtelSpanExporter customWavefrontOtelSpanExporter() { + return mock(WavefrontOtelSpanExporter.class); } } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 240a6e3166..3e4c2c9945 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1038,7 +1038,7 @@ bom { ] } } - library("Micrometer Tracing", "1.0.0-RC1") { + library("Micrometer Tracing", "1.0.0-SNAPSHOT") { group("io.micrometer") { imports = [ "micrometer-tracing-bom"