Merge v1.7.x

.github/renovate.json5

@@ -3,6 +3,7 @@
   "extends": [
     "config:base"
   ],
+  "baseBranches": ["main", "v1.7.x"],
   "packageRules": [
     {
       "matchPackageNames": [
@@ -17,6 +18,15 @@
       // stable version of opentelemetry-instrumentation-bom-alpha so this logic doesn't apply
       "ignoreUnstable": false
     },
+    {
+      // Don't bump to 2.x in the 1.x line
+      "matchUpdateTypes": ["major"],
+      "matchPackagePatterns": [
+        "^io.opentelemetry.instrumentation"
+      ],
+      "matchBaseBranches": ["v1.7.x"],
+      "enabled": false
+    },
     {
       // navigation-fragment 2.7.0 and above require android api 34+, which we are not ready for
       // yet due to android gradle plugin only supporting min 33.

.github/workflows/cla.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/github-action@v2.4.0
+        uses: contributor-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PAT_CLATOOL }}

.github/workflows/gradle-wrapper-validation.yml

@@ -10,8 +10,8 @@ on:
 
 jobs:
   validation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
 
-      - uses: gradle/actions/wrapper-validation@v4.0.0
+      - uses: gradle/actions/wrapper-validation@v4.2.1

.github/workflows/main.yaml

@@ -12,12 +12,12 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
 
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
           java-version: 17

.github/workflows/pr.yaml

@@ -9,25 +9,25 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - name: Set up JDK 17 for running Gradle
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
           java-version: 17
 
       - name: Build and test
         run: touch ./local.properties; ./gradlew check javadoc assemble
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v5.0.7
   check_links:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
       - name: Link Checker
-        uses: lycheeverse/lychee-action@v1.10.0
+        uses: lycheeverse/lychee-action@v2.1.0
         with:
           fail: true
-          lycheeVersion: 0.10.3
+          lycheeVersion: v0.16.1

.lycheeignore

@@ -1,4 +1,5 @@
 https://rum-ingest/
 https://appassets.androidplatform.net/assets/index.html
 https://appassets.androidplatform.net/assets/first.html
-https://appassets.androidplatform.net/assets/second.html
+https://appassets.androidplatform.net/assets/second.html
+https://mvnrepository.com/artifact/com.splunk/splunk-otel-android/latest

CHANGELOG.md

@@ -7,6 +7,20 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Unreleased
 
+### Version 1.7.0 - 2024-08-12
+
+This is a regular maintenance release.
+
+This version depends on these upstream versions:
+
+* opentelemetry-android v0.4.0
+* opentelemetry-instrumentation-api v1.33.5
+* opentelemetry-sdk v1.41.0
+
+Enhancements:
+
+* Disable console exporter from upstream (#894)
+
 ### Version 1.6.0 - 2024-07-10
 
 This is a regular maintenance release.

README.md

@@ -10,24 +10,12 @@
   </strong>
 </p>
 
-<p align="center">
-  <img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
-  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.4">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.32.1-blueviolet?style=for-the-badge">
-  </a>
-  <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.4.0">
-    <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.4.0-blueviolet?style=for-the-badge">
-  </a>
-  <a href="https://github.com/signalfx/splunk-otel-android/releases">
-    <img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/signalfx/splunk-otel-android?include_prereleases&style=for-the-badge">
-  </a>
-  <a href="https://maven-badges.herokuapp.com/maven-central/com.splunk/splunk-otel-android">
-    <img alt="Maven Central" src="https://img.shields.io/maven-central/v/com.splunk/splunk-otel-android?style=for-the-badge">
-  </a>
-  <a href="https://github.com/signalfx/splunk-otel-android/actions/workflows/main.yaml">
-    <img alt="Build Status" src="https://img.shields.io/github/actions/workflow/status/signalfx/splunk-otel-android/main.yaml?branch=main&style=for-the-badge">
-  </a>
-</p>
+![Stable][stable-image]
+[![OpenTelemetry Instrumentation for Java Version][otel-image]][otel-link]
+[![OpenTelemetry Instrumentation for Android Version][android-image]][android-link]
+[![Splunk GDI specification][gdi-image]][gdi-link]
+[![Maven Central][maven-image]][maven-link]
+[![Build Status][build-image]][build-link]
 
 ---
 
@@ -69,3 +57,15 @@ in the official documentation.
 
 The Splunk Android RUM Instrumentation is licensed under the terms of the Apache Software License
 version 2.0. See [the license file](./LICENSE) for more details.
+
+[stable-image]: https://img.shields.io/badge/status-stable-informational?style=for-the-badge
+[otel-image]: https://img.shields.io/badge/otel-1.33.5-blueviolet?style=for-the-badge
+[otel-link]: https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.5
+[android-image]: https://img.shields.io/github/v/release/signalfx/splunk-otel-android?include_prereleases&style=for-the-badge
+[android-link]: https://github.com/signalfx/splunk-otel-android/releases
+[gdi-image]: https://img.shields.io/badge/GDI-1.4.0-blueviolet?style=for-the-badge
+[gdi-link]: https://github.com/signalfx/gdi-specification/releases/tag/v1.4.0
+[maven-image]: https://img.shields.io/maven-central/v/com.splunk/splunk-otel-android?style=for-the-badge
+[maven-link]: https://mvnrepository.com/artifact/com.splunk/splunk-otel-android/latest
+[build-image]: https://img.shields.io/github/actions/workflow/status/signalfx/splunk-otel-android/main.yaml?branch=main&style=for-the-badge
+[build-link]: https://github.com/signalfx/splunk-otel-android/actions/workflows/main.yaml

buildSrc/src/main/kotlin/splunk.android-library-conventions.gradle.kts

@@ -97,6 +97,7 @@ dependencies {
     testImplementation(libs.findLibrary("assertj-core").get())
     testImplementation(libs.findBundle("mocking").get())
     testImplementation(libs.findBundle("junit").get())
+    testRuntimeOnly(libs.findLibrary("junit-platform-launcher").get())
     testImplementation(libs.findLibrary("robolectric").get())
     testImplementation(libs.findLibrary("opentelemetry-sdk-testing").get())
     coreLibraryDesugaring(libs.findLibrary("desugarJdkLibs").get())

buildSrc/src/main/kotlin/splunk.errorprone-conventions.gradle.kts

@@ -21,8 +21,8 @@ if (isAndroidProject) {
 }
 
 dependencies {
-    errorprone("com.uber.nullaway:nullaway:0.11.1")
-    errorprone("com.google.errorprone:error_prone_core:2.30.0")
+    errorprone("com.uber.nullaway:nullaway:0.12.1")
+    errorprone("com.google.errorprone:error_prone_core:2.36.0")
     errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
 }
 

gradle.properties

@@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 
 # generate the BuildConfig class that contains the app version
-version=1.7.0
+version=1.8.0
 group=com.splunk

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-opentelemetry-core = "1.41.0"
-opentelemetry-core-alpha = "1.41.0-alpha"
-opentelemetry-inst = "1.33.5"
-opentelemetry-inst-alpha = "1.33.5-alpha"
+opentelemetry-core = "1.42.1"
+opentelemetry-core-alpha = "1.42.1-alpha"
+opentelemetry-inst = "1.33.6"
+opentelemetry-inst-alpha = "1.33.6-alpha"
 opentelemetry-android = "0.4.0-alpha"
-mockito = "5.12.0"
-junit = "5.10.3"
+mockito = "5.14.2"
+junit = "5.11.3"
 spotless = "6.25.0"
-kotlin = "2.0.0"
-lifecycle-runtime-ktx = "2.8.4"
-activity-compose = "1.9.1"
-compose-bom = "2024.06.00"
+kotlin = "2.1.0"
+lifecycle-runtime-ktx = "2.8.7"
+activity-compose = "1.9.3"
+compose-bom = "2024.11.00"
 navigationCompose = "2.7.7"
 
 [libraries]
@@ -28,14 +28,14 @@ opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporte
 opentelemetry-exporter-logging = { module = "io.opentelemetry:opentelemetry-exporter-logging", version.ref = "opentelemetry-core" }
 opentelemetry-sdk-testing = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "opentelemetry-core" }
 
-zipkin-sender-okhttp = "io.zipkin.reporter2:zipkin-sender-okhttp3:3.4.0"
+zipkin-sender-okhttp = "io.zipkin.reporter2:zipkin-sender-okhttp3:3.4.2"
 
 androidx-browser = "androidx.browser:browser:1.8.0"
-androidx-core = "androidx.core:core:1.13.1"
+androidx-core = "androidx.core:core:1.15.0"
 androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7"
 androidx-navigation-ui = "androidx.navigation:navigation-ui:2.7.7"
-androidx-work = "androidx.work:work-runtime:2.9.1"
-androidx-webkit = "androidx.webkit:webkit:1.11.0"
+androidx-work = "androidx.work:work-runtime:2.10.0"
+androidx-webkit = "androidx.webkit:webkit:1.12.1"
 
 # Volley
 android-volley = "com.android.volley:volley:1.2.1"
@@ -47,16 +47,17 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version = "1.11.3" }
 junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit" }
 mockwebserver = "com.google.mockwebserver:mockwebserver:20130706"
-robolectric = "org.robolectric:robolectric:4.13"
+robolectric = "org.robolectric:robolectric:4.14.1"
 assertj-core = "org.assertj:assertj-core:3.26.3"
 
 #Compilation tools
-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.0.4"
-android-plugin = "com.android.tools.build:gradle:8.5.2"
-errorprone-plugin = "net.ltgt.gradle:gradle-errorprone-plugin:4.0.1"
-nullaway-plugin = "net.ltgt.gradle:gradle-nullaway-plugin:2.0.0"
+desugarJdkLibs = "com.android.tools:desugar_jdk_libs:2.1.3"
+android-plugin = "com.android.tools.build:gradle:8.7.3"
+errorprone-plugin = "net.ltgt.gradle:gradle-errorprone-plugin:4.1.0"
+nullaway-plugin = "net.ltgt.gradle:gradle-nullaway-plugin:2.1.0"
 spotless-plugin = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

sample-app/build.gradle.kts

@@ -13,7 +13,7 @@ localProperties.load(FileInputStream(rootProject.file("local.properties")))
 android {
     namespace = "com.splunk.android.sample"
 
-    compileSdk = 34
+    compileSdk = 35
     buildToolsVersion = "34.0.0"
 
     defaultConfig {
@@ -97,6 +97,7 @@ dependencies {
     implementation(libs.opentelemetry.sdk)
     implementation(libs.opentelemetry.api.incubator)
     testImplementation(libs.bundles.junit)
+    testRuntimeOnly(libs.junit.platform.launcher)
     androidTestImplementation(libs.androidx.test.core)
     androidTestImplementation(libs.androidx.junit)
     debugImplementation(libs.androidx.ui.tooling)

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

@@ -9,7 +9,7 @@ plugins {
 android {
     namespace = "com.splunk.android.rum.volley"
 
-    compileSdk = 34
+    compileSdk = 35
     buildToolsVersion = "34.0.0"
 
     defaultConfig {

splunk-otel-android-volley/src/test/java/com/splunk/rum/TracingHurlStackTest.java

@@ -20,6 +20,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Fail.fail;
+import static org.junit.Assert.assertTrue;
 
 import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.Request;
@@ -168,7 +169,10 @@ public void connectionError() throws IOException {
 
         assertThat(span.getEvents())
                 .hasSize(1)
-                .allSatisfy(e -> e.getName().equals(SemanticAttributes.EXCEPTION_EVENT_NAME));
+                .allSatisfy(
+                        e ->
+                                assertThat(e.getName())
+                                        .isEqualTo(SemanticAttributes.EXCEPTION_EVENT_NAME));
 
         verifyAttributes(span, url, null, null);
     }
@@ -191,7 +195,7 @@ public void reusedRequest() throws IOException, InterruptedException {
         testQueue.addToQueue(stringRequest);
         testQueue.addToQueue(stringRequest);
 
-        testResponseListener.countDownLatch.await(10, TimeUnit.SECONDS);
+        assertTrue(testResponseListener.countDownLatch.await(10, TimeUnit.SECONDS));
 
         assertThat(server.getRequestCount()).isEqualTo(2);
 
@@ -241,16 +245,11 @@ public void concurrency() throws IOException, InterruptedException {
         }
 
         latch.countDown();
-        testResponseListener.countDownLatch.await(10, TimeUnit.SECONDS);
+        assertTrue(testResponseListener.countDownLatch.await(10, TimeUnit.SECONDS));
 
         assertThat(server.getRequestCount()).isEqualTo(50);
 
-        otelTesting
-                .getSpans()
-                .forEach(
-                        span -> {
-                            verifyAttributes(span, url, 200L, "success");
-                        });
+        otelTesting.getSpans().forEach(span -> verifyAttributes(span, url, 200L, "success"));
 
         pool.shutdown();
     }

splunk-otel-android/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 android {
     namespace = "com.splunk.android.rum"
 
-    compileSdk = 34
+    compileSdk = 35
     buildToolsVersion = "34.0.0"
 
     defaultConfig {