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

Start building against Micrometer Tracing 1.0.0 snapshots

Browse Source 
See gh-32937
This commit is contained in:
Andy Wilkinson
2022-11-01 10:56:26 +00:00
parent 08154fab46
commit 11cff48271
4 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfiguration.java
View File

@@ -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);
}
}

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

@@ -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");

22
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontTracingAutoConfigurationTests.java
View File

@@ -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);
}
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -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"