Skip to content

Commit c72ba65

Browse files
authored
Prep 1.2.0 release (#679)
* prep for 1.2.0 release * remove dependabot * update deps * clean up warnings
1 parent 4918256 commit c72ba65

File tree

8 files changed

+19
-26
lines changed

8 files changed

+19
-26
lines changed

.github/dependabot.yml

-10
This file was deleted.

CHANGELOG.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## Unreleased
99

10-
* tbd
10+
This is the first version of `splunk-otel-android` that is based on the upstream version of
11+
`opentelemetry-android`. Please note that this requires an additional project dependency,
12+
as [documented here](https://docs.splunk.com/observability/en/gdi/get-data-in/rum/android/install-rum-android.html#install-the-android-agent-as-a-dependency).
13+
14+
* Depend on upstream [opentelemetry-android](https://github.com/open-telemetry/opentelemetry-android) (#640)
15+
* Depend on updated java semantic conventions (#658)
16+
* Feature enhancement: The instrumentation can now be configured to buffer telemetry created when
17+
your application is launched in the background. This buffered telemetry is sent when the
18+
app is foregrounded, or dropped when a new app session is started. Thanks to @rezastallone
19+
for this contribution. (#648)
20+
* Update to opentelemetry-java sdk [1.31.0](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.31.0)
21+
* Update to opentelemetry-java-instrumentation [1.31.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.31.0)
1122

1223
## Version 1.1.1
1324

sample-app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ android {
5151
}
5252
}
5353

54-
val otelVersion = "1.30.0-SNAPSHOT"
54+
val otelVersion = "1.31.0"
5555
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
5656

5757
dependencies {

splunk-otel-android-volley/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
}
4444
}
4545

46-
val otelVersion = "1.30.0-SNAPSHOT"
46+
val otelVersion = "1.31.0"
4747
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
4848
val otelSemconvVersion = "1.21.0-alpha"
4949

splunk-otel-android/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ android {
3939
}
4040
}
4141

42-
val otelVersion = "1.30.0-SNAPSHOT"
42+
val otelVersion = "1.31.0"
4343
val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
4444
val otelSemconvVersion = "1.21.0-alpha"
4545

splunk-otel-android/src/main/java/com/splunk/rum/DiskToZipkinExporter.java

-8
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class DiskToZipkinExporter {
4343
private final CurrentNetworkProvider currentNetworkProvider;
4444
private final FileSender fileSender;
4545
private final SpanStorage spanStorage;
46-
private final FileUtils fileUtils;
4746
private final BandwidthTracker bandwidthTracker;
4847
private final double bandwidthLimit;
4948

@@ -52,7 +51,6 @@ class DiskToZipkinExporter {
5251
this.currentNetworkProvider = requireNonNull(builder.currentNetworkProvider);
5352
this.fileSender = requireNonNull(builder.fileSender);
5453
this.spanStorage = requireNonNull(builder.spanStorage);
55-
this.fileUtils = builder.fileUtils;
5654
this.bandwidthTracker = requireNonNull(builder.bandwidthTracker);
5755
this.bandwidthLimit = builder.bandwidthLimit;
5856
}
@@ -126,7 +124,6 @@ static class Builder {
126124
private ScheduledExecutorService threadPool = Executors.newSingleThreadScheduledExecutor();
127125
@Nullable private CurrentNetworkProvider currentNetworkProvider;
128126
@Nullable private SpanStorage spanStorage;
129-
private FileUtils fileUtils = new FileUtils();
130127
private double bandwidthLimit = DEFAULT_MAX_UNCOMPRESSED_BANDWIDTH;
131128

132129
Builder threadPool(ScheduledExecutorService threadPool) {
@@ -159,11 +156,6 @@ Builder spanFileProvider(SpanStorage spanStorage) {
159156
return this;
160157
}
161158

162-
Builder fileUtils(FileUtils fileUtils) {
163-
this.fileUtils = fileUtils;
164-
return this;
165-
}
166-
167159
DiskToZipkinExporter build() {
168160
return new DiskToZipkinExporter(this);
169161
}

splunk-otel-android/src/main/java/com/splunk/rum/SpanStorage.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ interface SpanStorage {
3131
File provideSpansDirectory();
3232

3333
/***
34-
* @return all spans including those that can be sent or not
34+
* Returns a stream containing all spans, including those that can be sent or not.
3535
*/
3636
Stream<File> getAllSpanFiles();
3737

3838
/***
39-
* @return total size of all span that can be sent or not
39+
* Returns the total size of all spans that can be sent or not.
4040
*/
4141
long getTotalFileSizeInBytes();
4242

4343
/***
44-
* @return all spans that can be sent
44+
* Returns all spans that can be sent.
4545
*/
4646
Stream<File> getPendingFiles();
4747
}

splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareMemorySpanBuffer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class StartTypeAwareMemorySpanBuffer implements MemorySpanBuffer {
3131
private final Queue<SpanData> backlog = new ArrayDeque<>();
3232

3333
/**
34-
* @backgroundSpanBacklog will never get sent if last visible screen is null until process kill
34+
* backgroundSpanBacklog will never get sent if last visible screen is null until process kill.
3535
*/
3636
private final Queue<SpanData> backgroundSpanBacklog = new ArrayDeque<>();
3737

0 commit comments

Comments
 (0)