Skip to content

Commit b08f400

Browse files
committed
fix
1 parent 7e389f5 commit b08f400

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ List<Closeable> getCloseables() {
4242
return Collections.unmodifiableList(closeables);
4343
}
4444

45+
@Nullable
4546
public MeterProvider getMeterProvider() {
4647
return meterProvider;
4748
}

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/LogRecordProcessorFactory.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.sdk.extension.incubator.fileconfig;
77

8+
import io.opentelemetry.api.metrics.MeterProvider;
89
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchLogRecordProcessorModel;
910
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordExporterModel;
1011
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.LogRecordProcessorModel;
@@ -52,7 +53,10 @@ public LogRecordProcessor create(
5253
if (batchModel.getScheduleDelay() != null) {
5354
builder.setScheduleDelay(Duration.ofMillis(batchModel.getScheduleDelay()));
5455
}
55-
builder.setMeterProvider(context.getMeterProvider());
56+
MeterProvider meterProvider = context.getMeterProvider();
57+
if (meterProvider != null) {
58+
builder.setMeterProvider(meterProvider);
59+
}
5660

5761
return context.addCloseable(builder.build());
5862
}

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/SpanProcessorFactory.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.sdk.extension.incubator.fileconfig;
77

8+
import io.opentelemetry.api.metrics.MeterProvider;
89
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.BatchSpanProcessorModel;
910
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SimpleSpanProcessorModel;
1011
import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.SpanExporterModel;
@@ -47,7 +48,10 @@ public SpanProcessor create(SpanProcessorModel model, DeclarativeConfigContext c
4748
if (batchModel.getScheduleDelay() != null) {
4849
builder.setScheduleDelay(Duration.ofMillis(batchModel.getScheduleDelay()));
4950
}
50-
builder.setMeterProvider(context.getMeterProvider());
51+
MeterProvider meterProvider = context.getMeterProvider();
52+
if (meterProvider != null) {
53+
builder.setMeterProvider(meterProvider);
54+
}
5155

5256
return context.addCloseable(builder.build());
5357
}

0 commit comments

Comments
 (0)