spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-04 00:09:01 +00:00
Code Issues Projects Releases Wiki Activity

Adapt to changes in micrometer snapshots

Browse Source 
See https://github.com/micrometer-metrics/micrometer/issues/2297

Co-authored-by: Stéphane Nicoll <stephane.nicoll@broadcom.com>
This commit is contained in:
Jonatan Ivanov
2026-08-14 08:16:26 +02:00
committed by Stéphane Nicoll
co-authored by Stéphane Nicoll
parent 3575c12ae5
commit 188860f730
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-micrometer-metrics/src/test/java/org/springframework/boot/micrometer/metrics/autoconfigure/export/otlp/OtlpMetricsExportAutoConfigurationTests.java
+4 -12
View File
@@ -151,10 +151,8 @@ class OtlpMetricsExportAutoConfigurationTests {
@Test
void allowsCustomMetricsSenderToBeUsed() {
this.contextRunner.withUserConfiguration(BaseConfiguration.class, CustomMetricsSenderConfiguration.class)
.run((context) -> {
assertHasCustomMetricsSender(context);
assertThat(context).doesNotHaveBean(OtlpHttpMetricsSender.class);
});
.run((context) -> assertThat(context).hasSingleBean(OtlpMetricsSender.class)
.doesNotHaveBean(OtlpHttpMetricsSender.class));
}
@Test
@@ -169,7 +167,8 @@ class OtlpMetricsExportAutoConfigurationTests {
void allowsCustomMetricsSenderToBeUsedWithVirtualThreads() {
this.contextRunner.withUserConfiguration(BaseConfiguration.class, CustomMetricsSenderConfiguration.class)
.withPropertyValues("spring.threads.virtual.enabled=true")
.run(this::assertHasCustomMetricsSender);
.run((context) -> assertThat(context).hasSingleBean(OtlpMetricsSender.class)
.doesNotHaveBean(OtlpHttpMetricsSender.class));
}
@Test
@@ -274,13 +273,6 @@ class OtlpMetricsExportAutoConfigurationTests {
return (HttpClient) httpClient;
}
private void assertHasCustomMetricsSender(AssertableApplicationContext context) {
assertThat(context).hasSingleBean(OtlpMeterRegistry.class);
OtlpMeterRegistry registry = context.getBean(OtlpMeterRegistry.class);
assertThat(registry).extracting("metricsSender")
.satisfies((sender) -> assertThat(sender).isSameAs(CustomMetricsSenderConfiguration.customMetricsSender));
}
private void assertHasCustomExemplarContextProvider(AssertableApplicationContext context) {
assertThat(context).hasSingleBean(OtlpMeterRegistry.class);
OtlpMeterRegistry registry = context.getBean(OtlpMeterRegistry.class);
module/spring-boot-micrometer-tracing-brave/src/test/java/org/springframework/boot/micrometer/tracing/brave/autoconfigure/OtlpExemplarsAutoConfigurationTests.java
+22 -18
View File
@@ -16,7 +16,10 @@
package org.springframework.boot.micrometer.tracing.brave.autoconfigure;
import java.util.List;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Timer;
import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
import io.micrometer.observation.Observation;
import io.micrometer.observation.Observation.Context;
@@ -24,6 +27,7 @@ import io.micrometer.observation.ObservationRegistry;
import io.micrometer.registry.otlp.ExemplarContextProvider;
import io.micrometer.registry.otlp.OtlpMeterRegistry;
import io.micrometer.registry.otlp.OtlpMetricsSender;
import io.micrometer.registry.otlp.shaded.io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
import io.micrometer.tracing.Tracer;
import io.micrometer.tracing.handler.TracingAwareMeterObservationHandler;
import org.junit.jupiter.api.Test;
@@ -38,6 +42,7 @@ import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
@@ -85,12 +90,15 @@ class OtlpExemplarsAutoConfigurationTests {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
Observation.start("test.observation", observationRegistry).stop();
OtlpMeterRegistry otlpMeterRegistry = context.getBean(OtlpMeterRegistry.class);
TestOtlpMetricsSender metricsSender = context.getBean(TestOtlpMetricsSender.class);
Timer timer = otlpMeterRegistry.get("test.observation").timer();
otlpMeterRegistry.close();
assertThat(metricsSender.getOtlpRequest()).containsOnlyOnce("name: \"test.observation\"")
.containsOnlyOnce("exemplars")
.containsOnlyOnce("span_id")
.containsOnlyOnce("trace_id");
List<DoubleExemplarData> exemplars = ReflectionTestUtils.invokeMethod(timer, "exemplars");
assertThat(exemplars).hasSize(1).first().satisfies((exemplar) -> {
assertThat(exemplar).isNotNull();
assertThat(exemplar.getSpanContext().getSpanId()).isNotEmpty();
assertThat(exemplar.getSpanContext().getTraceId()).isNotEmpty();
});
});
}
@@ -104,12 +112,15 @@ class OtlpExemplarsAutoConfigurationTests {
ObservationRegistry observationRegistry = context.getBean(ObservationRegistry.class);
Observation.start("test.observation", observationRegistry).stop();
OtlpMeterRegistry otlpMeterRegistry = context.getBean(OtlpMeterRegistry.class);
TestOtlpMetricsSender metricsSender = context.getBean(TestOtlpMetricsSender.class);
Timer timer = otlpMeterRegistry.get("test.observation").timer();
otlpMeterRegistry.close();
assertThat(metricsSender.getOtlpRequest()).containsOnlyOnce("name: \"test.observation\"")
.containsOnlyOnce("exemplars")
.containsOnlyOnce("span_id")
.containsOnlyOnce("trace_id");
List<DoubleExemplarData> exemplars = ReflectionTestUtils.invokeMethod(timer, "exemplars");
assertThat(exemplars).hasSize(1).first().satisfies((exemplar) -> {
assertThat(exemplar).isNotNull();
assertThat(exemplar.getSpanContext().getSpanId()).isNotEmpty();
assertThat(exemplar.getSpanContext().getTraceId()).isNotEmpty();
});
});
}
@@ -151,15 +162,8 @@ class OtlpExemplarsAutoConfigurationTests {
static class TestOtlpMetricsSender implements OtlpMetricsSender {
private String request = "";
@Override
public void send(Request request) throws Exception {
this.request = request.toString();
}
String getOtlpRequest() {
return this.request;
public void send(Request ignored) {
}
}