|
25 | 25 | import io.opentelemetry.android.internal.features.networkattrs.NetworkAttributesLogRecordAppender; |
26 | 26 | import io.opentelemetry.android.internal.features.networkattrs.NetworkAttributesSpanAppender; |
27 | 27 | import io.opentelemetry.android.internal.features.persistence.DiskManager; |
28 | | -import io.opentelemetry.android.internal.features.persistence.SimpleTemporaryFileProvider; |
29 | 28 | import io.opentelemetry.android.internal.initialization.InitializationEvents; |
30 | 29 | import io.opentelemetry.android.internal.processors.GlobalAttributesLogRecordAppender; |
31 | 30 | import io.opentelemetry.android.internal.processors.ScreenAttributesLogRecordProcessor; |
|
46 | 45 | import io.opentelemetry.contrib.disk.buffering.SpanFromDiskExporter; |
47 | 46 | import io.opentelemetry.contrib.disk.buffering.SpanToDiskExporter; |
48 | 47 | import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration; |
| 48 | +import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage; |
| 49 | +import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes; |
49 | 50 | import io.opentelemetry.exporter.logging.LoggingMetricExporter; |
50 | 51 | import io.opentelemetry.exporter.logging.LoggingSpanExporter; |
51 | 52 | import io.opentelemetry.exporter.logging.SystemOutLogRecordExporter; |
@@ -363,23 +364,32 @@ private void initializeExporters( |
363 | 364 | if (diskBufferingConfig.getEnabled()) { |
364 | 365 | try { |
365 | 366 | StorageConfiguration storageConfiguration = createStorageConfiguration(services); |
| 367 | + Storage spanStorage = |
| 368 | + Storage.builder(SignalTypes.spans) |
| 369 | + .setStorageConfiguration(storageConfiguration) |
| 370 | + .build(); |
| 371 | + Storage logsStorage = |
| 372 | + Storage.builder(SignalTypes.logs) |
| 373 | + .setStorageConfiguration(storageConfiguration) |
| 374 | + .build(); |
| 375 | + Storage metricsStorage = |
| 376 | + Storage.builder(SignalTypes.metrics) |
| 377 | + .setStorageConfiguration(storageConfiguration) |
| 378 | + .build(); |
366 | 379 | final SpanExporter originalSpanExporter = spanExporter; |
367 | | - spanExporter = |
368 | | - SpanToDiskExporter.create(originalSpanExporter, storageConfiguration); |
| 380 | + spanExporter = SpanToDiskExporter.create(originalSpanExporter, spanStorage); |
369 | 381 | final LogRecordExporter originalLogsExporter = logsExporter; |
370 | | - logsExporter = |
371 | | - LogRecordToDiskExporter.create(originalLogsExporter, storageConfiguration); |
| 382 | + logsExporter = LogRecordToDiskExporter.create(originalLogsExporter, logsStorage); |
372 | 383 | final MetricExporter originalMetricExporter = metricExporter; |
373 | 384 | metricExporter = |
374 | | - MetricToDiskExporter.create(originalMetricExporter, storageConfiguration); |
| 385 | + MetricToDiskExporter.create(originalMetricExporter, metricsStorage); |
375 | 386 | signalFromDiskExporter = |
376 | 387 | new SignalFromDiskExporter( |
377 | | - SpanFromDiskExporter.create( |
378 | | - originalSpanExporter, storageConfiguration), |
| 388 | + SpanFromDiskExporter.create(originalSpanExporter, spanStorage), |
379 | 389 | MetricFromDiskExporter.create( |
380 | | - originalMetricExporter, storageConfiguration), |
| 390 | + originalMetricExporter, metricsStorage), |
381 | 391 | LogRecordFromDiskExporter.create( |
382 | | - originalLogsExporter, storageConfiguration)); |
| 392 | + originalLogsExporter, logsStorage)); |
383 | 393 | } catch (IOException e) { |
384 | 394 | Log.e(RumConstants.OTEL_RUM_LOG_TAG, "Could not initialize disk exporters.", e); |
385 | 395 | } |
@@ -418,8 +428,6 @@ private StorageConfiguration createStorageConfiguration(Services services) throw |
418 | 428 | .setMaxFileAgeForWriteMillis(config.getMaxFileAgeForWriteMillis()) |
419 | 429 | .setMaxFileAgeForReadMillis(config.getMaxFileAgeForReadMillis()) |
420 | 430 | .setMinFileAgeForReadMillis(config.getMinFileAgeForReadMillis()) |
421 | | - .setTemporaryFileProvider( |
422 | | - new SimpleTemporaryFileProvider(diskManager.getTemporaryDir())) |
423 | 431 | .setDebugEnabled(config.getDebugEnabled()) |
424 | 432 | .build(); |
425 | 433 | } |
|
0 commit comments