Prep 1.2.0 release (#679)

* prep for 1.2.0 release * remove dependabot * update deps * clean up warnings
signalfx · Oct 25, 2023 · c72ba65 · c72ba65
1 parent 4918256
commit c72ba65
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 26 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,18 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
-* tbd
+This is the first version of `splunk-otel-android` that is based on the upstream version of
+`opentelemetry-android`. Please note that this requires an additional project dependency,
+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).
+
+* Depend on upstream [opentelemetry-android](https://github.com/open-telemetry/opentelemetry-android) (#640)
+* Depend on updated java semantic conventions (#658)
+* Feature enhancement: The instrumentation can now be configured to buffer telemetry created when
+  your application is launched in the background. This buffered telemetry is sent when the
+  app is foregrounded, or dropped when a new app session is started. Thanks to @rezastallone
+  for this contribution. (#648)
+* Update to opentelemetry-java sdk [1.31.0](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.31.0)
+* Update to opentelemetry-java-instrumentation [1.31.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.31.0)
 
 ## Version 1.1.1
 

diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
@@ -51,7 +51,7 @@ android {
     }
 }
 
-val otelVersion = "1.30.0-SNAPSHOT"
+val otelVersion = "1.31.0"
 val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 
 dependencies {

diff --git a/splunk-otel-android-volley/build.gradle.kts b/splunk-otel-android-volley/build.gradle.kts
@@ -43,7 +43,7 @@ android {
     }
 }
 
-val otelVersion = "1.30.0-SNAPSHOT"
+val otelVersion = "1.31.0"
 val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 val otelSemconvVersion = "1.21.0-alpha"
 

diff --git a/splunk-otel-android/build.gradle.kts b/splunk-otel-android/build.gradle.kts
@@ -39,7 +39,7 @@ android {
     }
 }
 
-val otelVersion = "1.30.0-SNAPSHOT"
+val otelVersion = "1.31.0"
 val otelAlphaVersion = otelVersion.replaceFirst("(-SNAPSHOT)?$".toRegex(), "-alpha$1")
 val otelSemconvVersion = "1.21.0-alpha"
 

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/DiskToZipkinExporter.java b/splunk-otel-android/src/main/java/com/splunk/rum/DiskToZipkinExporter.java
@@ -43,7 +43,6 @@ class DiskToZipkinExporter {
     private final CurrentNetworkProvider currentNetworkProvider;
     private final FileSender fileSender;
     private final SpanStorage spanStorage;
-    private final FileUtils fileUtils;
     private final BandwidthTracker bandwidthTracker;
     private final double bandwidthLimit;
 
@@ -52,7 +51,6 @@ class DiskToZipkinExporter {
         this.currentNetworkProvider = requireNonNull(builder.currentNetworkProvider);
         this.fileSender = requireNonNull(builder.fileSender);
         this.spanStorage = requireNonNull(builder.spanStorage);
-        this.fileUtils = builder.fileUtils;
         this.bandwidthTracker = requireNonNull(builder.bandwidthTracker);
         this.bandwidthLimit = builder.bandwidthLimit;
     }
@@ -126,7 +124,6 @@ static class Builder {
         private ScheduledExecutorService threadPool = Executors.newSingleThreadScheduledExecutor();
         @Nullable private CurrentNetworkProvider currentNetworkProvider;
         @Nullable private SpanStorage spanStorage;
-        private FileUtils fileUtils = new FileUtils();
         private double bandwidthLimit = DEFAULT_MAX_UNCOMPRESSED_BANDWIDTH;
 
         Builder threadPool(ScheduledExecutorService threadPool) {
@@ -159,11 +156,6 @@ Builder spanFileProvider(SpanStorage spanStorage) {
             return this;
         }
 
-        Builder fileUtils(FileUtils fileUtils) {
-            this.fileUtils = fileUtils;
-            return this;
-        }
-
         DiskToZipkinExporter build() {
             return new DiskToZipkinExporter(this);
         }

diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/SpanStorage.java b/splunk-otel-android/src/main/java/com/splunk/rum/SpanStorage.java
@@ -31,17 +31,17 @@ interface SpanStorage {
     File provideSpansDirectory();
 
     /***
-     * @return all spans including those that can be sent or not
+     * Returns a stream containing all spans, including those that can be sent or not.
      */
     Stream<File> getAllSpanFiles();
 
     /***
-     * @return total size of all span that can be sent or not
+     * Returns the total size of all spans that can be sent or not.
      */
     long getTotalFileSizeInBytes();
 
     /***
-     * @return all spans that can be sent
+     * Returns all spans that can be sent.
      */
     Stream<File> getPendingFiles();
 }
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareMemorySpanBuffer.java b/splunk-otel-android/src/main/java/com/splunk/rum/StartTypeAwareMemorySpanBuffer.java
@@ -31,7 +31,7 @@ public class StartTypeAwareMemorySpanBuffer implements MemorySpanBuffer {
     private final Queue<SpanData> backlog = new ArrayDeque<>();
 
     /**
-     * @backgroundSpanBacklog will never get sent if last visible screen is null until process kill
+     * backgroundSpanBacklog will never get sent if last visible screen is null until process kill.
      */
     private final Queue<SpanData> backgroundSpanBacklog = new ArrayDeque<>();