root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish API of SpanExporters and SpanProcessors

This commit is contained in:
Moritz Halbritter 2023-06-16 14:53:40 +02:00
parent fe65806582
commit 3664df61eb
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java
View File

@ -135,8 +135,8 @@ public class OpenTelemetryAutoConfiguration {
BatchSpanProcessor otelSpanProcessor(SpanExporters spanExporters, BatchSpanProcessor otelSpanProcessor(SpanExporters spanExporters,
ObjectProvider<SpanExportingPredicate> spanExportingPredicates, ObjectProvider<SpanReporter> spanReporters, ObjectProvider<SpanExportingPredicate> spanExportingPredicates, ObjectProvider<SpanReporter> spanReporters,
ObjectProvider<SpanFilter> spanFilters, ObjectProvider<MeterProvider> meterProvider) { ObjectProvider<SpanFilter> spanFilters, ObjectProvider<MeterProvider> meterProvider) {
BatchSpanProcessorBuilder builder = BatchSpanProcessor.builder( BatchSpanProcessorBuilder builder = BatchSpanProcessor
new CompositeSpanExporter(spanExporters.getList(), spanExportingPredicates.orderedStream().toList(), .builder(new CompositeSpanExporter(spanExporters.list(), spanExportingPredicates.orderedStream().toList(),
spanReporters.orderedStream().toList(), spanFilters.orderedStream().toList())); spanReporters.orderedStream().toList(), spanFilters.orderedStream().toList()));
meterProvider.ifAvailable(builder::setMeterProvider); meterProvider.ifAvailable(builder::setMeterProvider);
return builder.build(); return builder.build();

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

@ -35,16 +35,16 @@ public interface SpanExporters extends Iterable<SpanExporter> {
* Returns the list of {@link SpanExporter span exporters}. * Returns the list of {@link SpanExporter span exporters}.
* @return the list of span exporters * @return the list of span exporters
*/ */
List<SpanExporter> getList(); List<SpanExporter> list();
@Override @Override
default Iterator<SpanExporter> iterator() { default Iterator<SpanExporter> iterator() {
return getList().iterator(); return list().iterator();
} }
@Override @Override
default Spliterator<SpanExporter> spliterator() { default Spliterator<SpanExporter> spliterator() {
return getList().spliterator(); return list().spliterator();
} }
/** /**

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

@ -35,16 +35,16 @@ public interface SpanProcessors extends Iterable<SpanProcessor> {
* Returns the list of {@link SpanProcessor span processors}. * Returns the list of {@link SpanProcessor span processors}.
* @return the list of span processors * @return the list of span processors
*/ */
List<SpanProcessor> getList(); List<SpanProcessor> list();
@Override @Override
default Iterator<SpanProcessor> iterator() { default Iterator<SpanProcessor> iterator() {
return getList().iterator(); return list().iterator();
} }
@Override @Override
default Spliterator<SpanProcessor> spliterator() { default Spliterator<SpanProcessor> spliterator() {
return getList().spliterator(); return list().spliterator();
} }
/** /**

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

@ -37,7 +37,7 @@ class SpanExportersTests {
SpanExporter spanExporter2 = mock(SpanExporter.class); SpanExporter spanExporter2 = mock(SpanExporter.class);
SpanExporters spanExporters = SpanExporters.of(List.of(spanExporter1, spanExporter2)); SpanExporters spanExporters = SpanExporters.of(List.of(spanExporter1, spanExporter2));
assertThat(spanExporters).containsExactly(spanExporter1, spanExporter2); assertThat(spanExporters).containsExactly(spanExporter1, spanExporter2);
assertThat(spanExporters.getList()).containsExactly(spanExporter1, spanExporter2); assertThat(spanExporters.list()).containsExactly(spanExporter1, spanExporter2);
} }
@Test @Test
@ -46,7 +46,7 @@ class SpanExportersTests {
SpanExporter spanExporter2 = mock(SpanExporter.class); SpanExporter spanExporter2 = mock(SpanExporter.class);
SpanExporters spanExporters = SpanExporters.of(spanExporter1, spanExporter2); SpanExporters spanExporters = SpanExporters.of(spanExporter1, spanExporter2);
assertThat(spanExporters).containsExactly(spanExporter1, spanExporter2); assertThat(spanExporters).containsExactly(spanExporter1, spanExporter2);
assertThat(spanExporters.getList()).containsExactly(spanExporter1, spanExporter2); assertThat(spanExporters.list()).containsExactly(spanExporter1, spanExporter2);
} }
} }

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

@ -37,7 +37,7 @@ class SpanProcessorsTests {
SpanProcessor spanProcessor2 = mock(SpanProcessor.class); SpanProcessor spanProcessor2 = mock(SpanProcessor.class);
SpanProcessors spanProcessors = SpanProcessors.of(List.of(spanProcessor1, spanProcessor2)); SpanProcessors spanProcessors = SpanProcessors.of(List.of(spanProcessor1, spanProcessor2));
assertThat(spanProcessors).containsExactly(spanProcessor1, spanProcessor2); assertThat(spanProcessors).containsExactly(spanProcessor1, spanProcessor2);
assertThat(spanProcessors.getList()).containsExactly(spanProcessor1, spanProcessor2); assertThat(spanProcessors.list()).containsExactly(spanProcessor1, spanProcessor2);
} }
@Test @Test
@ -46,7 +46,7 @@ class SpanProcessorsTests {
SpanProcessor spanProcessor2 = mock(SpanProcessor.class); SpanProcessor spanProcessor2 = mock(SpanProcessor.class);
SpanProcessors spanProcessors = SpanProcessors.of(spanProcessor1, spanProcessor2); SpanProcessors spanProcessors = SpanProcessors.of(spanProcessor1, spanProcessor2);
assertThat(spanProcessors).containsExactly(spanProcessor1, spanProcessor2); assertThat(spanProcessors).containsExactly(spanProcessor1, spanProcessor2);
assertThat(spanProcessors.getList()).containsExactly(spanProcessor1, spanProcessor2); assertThat(spanProcessors.list()).containsExactly(spanProcessor1, spanProcessor2);
} }
} }