open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BatchSpanProcessor metrics (#4112) 

* ♻️ refactor TracerProviderConfiguration.configureBatchSpanProcessor to have MeterProvider provided to it

* 🐛 set meterProvider on BatchSpanProcessorBuilder

* 👌 chain usage of builder APIs where possible

Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com>

* 🎨 formatting

Co-authored-by: jack-berg <34418638+jack-berg@users.noreply.github.com>
This commit is contained in:
Ryan Dens 2022-01-24 18:27:14 -08:00 committed by GitHub
parent f37b0c59e7
commit 1313265692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfiguration.java
View File

@ -60,14 +60,16 @@ final class TracerProviderConfiguration {
SpanExporterConfiguration.configureSpanExporters(
config, serviceClassLoader, meterProvider, spanExporterCustomizer);
configureSpanProcessors(config, exportersByName)
configureSpanProcessors(config, exportersByName, meterProvider)
.forEach(tracerProviderBuilder::addSpanProcessor);
return tracerProviderBuilder.build();
}
static List<SpanProcessor> configureSpanProcessors(
ConfigProperties config, Map<String, SpanExporter> exportersByName) {
ConfigProperties config,
Map<String, SpanExporter> exportersByName,
MeterProvider meterProvider) {
Map<String, SpanExporter> exportersByNameCopy = new HashMap<>(exportersByName);
List<SpanProcessor> spanProcessors = new ArrayList<>();
@ -78,7 +80,7 @@ final class TracerProviderConfiguration {
if (!exportersByNameCopy.isEmpty()) {
SpanExporter compositeSpanExporter = SpanExporter.composite(exportersByNameCopy.values());
spanProcessors.add(configureBatchSpanProcessor(config, compositeSpanExporter));
spanProcessors.add(configureBatchSpanProcessor(config, compositeSpanExporter, meterProvider));
}
return spanProcessors;
@ -86,8 +88,9 @@ final class TracerProviderConfiguration {
// VisibleForTesting
static BatchSpanProcessor configureBatchSpanProcessor(
ConfigProperties config, SpanExporter exporter) {
BatchSpanProcessorBuilder builder = BatchSpanProcessor.builder(exporter);
ConfigProperties config, SpanExporter exporter, MeterProvider meterProvider) {
BatchSpanProcessorBuilder builder =
BatchSpanProcessor.builder(exporter).setMeterProvider(meterProvider);
Duration scheduleDelay = config.getDuration("otel.bsp.schedule.delay");
if (scheduleDelay != null) {

7
sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java
View File

@ -89,7 +89,8 @@ class TracerProviderConfigurationTest {
@Test
void configureBatchSpanProcessor_empty() {
BatchSpanProcessor processor =
TracerProviderConfiguration.configureBatchSpanProcessor(EMPTY, mockSpanExporter);
TracerProviderConfiguration.configureBatchSpanProcessor(
EMPTY, mockSpanExporter, MeterProvider.noop());
try {
assertThat(processor)
@ -124,7 +125,9 @@ class TracerProviderConfigurationTest {
BatchSpanProcessor processor =
TracerProviderConfiguration.configureBatchSpanProcessor(
DefaultConfigProperties.createForTest(properties), mockSpanExporter);
DefaultConfigProperties.createForTest(properties),
mockSpanExporter,
MeterProvider.noop());
try {
assertThat(processor)

12
sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigurableSpanExporterTest.java
View File

@ -119,7 +119,7 @@ public class ConfigurableSpanExporterTest {
assertThat(
TracerProviderConfiguration.configureSpanProcessors(
properties, ImmutableMap.of(exporterName, exporter)))
properties, ImmutableMap.of(exporterName, exporter), MeterProvider.noop()))
.hasSize(1)
.first()
.isInstanceOf(SimpleSpanProcessor.class);
@ -134,7 +134,7 @@ public class ConfigurableSpanExporterTest {
assertThat(
TracerProviderConfiguration.configureSpanProcessors(
properties, ImmutableMap.of(exporterName, exporter)))
properties, ImmutableMap.of(exporterName, exporter), MeterProvider.noop()))
.hasSize(1)
.first()
.isInstanceOf(BatchSpanProcessor.class);
@ -150,7 +150,9 @@ public class ConfigurableSpanExporterTest {
assertThat(
TracerProviderConfiguration.configureSpanProcessors(
properties, ImmutableMap.of("otlp", otlpExporter, "zipkin", zipkinExporter)))
properties,
ImmutableMap.of("otlp", otlpExporter, "zipkin", zipkinExporter),
MeterProvider.noop()))
.hasSize(1)
.hasAtLeastOneElementOfType(BatchSpanProcessor.class)
.first()
@ -185,7 +187,9 @@ public class ConfigurableSpanExporterTest {
assertThat(
TracerProviderConfiguration.configureSpanProcessors(
properties, ImmutableMap.of("logging", loggingExporter, "zipkin", zipkinExporter)))
properties,
ImmutableMap.of("logging", loggingExporter, "zipkin", zipkinExporter),
MeterProvider.noop()))
.hasSize(2)
.hasAtLeastOneElementOfType(SimpleSpanProcessor.class)
.hasAtLeastOneElementOfType(BatchSpanProcessor.class);