From 3664df61eb9b46cf14ade3e8322eea8ac369c6e7 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 16 Jun 2023 14:53:40 +0200 Subject: [PATCH] Polish API of SpanExporters and SpanProcessors --- .../tracing/OpenTelemetryAutoConfiguration.java | 6 +++--- .../boot/actuate/autoconfigure/tracing/SpanExporters.java | 6 +++--- .../boot/actuate/autoconfigure/tracing/SpanProcessors.java | 6 +++--- .../actuate/autoconfigure/tracing/SpanExportersTests.java | 4 ++-- .../actuate/autoconfigure/tracing/SpanProcessorsTests.java | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java index f2ccd0a5a62..e24dfc24473 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java @@ -135,9 +135,9 @@ public class OpenTelemetryAutoConfiguration { BatchSpanProcessor otelSpanProcessor(SpanExporters spanExporters, ObjectProvider spanExportingPredicates, ObjectProvider spanReporters, ObjectProvider spanFilters, ObjectProvider meterProvider) { - BatchSpanProcessorBuilder builder = BatchSpanProcessor.builder( - new CompositeSpanExporter(spanExporters.getList(), spanExportingPredicates.orderedStream().toList(), - spanReporters.orderedStream().toList(), spanFilters.orderedStream().toList())); + BatchSpanProcessorBuilder builder = BatchSpanProcessor + .builder(new CompositeSpanExporter(spanExporters.list(), spanExportingPredicates.orderedStream().toList(), + spanReporters.orderedStream().toList(), spanFilters.orderedStream().toList())); meterProvider.ifAvailable(builder::setMeterProvider); return builder.build(); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExporters.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExporters.java index b6f133e57b7..d718047a9f2 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExporters.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExporters.java @@ -35,16 +35,16 @@ public interface SpanExporters extends Iterable { * Returns the list of {@link SpanExporter span exporters}. * @return the list of span exporters */ - List getList(); + List list(); @Override default Iterator iterator() { - return getList().iterator(); + return list().iterator(); } @Override default Spliterator spliterator() { - return getList().spliterator(); + return list().spliterator(); } /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessors.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessors.java index 3edc77b0de4..183e3bedac5 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessors.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessors.java @@ -35,16 +35,16 @@ public interface SpanProcessors extends Iterable { * Returns the list of {@link SpanProcessor span processors}. * @return the list of span processors */ - List getList(); + List list(); @Override default Iterator iterator() { - return getList().iterator(); + return list().iterator(); } @Override default Spliterator spliterator() { - return getList().spliterator(); + return list().spliterator(); } /** diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExportersTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExportersTests.java index dc883b97186..d15f2d1aceb 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExportersTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanExportersTests.java @@ -37,7 +37,7 @@ class SpanExportersTests { SpanExporter spanExporter2 = mock(SpanExporter.class); SpanExporters spanExporters = SpanExporters.of(List.of(spanExporter1, spanExporter2)); assertThat(spanExporters).containsExactly(spanExporter1, spanExporter2); - assertThat(spanExporters.getList()).containsExactly(spanExporter1, spanExporter2); + assertThat(spanExporters.list()).containsExactly(spanExporter1, spanExporter2); } @Test @@ -46,7 +46,7 @@ class SpanExportersTests { SpanExporter spanExporter2 = mock(SpanExporter.class); SpanExporters spanExporters = SpanExporters.of(spanExporter1, spanExporter2); assertThat(spanExporters).containsExactly(spanExporter1, spanExporter2); - assertThat(spanExporters.getList()).containsExactly(spanExporter1, spanExporter2); + assertThat(spanExporters.list()).containsExactly(spanExporter1, spanExporter2); } } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessorsTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessorsTests.java index f65a3b07ddd..8a5fa76868d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessorsTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/SpanProcessorsTests.java @@ -37,7 +37,7 @@ class SpanProcessorsTests { SpanProcessor spanProcessor2 = mock(SpanProcessor.class); SpanProcessors spanProcessors = SpanProcessors.of(List.of(spanProcessor1, spanProcessor2)); assertThat(spanProcessors).containsExactly(spanProcessor1, spanProcessor2); - assertThat(spanProcessors.getList()).containsExactly(spanProcessor1, spanProcessor2); + assertThat(spanProcessors.list()).containsExactly(spanProcessor1, spanProcessor2); } @Test @@ -46,7 +46,7 @@ class SpanProcessorsTests { SpanProcessor spanProcessor2 = mock(SpanProcessor.class); SpanProcessors spanProcessors = SpanProcessors.of(spanProcessor1, spanProcessor2); assertThat(spanProcessors).containsExactly(spanProcessor1, spanProcessor2); - assertThat(spanProcessors.getList()).containsExactly(spanProcessor1, spanProcessor2); + assertThat(spanProcessors.list()).containsExactly(spanProcessor1, spanProcessor2); } }