Introduce relevant software BOMs to ensure version compatibility (#1196)

Author: surbhiia

app/build.gradle.kts

@@ -63,6 +63,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.instrumentationBomAlpha))
+
     implementation(kotlinStdlibJdk8)
 
     //implementation("com.cisco.android:rum-agent:24.4.10-2246")

app/src/main/java/com/splunk/app/ui/httpurlconnection/HttpURLConnectionFragment.kt

@@ -72,7 +72,7 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      * Demonstrates a successful HttpURLConnection GET request
      */
     fun successfulGet() {
-        executeGet("http://httpbin.org/get")
+        executeGet("https://httpbin.org/get")
         showDoneToast("successfulGet")
     }
 
@@ -82,7 +82,7 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      * to end the span. This test covers OPTIONS and TRACE requests too.
      */
     fun getWithoutInputStream() {
-        executeGet("http://httpbin.org/get", false)
+        executeGet("https://httpbin.org/get", false)
         showDoneToast("getWithoutInputStream")
     }
 
@@ -91,10 +91,10 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      * Helps test proper synchronization is achieved in our callback APIs code.
      */
     fun fourConcurrentGetRequests() {
-        executeGet("http://httpbin.org/get")
-        executeGet("http://google.com")
-        executeGet("http://android.com")
-        executeGet("http://httpbin.org/headers")
+        executeGet("https://httpbin.org/get")
+        executeGet("https://google.com")
+        executeGet("https://android.com")
+        executeGet("https://httpbin.org/headers")
         showDoneToast("fourConcurrentGetRequests")
     }
 
@@ -103,7 +103,7 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      * and thereby requiring the harvester thread to end the span.
      */
     fun sustainedConnection() {
-        executeGet("http://httpbin.org/get", false, false)
+        executeGet("https://httpbin.org/get", false, false)
         showDoneToast("sustainedConnection")
     }
 
@@ -112,7 +112,7 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      * and thereby requiring the harvester thread to end the span.
      */
     fun stalledRequest() {
-        executeGet("http://httpbin.org/get", false, true, true)
+        executeGet("https://httpbin.org/get", false, true, true)
         showDoneToast("stalledRequest")
     }
 
@@ -144,7 +144,7 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      */
     fun unSuccessfulGet() {
         runOnBackgroundThread {
-            val connection = URL("http://httpbin.org/status/404").openConnection() as HttpURLConnection
+            val connection = URL("https://httpbin.org/status/404").openConnection() as HttpURLConnection
             try {
                 val responseCode = connection.responseCode
                 val responseMessage = connection.responseMessage
@@ -166,7 +166,7 @@ class HttpURLConnectionFragment : BaseFragment<FragmentHttpUrlConnectionBinding>
      */
     fun post() {
         runOnBackgroundThread {
-            val connection = URL("http://httpbin.org/post").openConnection() as HttpURLConnection
+            val connection = URL("https://httpbin.org/post").openConnection() as HttpURLConnection
             connection.doOutput = true
             connection.requestMethod = "POST"
             try {

buildSrc/src/main/kotlin/Dependencies.kt

@@ -113,28 +113,22 @@ object Dependencies {
     }
 
     object Otel {
-        private const val otelVersion = "1.47.0"
-        private const val otelSemConvVersion = "1.30.0"
-        private const val otelSemConvAlphaVersion = "$otelSemConvVersion-alpha"
-        private const val otelInstrumentationVersion = "1.32.0"
-        private const val otelInstrumentationAlphaVersion = "$otelInstrumentationVersion-alpha"
-        public const val otelAndroidVersion = "0.10.0-alpha"
-
-        const val api = "io.opentelemetry:opentelemetry-api:$otelVersion"
-        const val context = "io.opentelemetry:opentelemetry-context:$otelVersion"
-        const val sdk = "io.opentelemetry:opentelemetry-sdk:$otelVersion"
-        const val exporterOtlpCommon = "io.opentelemetry:opentelemetry-exporter-otlp-common:$otelVersion"
-        const val exporterOtlp = "io.opentelemetry:opentelemetry-exporter-otlp:$otelVersion"
-        const val semConv = "io.opentelemetry.semconv:opentelemetry-semconv:$otelSemConvVersion"
-        const val semConvIncubating = "io.opentelemetry.semconv:opentelemetry-semconv-incubating:$otelSemConvAlphaVersion"
-
-        const val instrumentationSemConv = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:$otelInstrumentationAlphaVersion"
-        const val instrumentationApi = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:$otelInstrumentationVersion"
-        const val instrumentationOkhttp3 = "io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:$otelInstrumentationAlphaVersion"
-
-        const val androidSession = "io.opentelemetry.android:session:$otelAndroidVersion"
-        const val androidInstrumentation = "io.opentelemetry.android:instrumentation-android-instrumentation:$otelAndroidVersion"
-        const val androidHttpUrlLibrary = "io.opentelemetry.android:instrumentation-httpurlconnection-library:$otelAndroidVersion"
+        private const val oTelInstrumentationBomAlpha = "2.13.3-alpha"
+        const val otelAndroidBomVersion = "0.10.0-alpha"
+
+        const val instrumentationBomAlpha = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$oTelInstrumentationBomAlpha"
+        const val androidBom = "io.opentelemetry.android:opentelemetry-android-bom:$otelAndroidBomVersion"
+
+        const val api = "io.opentelemetry:opentelemetry-api"
+        const val sdk = "io.opentelemetry:opentelemetry-sdk"
+        const val exporterOtlpCommon = "io.opentelemetry:opentelemetry-exporter-otlp-common"
+        const val exporterOtlp = "io.opentelemetry:opentelemetry-exporter-otlp"
+        const val semConv = "io.opentelemetry.semconv:opentelemetry-semconv"
+        const val semConvIncubating = "io.opentelemetry.semconv:opentelemetry-semconv-incubating"
+
+        const val androidSession = "io.opentelemetry.android:session"
+        const val androidInstrumentation = "io.opentelemetry.android:instrumentation-android-instrumentation"
+        const val androidHttpUrlLibrary = "io.opentelemetry.android:instrumentation-httpurlconnection-library"
     }
 
     object AndroidTest {

common/otel/build.gradle.kts

@@ -24,6 +24,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.instrumentationBomAlpha))
+
     compileOnly(Dependencies.Android.annotation)
 
     implementation(project(":common:storage"))

instrumentation/buildtime/plugin/build.gradle.kts

@@ -34,7 +34,7 @@ java {
 tasks.jar {
     manifest {
         attributes(
-            "Implementation-Version" to Dependencies.Otel.otelAndroidVersion
+            "Implementation-Version" to Dependencies.Otel.otelAndroidBomVersion
         )
     }
     metaInf {

instrumentation/runtime/customtracking/build.gradle.kts

@@ -24,6 +24,7 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.instrumentationBomAlpha))
     api(Dependencies.Otel.api)
     implementation(project(":integration:agent:api"))
     implementation(project(":common:otel"))

integration/agent/api/build.gradle.kts

@@ -24,6 +24,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.instrumentationBomAlpha))
+
     api(project(":common:otel"))
     api(project(":integration:agent:module"))
 

integration/agent/internal/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     api(project(":integration:agent:module"))
 
     implementation(project(":common:otel"))

integration/anr/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":integration:agent:internal"))
 
     implementation(Dependencies.Otel.androidInstrumentation)

integration/crash/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":integration:agent:internal"))
 
     implementation(Dependencies.Otel.androidInstrumentation)

integration/interactions/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":common:otel"))
     implementation(project(":integration:agent:internal"))
 

integration/navigation/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":integration:agent:internal"))
     implementation(project(":integration:agent:api"))
     implementation(project(":common:otel"))

integration/networkrequest/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":integration:agent:internal"))
 
     implementation(Dependencies.Otel.androidHttpUrlLibrary)

integration/sessionreplay/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":integration:agent:api"))
     implementation(project(":integration:agent:internal"))
 

integration/startup/build.gradle.kts

@@ -23,6 +23,8 @@ android {
 }
 
 dependencies {
+    api(platform(Dependencies.Otel.androidBom))
+
     implementation(project(":integration:agent:internal"))
     implementation(project(":instrumentation:runtime:startup"))
     implementation(project(":common:otel"))