From ec3f5e07e680ba32a8288867de437dd9f124439b Mon Sep 17 00:00:00 2001
From: Jason Plumb <jplumb@splunk.com>
Date: Tue, 27 Aug 2024 11:26:15 -0700
Subject: [PATCH] work in progress around 2.x

---
 build.gradle.kts                                              | 2 --
 gradle/libs.versions.toml                                     | 4 ++--
 splunk-otel-android/build.gradle.kts                          | 2 +-
 .../src/main/java/com/splunk/rum/RumInitializer.java          | 1 +
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5719cd90..c97f9fbb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,8 +21,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        // TODO: Remove after android-agent 0.7.0-alpha is released
-        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
     }
     if (findProperty("release") != "true") {
         version = "$version-SNAPSHOT"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bc030007..1e9aa0f3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ opentelemetry-core = "1.41.0"
 opentelemetry-core-alpha = "1.41.0-alpha"
 opentelemetry-inst = "2.6.0"
 opentelemetry-inst-alpha = "2.6.0-alpha"
-opentelemetry-android = "0.7.0-alpha-SNAPSHOT"
+opentelemetry-android = "0.7.0-alpha"
 opentelemetry-semconv = "1.26.0-alpha"
 mockito = "5.13.0"
 junit = "5.11.0"
@@ -20,7 +20,7 @@ opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref
 opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "opentelemetry-core" }
 opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry-core" }
 opentelemetry-api-events = { module = "io.opentelemetry:opentelemetry-api-events", version.ref = "opentelemetry-core-alpha" }
-opentelemetry-android = { module = "io.opentelemetry.android:android-agent", version.ref = "opentelemetry-android" }
+opentelemetry-android-agent = { module = "io.opentelemetry.android:android-agent", version.ref = "opentelemetry-android" }
 opentelemetry-instrumenter-api = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api", version.ref = "opentelemetry-inst" }
 opentelemetry-instrumenter-api-incubator = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator", version.ref = "opentelemetry-inst-alpha" }
 opentelemetry-instrumentation-okhttp = { module = "io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0", version.ref = "opentelemetry-inst-alpha" }
diff --git a/splunk-otel-android/build.gradle.kts b/splunk-otel-android/build.gradle.kts
index 303b3aa6..3c23e6e1 100644
--- a/splunk-otel-android/build.gradle.kts
+++ b/splunk-otel-android/build.gradle.kts
@@ -42,7 +42,7 @@ android {
 dependencies {
     api(platform(libs.opentelemetry.instrumentation.bom))
     api(platform(libs.opentelemetry.bom))
-    api(libs.opentelemetry.android)
+    api(libs.opentelemetry.android.agent)
 
     implementation(libs.opentelemetry.sdk)
     implementation(libs.opentelemetry.instrumentation.okhttp)
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/RumInitializer.java b/splunk-otel-android/src/main/java/com/splunk/rum/RumInitializer.java
index 5f4d473a..96e054d4 100644
--- a/splunk-otel-android/src/main/java/com/splunk/rum/RumInitializer.java
+++ b/splunk-otel-android/src/main/java/com/splunk/rum/RumInitializer.java
@@ -433,6 +433,7 @@ private Supplier<SpanExporter> supplyOtlpExporter() {
                 OtlpHttpSpanExporter.builder()
                         .setEndpoint(endpoint)
                         .addHeader("X-SF-Token", builder.rumAccessToken)
+                        .
                         .build();
     }