Skip to content

Commit a8240e4

Browse files
fix(deps): update dependency io.opentelemetry.contrib:opentelemetry-disk-buffering to v1.47.0-alpha (#1042)
* fix(deps): update dependency io.opentelemetry.contrib:opentelemetry-disk-buffering to v1.47.0-alpha * fix broken build after contrib upgrade --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <jplumb@splunk.com>
1 parent 856c743 commit a8240e4

4 files changed

Lines changed: 21 additions & 62 deletions

File tree

core/src/main/java/io/opentelemetry/android/OpenTelemetryRumBuilder.java

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.opentelemetry.android.internal.features.networkattrs.NetworkAttributesLogRecordAppender;
2626
import io.opentelemetry.android.internal.features.networkattrs.NetworkAttributesSpanAppender;
2727
import io.opentelemetry.android.internal.features.persistence.DiskManager;
28-
import io.opentelemetry.android.internal.features.persistence.SimpleTemporaryFileProvider;
2928
import io.opentelemetry.android.internal.initialization.InitializationEvents;
3029
import io.opentelemetry.android.internal.processors.GlobalAttributesLogRecordAppender;
3130
import io.opentelemetry.android.internal.processors.ScreenAttributesLogRecordProcessor;
@@ -46,6 +45,8 @@
4645
import io.opentelemetry.contrib.disk.buffering.SpanFromDiskExporter;
4746
import io.opentelemetry.contrib.disk.buffering.SpanToDiskExporter;
4847
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;
4950
import io.opentelemetry.exporter.logging.LoggingMetricExporter;
5051
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
5152
import io.opentelemetry.exporter.logging.SystemOutLogRecordExporter;
@@ -363,23 +364,32 @@ private void initializeExporters(
363364
if (diskBufferingConfig.getEnabled()) {
364365
try {
365366
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();
366379
final SpanExporter originalSpanExporter = spanExporter;
367-
spanExporter =
368-
SpanToDiskExporter.create(originalSpanExporter, storageConfiguration);
380+
spanExporter = SpanToDiskExporter.create(originalSpanExporter, spanStorage);
369381
final LogRecordExporter originalLogsExporter = logsExporter;
370-
logsExporter =
371-
LogRecordToDiskExporter.create(originalLogsExporter, storageConfiguration);
382+
logsExporter = LogRecordToDiskExporter.create(originalLogsExporter, logsStorage);
372383
final MetricExporter originalMetricExporter = metricExporter;
373384
metricExporter =
374-
MetricToDiskExporter.create(originalMetricExporter, storageConfiguration);
385+
MetricToDiskExporter.create(originalMetricExporter, metricsStorage);
375386
signalFromDiskExporter =
376387
new SignalFromDiskExporter(
377-
SpanFromDiskExporter.create(
378-
originalSpanExporter, storageConfiguration),
388+
SpanFromDiskExporter.create(originalSpanExporter, spanStorage),
379389
MetricFromDiskExporter.create(
380-
originalMetricExporter, storageConfiguration),
390+
originalMetricExporter, metricsStorage),
381391
LogRecordFromDiskExporter.create(
382-
originalLogsExporter, storageConfiguration));
392+
originalLogsExporter, logsStorage));
383393
} catch (IOException e) {
384394
Log.e(RumConstants.OTEL_RUM_LOG_TAG, "Could not initialize disk exporters.", e);
385395
}
@@ -418,8 +428,6 @@ private StorageConfiguration createStorageConfiguration(Services services) throw
418428
.setMaxFileAgeForWriteMillis(config.getMaxFileAgeForWriteMillis())
419429
.setMaxFileAgeForReadMillis(config.getMaxFileAgeForReadMillis())
420430
.setMinFileAgeForReadMillis(config.getMinFileAgeForReadMillis())
421-
.setTemporaryFileProvider(
422-
new SimpleTemporaryFileProvider(diskManager.getTemporaryDir()))
423431
.setDebugEnabled(config.getDebugEnabled())
424432
.build();
425433
}

core/src/main/java/io/opentelemetry/android/internal/features/persistence/SimpleTemporaryFileProvider.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

core/src/test/java/io/opentelemetry/android/internal/features/persistence/SimpleTemporaryFileProviderTest.kt

Lines changed: 0 additions & 32 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ opentelemetry-instrumentation-alpha = "2.17.0-alpha"
33
#opentelemetry-instrumentation = "2.9.0" // alpha bom includes non-alpha bom
44
opentelemetry-semconv = "1.34.0"
55
opentelemetry-semconv-alpha = "1.34.0-alpha"
6-
opentelemetry-contrib = "1.46.0-alpha"
6+
opentelemetry-contrib = "1.47.0-alpha"
77
mockito = "5.18.0"
88
junit = "5.13.3"
99
byteBuddy = "1.17.6"

0 commit comments

Comments
 (0)