From 756d97d30b8d7cfab825f2631ff5b385d17f1348 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 10 Jun 2022 17:28:56 -0400 Subject: [PATCH] Need to Autoconfigure Observations --- .../observation/ObservationIntegrationTests.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java index 237f6bb6..bd1a5abf 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/configuration/observation/ObservationIntegrationTests.java @@ -19,7 +19,6 @@ package org.springframework.cloud.task.configuration.observation; import java.util.List; import java.util.stream.Collectors; -import brave.handler.SpanHandler; import brave.sampler.Sampler; import brave.test.TestSpanHandler; import io.micrometer.common.KeyValues; @@ -32,9 +31,6 @@ import io.micrometer.tracing.test.simple.SpansAssert; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import zipkin2.Span; -import zipkin2.reporter.Reporter; -import zipkin2.reporter.brave.ZipkinSpanHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationRunner; @@ -46,12 +42,14 @@ import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfigura import org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.configuration.SimpleTaskAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +@AutoConfigureObservability @SpringBootTest(classes = ObservationIntegrationTests.Config.class) class ObservationIntegrationTests { @@ -91,11 +89,6 @@ class ObservationIntegrationTests { return new TestSpanHandler(); } - @Bean - SpanHandler zipkinSpanHandler(Reporter spanReporter) { - return ZipkinSpanHandler.newBuilder(spanReporter).build(); - } - @Bean Sampler sampler() { return Sampler.ALWAYS_SAMPLE;