Skip to content

Commit 2b31033

Browse files
authored
Diskbuffering configuration package (#1781)
1 parent ed5e5bd commit 2b31033

21 files changed

+23
-15
lines changed

disk-buffering/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The configurable parameters are provided **per exporter**, the available ones ar
2929
considered stale and will be removed when new files are created. No more data will be read from a
3030
file past this time.
3131
* An instance
32-
of [TemporaryFileProvider](src/main/java/io/opentelemetry/contrib/disk/buffering/internal/files/TemporaryFileProvider.java),
32+
of [TemporaryFileProvider](src/main/java/io/opentelemetry/contrib/disk/buffering/config/TemporaryFileProvider.java),
3333
defaults to calling `File.createTempFile`. This provider will be used when reading from the disk
3434
in order create a temporary file from which each line (batch of signals) will be read and
3535
sequentially get removed from the original cache file right after the data has been successfully
@@ -55,7 +55,7 @@ Each wrapper will need the following when instantiating them:
5555
* A File instance of the root directory where all the data is going to be written. The same root dir
5656
can be used for all the wrappers, since each will create their own folder inside it.
5757
* An instance
58-
of [StorageConfiguration](src/main/java/io/opentelemetry/contrib/disk/buffering/StorageConfiguration.java)
58+
of [StorageConfiguration](src/main/java/io/opentelemetry/contrib/disk/buffering/config/StorageConfiguration.java)
5959
with the desired parameters. You can create one with default values by
6060
calling `StorageConfiguration.getDefault()`.
6161

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/LogRecordFromDiskExporter.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
89
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporter;
910
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
1011
import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/LogRecordToDiskExporter.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
89
import io.opentelemetry.contrib.disk.buffering.internal.exporter.ToDiskExporter;
910
import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
1011
import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/MetricFromDiskExporter.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
89
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporter;
910
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
1011
import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/MetricToDiskExporter.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
89
import io.opentelemetry.contrib.disk.buffering.internal.exporter.ToDiskExporter;
910
import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
1011
import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporter.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
89
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporter;
910
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
1011
import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/SpanToDiskExporter.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
89
import io.opentelemetry.contrib.disk.buffering.internal.exporter.ToDiskExporter;
910
import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
1011
import io.opentelemetry.contrib.disk.buffering.internal.utils.SignalTypes;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/StorageConfiguration.java disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/config/StorageConfiguration.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.disk.buffering;
6+
package io.opentelemetry.contrib.disk.buffering.config;
77

88
import com.google.auto.value.AutoValue;
99
import io.opentelemetry.contrib.disk.buffering.internal.files.DefaultTemporaryFileProvider;
10-
import io.opentelemetry.contrib.disk.buffering.internal.files.TemporaryFileProvider;
1110
import java.io.File;
1211
import java.util.concurrent.TimeUnit;
1312

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/files/TemporaryFileProvider.java disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/config/TemporaryFileProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.contrib.disk.buffering.internal.files;
6+
package io.opentelemetry.contrib.disk.buffering.config;
77

88
import java.io.File;
99
import java.io.IOException;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/exporter/FromDiskExporterBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import static java.util.Collections.emptyList;
99

1010
import com.google.errorprone.annotations.CanIgnoreReturnValue;
11-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
11+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1212
import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
1313
import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
1414
import io.opentelemetry.contrib.disk.buffering.internal.storage.StorageBuilder;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/exporter/ToDiskExporterBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.contrib.disk.buffering.internal.exporter;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
9-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
9+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1010
import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
1111
import io.opentelemetry.contrib.disk.buffering.internal.storage.Storage;
1212
import io.opentelemetry.contrib.disk.buffering.internal.storage.StorageBuilder;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/files/DefaultTemporaryFileProvider.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.contrib.disk.buffering.internal.files;
77

8+
import io.opentelemetry.contrib.disk.buffering.config.TemporaryFileProvider;
89
import java.io.File;
910
import java.io.IOException;
1011

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/FolderManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.contrib.disk.buffering.internal.storage.util.ClockBuddy.nowMillis;
99

10-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
10+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1111
import io.opentelemetry.contrib.disk.buffering.internal.storage.files.ReadableFile;
1212
import io.opentelemetry.contrib.disk.buffering.internal.storage.files.WritableFile;
1313
import io.opentelemetry.sdk.common.Clock;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/StorageBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.contrib.disk.buffering.internal.storage;
77

88
import com.google.errorprone.annotations.CanIgnoreReturnValue;
9-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
9+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1010
import io.opentelemetry.sdk.common.Clock;
1111
import java.io.File;
1212
import java.io.IOException;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.contrib.disk.buffering.internal.storage.util.ClockBuddy.nowMillis;
99

10-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
10+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1111
import io.opentelemetry.contrib.disk.buffering.internal.storage.files.reader.DelimitedProtoStreamReader;
1212
import io.opentelemetry.contrib.disk.buffering.internal.storage.files.reader.ProcessResult;
1313
import io.opentelemetry.contrib.disk.buffering.internal.storage.files.reader.ReadResult;

disk-buffering/src/main/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/WritableFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static io.opentelemetry.contrib.disk.buffering.internal.storage.util.ClockBuddy.nowMillis;
99

10-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
10+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1111
import io.opentelemetry.contrib.disk.buffering.internal.storage.responses.WritableResult;
1212
import io.opentelemetry.sdk.common.Clock;
1313
import java.io.File;

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/IntegrationTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import io.opentelemetry.api.metrics.Meter;
1717
import io.opentelemetry.api.trace.Span;
1818
import io.opentelemetry.api.trace.Tracer;
19+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1920
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterBuilder;
2021
import io.opentelemetry.contrib.disk.buffering.internal.exporter.FromDiskExporterImpl;
2122
import io.opentelemetry.contrib.disk.buffering.internal.exporter.ToDiskExporter;

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/SpanFromDiskExporterTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.opentelemetry.api.trace.StatusCode;
2020
import io.opentelemetry.api.trace.TraceFlags;
2121
import io.opentelemetry.api.trace.TraceState;
22+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
2223
import io.opentelemetry.contrib.disk.buffering.internal.files.DefaultTemporaryFileProvider;
2324
import io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.spans.models.SpanDataImpl;
2425
import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/exporter/ToDiskExporterBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static org.assertj.core.api.Assertions.assertThatThrownBy;
99

10-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
10+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
1111
import io.opentelemetry.sdk.trace.data.SpanData;
1212
import java.io.File;
1313
import org.junit.jupiter.api.Test;

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/TestData.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.contrib.disk.buffering.internal.storage;
77

8-
import io.opentelemetry.contrib.disk.buffering.StorageConfiguration;
8+
import io.opentelemetry.contrib.disk.buffering.config.StorageConfiguration;
9+
import io.opentelemetry.contrib.disk.buffering.config.TemporaryFileProvider;
910
import io.opentelemetry.contrib.disk.buffering.internal.files.DefaultTemporaryFileProvider;
10-
import io.opentelemetry.contrib.disk.buffering.internal.files.TemporaryFileProvider;
1111
import java.io.File;
1212

1313
public final class TestData {

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/ReadableFileTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import io.opentelemetry.api.common.Value;
2020
import io.opentelemetry.api.logs.Severity;
21-
import io.opentelemetry.contrib.disk.buffering.internal.files.TemporaryFileProvider;
21+
import io.opentelemetry.contrib.disk.buffering.config.TemporaryFileProvider;
2222
import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.DeserializationException;
2323
import io.opentelemetry.contrib.disk.buffering.internal.serialization.deserializers.SignalDeserializer;
2424
import io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.logs.models.LogRecordDataImpl;

0 commit comments

Comments
 (0)