Remove runtime dep on androidx fragment navigiation from modules that don't strictly need it (#961)

* Remove runtime dep on androidx fragment navigiation

* Make ScreenNameExtractor class agnostic

Author: bidetofevil

gradle/libs.versions.toml

@@ -13,11 +13,13 @@ kotlin = "2.1.20"
 androidPlugin = "8.9.2"
 junitKtx = "1.2.1"
 autoService = "1.1.1"
+androidx-navigation = "2.7.7"
 
 [libraries]
 opentelemetry-platform-alpha = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha", version.ref = "opentelemetry-instrumentation-alpha" }
 opentelemetry-platform = { module = "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom" }
-androidx-navigation-fragment = "androidx.navigation:navigation-fragment:2.7.7"
+androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "androidx-navigation"}
+androidx-navigation-runtime-ktx = { group = "androidx.navigation", name = "navigation-runtime-ktx", version.ref = "androidx-navigation" }
 androidx-core = "androidx.core:core:1.16.0"
 androidx-annotation = "androidx.annotation:annotation:1.9.1"
 androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.8.7"

instrumentation/activity/build.gradle.kts

@@ -23,7 +23,6 @@ dependencies {
     implementation(project(":common"))
     implementation(libs.opentelemetry.sdk)
     implementation(libs.androidx.core)
-    implementation(libs.androidx.navigation.fragment)
     implementation(libs.opentelemetry.instrumentation.api)
     testImplementation(libs.robolectric)
 }

instrumentation/common-api/build.gradle.kts

@@ -17,7 +17,6 @@ dependencies {
     implementation(project(":common"))
     api(platform(libs.opentelemetry.platform.alpha))
     api(libs.opentelemetry.api)
-    implementation(libs.androidx.navigation.fragment)
     implementation(libs.opentelemetry.sdk)
     implementation(libs.opentelemetry.instrumentation.api)
 }

instrumentation/common-api/src/main/java/io/opentelemetry/android/instrumentation/common/ScreenNameExtractor.java

@@ -5,26 +5,17 @@
 
 package io.opentelemetry.android.instrumentation.common;
 
-import android.app.Activity;
-import androidx.fragment.app.Fragment;
 import io.opentelemetry.android.instrumentation.annotations.RumScreenName;
 
 public interface ScreenNameExtractor {
 
-    String extract(Activity activity);
-
-    String extract(Fragment fragment);
+    String extract(Object instance);
 
     ScreenNameExtractor DEFAULT =
             new ScreenNameExtractor() {
                 @Override
-                public String extract(Activity activity) {
-                    return useAnnotationOrClassName(activity.getClass());
-                }
-
-                @Override
-                public String extract(Fragment fragment) {
-                    return useAnnotationOrClassName(fragment.getClass());
+                public String extract(Object instance) {
+                    return useAnnotationOrClassName(instance.getClass());
                 }
 
                 private String useAnnotationOrClassName(Class<?> clazz) {

instrumentation/common-api/src/test/java/io/opentelemetry/android/instrumentation/common/ScreenNameExtractorTest.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.android.instrumentation.common
+
+import android.app.Activity
+import android.app.Fragment
+import io.opentelemetry.android.instrumentation.annotations.RumScreenName
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class ScreenNameExtractorTest {
+    @Test
+    fun testActivity() {
+        val activity = Activity()
+        val name = ScreenNameExtractor.DEFAULT.extract(activity)
+        Assertions.assertEquals("Activity", name)
+    }
+
+    @Test
+    fun testFragment() {
+        val fragment = Fragment()
+        val name = ScreenNameExtractor.DEFAULT.extract(fragment)
+        Assertions.assertEquals("Fragment", name)
+    }
+
+    @Test
+    fun testObject() {
+        val obj = Object()
+        val name = ScreenNameExtractor.DEFAULT.extract(obj)
+        Assertions.assertEquals("Object", name)
+    }
+
+    @Test
+    fun testAnnotatedActivity() {
+        val activity: Activity = AnnotatedActivity()
+        val name = ScreenNameExtractor.DEFAULT.extract(activity)
+        Assertions.assertEquals("squarely", name)
+    }
+
+    @Test
+    fun testAnnotatedObject() {
+        val obj = AnnotatedObject()
+        val name = ScreenNameExtractor.DEFAULT.extract(obj)
+        Assertions.assertEquals("woohoo", name)
+    }
+
+    @RumScreenName("bumpity")
+    private class AnnotatedFragment : Fragment()
+
+    @RumScreenName("squarely")
+    private class AnnotatedActivity : Activity()
+
+    @RumScreenName("woohoo")
+    private class AnnotatedObject
+}

instrumentation/common-api/src/test/java/io/opentelemetry/android/instrumentation/common/ScreenNameExtractorTest.kt

@@ -17,10 +17,11 @@ dependencies {
     implementation(project(":common"))
 
     implementation(libs.androidx.core)
-    implementation(libs.androidx.navigation.fragment)
+    implementation(libs.androidx.navigation.runtime.ktx)
     implementation(libs.androidx.lifecycle.process)
     implementation(libs.androidx.preference.ktx)
 
     testImplementation(libs.androidx.test.core)
     testImplementation(libs.robolectric)
+    testImplementation(libs.androidx.navigation.fragment)
 }

services/build.gradle.kts

@@ -10,7 +10,7 @@ import android.app.Application
 import android.os.Build
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.NavHost
 import io.opentelemetry.android.internal.services.visiblescreen.activities.Pre29VisibleScreenLifecycleBinding
 import io.opentelemetry.android.internal.services.visiblescreen.activities.VisibleScreenLifecycleBinding
 import io.opentelemetry.android.internal.services.visiblescreen.fragments.RumFragmentActivityRegisterer
@@ -92,8 +92,8 @@ class VisibleScreenTracker internal constructor(
     }
 
     fun fragmentResumed(fragment: Fragment) {
-        // skip the NavHostFragment since it's never really "visible" by itself.
-        if (fragment is NavHostFragment) {
+        // skip the Fragment if it's a NavHost since it's never really "visible" by itself.
+        if (fragment is NavHost) {
             return
         }
 
@@ -104,8 +104,8 @@ class VisibleScreenTracker internal constructor(
     }
 
     fun fragmentPaused(fragment: Fragment) {
-        // skip the NavHostFragment since it's never really "visible" by itself.
-        if (fragment is NavHostFragment) {
+        // skip the Fragment if it's a NavHost since it's never really "visible" by itself.
+        if (fragment is NavHost) {
             return
         }
         if (fragment is DialogFragment) {