Skip to content

Commit ef71262

Browse files
committed
Fix
1 parent 16fa0d1 commit ef71262

3 files changed

Lines changed: 15 additions & 7 deletions

File tree

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/LoggerProviderConfiguration.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ static void configureLoggerProvider(
4444
List<Closeable> closeables) {
4545

4646
loggerProviderBuilder.setLogLimits(() -> configureLogLimits(config));
47+
loggerProviderBuilder.setMeterProvider(() -> meterProvider);
4748

4849
Map<String, LogRecordExporter> exportersByName =
4950
configureLogRecordExporters(config, spiHelper, logRecordExporterCustomizer, closeables);
@@ -71,7 +72,10 @@ static List<LogRecordProcessor> configureLogRecordProcessors(
7172
for (String simpleProcessorExporterName : simpleProcessorExporterNames) {
7273
LogRecordExporter exporter = exportersByNameCopy.remove(simpleProcessorExporterName);
7374
if (exporter != null) {
74-
LogRecordProcessor logRecordProcessor = SimpleLogRecordProcessor.create(exporter);
75+
LogRecordProcessor logRecordProcessor =
76+
SimpleLogRecordProcessor.builder(exporter)
77+
.setMeterProvider(() -> meterProvider)
78+
.build();
7579
closeables.add(logRecordProcessor);
7680
logRecordProcessors.add(logRecordProcessor);
7781
}

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
@@ -68,7 +68,11 @@ public LogRecordProcessor create(
6868
simpleModel.getExporter(), "simple log record processor exporter");
6969
LogRecordExporter logRecordExporter =
7070
LogRecordExporterFactory.getInstance().create(exporterModel, context);
71-
return context.addCloseable(SimpleLogRecordProcessor.create(logRecordExporter));
71+
MeterProvider meterProvider = context.getMeterProvider();
72+
return context.addCloseable(
73+
SimpleLogRecordProcessor.builder(logRecordExporter)
74+
.setMeterProvider(() -> meterProvider)
75+
.build());
7276
}
7377

7478
Map.Entry<String, Object> keyValue =

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,17 +325,17 @@ void create_Configured() throws NoSuchFieldException, IllegalAccessException {
325325
// test that the meter provider is wired through to the tracer and logger providers
326326
Field field = SdkMeterProvider.class.getDeclaredField("sharedState");
327327
field.setAccessible(true);
328-
Object sharedState = field.get(sdk.getSdkMeterProvider());
328+
329+
// Lazily initialized
329330
assertThat(sdk)
330331
.extracting("loggerProvider")
331332
.extracting("delegate")
332333
.extracting("sharedState")
333334
.extracting("logRecordProcessor")
334335
.extracting("worker")
335-
.extracting("processedLogsCounter")
336-
.extracting("sdkMeter")
337-
.extracting("meterProviderSharedState")
338-
.isEqualTo(sharedState);
336+
.extracting("logProcessorInstrumentation")
337+
.extracting("processedLogs")
338+
.isNull();
339339

340340
// Lazily initialized
341341
assertThat(sdk)

0 commit comments

Comments
 (0)