Update Compose Instrumentation functions references

Author: ambushwork

dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/kcp/DefaultPluginContextUtils.kt

@@ -129,15 +129,15 @@ internal class DefaultPluginContextUtils(
         private const val MODIFIER_COMPANION_NAME = "Modifier.Companion"
         private val composableFqName = FqName("androidx.compose.runtime.Composable")
         private val datadogPackageName = FqName("com.datadog.android.compose")
-        private val datadogModifierIdentifier = Name.identifier("datadog")
+        private val datadogModifierIdentifier = Name.identifier("instrumentedDatadog")
         private val composeUiPackageName = FqName("androidx.compose.ui")
         private val modifierClassRelativeName = Name.identifier("Modifier")
         private val modifierThenIdentifier = Name.identifier("then")
         private val navigationPackageName = FqName("androidx.navigation")
         private val navHostControllerIdentifier = Name.identifier("NavHostController")
         private val navHostCallName = FqName("androidx.navigation.compose.NavHost")
         private val datadogTrackEffectPackageName = FqName("com.datadog.android.compose")
-        private val datadogTrackEffectIdentifier = Name.identifier("NavigationViewTrackingEffect")
+        private val datadogTrackEffectIdentifier = Name.identifier("InstrumentedNavigationViewTrackingEffect")
         private val kotlinPackageName = FqName("kotlin")
         private val applyFunctionIdentifier = Name.identifier("apply")
         private val foundationPackageName = FqName("androidx.compose.foundation")

dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/kcp/KotlinCompilerTest.kt

@@ -121,7 +121,7 @@ internal open class KotlinCompilerTest {
             import androidx.compose.ui.semantics.semantics
             import com.datadog.gradle.plugin.kcp.TestCallbackContainer
             
-            fun Modifier.datadog(name: String, isImageRole: Boolean = false): Modifier {
+            fun Modifier.instrumentedDatadog(name: String, isImageRole: Boolean = false): Modifier {
                 TestCallbackContainer.invokeCallback(isImageRole)
                 return this.semantics {
                     this.datadog = name
@@ -150,7 +150,7 @@ internal open class KotlinCompilerTest {
             
             
             @Composable
-            fun NavigationViewTrackingEffect(
+            fun InstrumentedNavigationViewTrackingEffect(
                 navController: NavController
             ) {
                 TestCallbackContainer.invokeCallback()

instrumented/build.gradle.kts

@@ -54,7 +54,8 @@ android {
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         freeCompilerArgs += listOf(
-            "-P", "plugin:com.datadoghq.kotlin.compiler:INSTRUMENTATION_MODE=AUTO"
+            // RUM-9513: This KCP is disabled to API change of SDK, Restore this test after the next release of SDK
+            "-P", "plugin:com.datadoghq.kotlin.compiler:INSTRUMENTATION_MODE=DISABLE"
         )
     }
 }

instrumented/src/androidTest/java/com/datadog/android/instrumented/NavigationTest.kt

@@ -15,6 +15,7 @@ import androidx.navigation.NavHostController
 import androidx.test.platform.app.InstrumentationRegistry
 import fr.xgouchet.elmyr.junit5.ForgeExtension
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -36,6 +37,7 @@ class NavigationTest {
     val composeTestRule = createComposeRule()
 
     @Test
+    @Ignore("RUM-9513: This test will fail due to API change of SDK, Restore this test after the next release of SDK")
     fun `M call function and have original components W instrument with the Plugin`() {
         // Given
         val latch = CountDownLatch(1)
@@ -67,6 +69,7 @@ class NavigationTest {
     }
 
     @Test
+    @Ignore("RUM-9513: This test will fail due to API change of SDK, Restore this test after the next release of SDK")
     fun `M call function and have original components W instrument nested NavHost with the Plugin`() {
         // Given
         val latch = CountDownLatch(1)

samples/lib-module/src/main/kotlin/com/datadog/android/compose/DatadogModifier.kt

@@ -12,7 +12,7 @@ import androidx.compose.ui.semantics.semantics
  * This function should have exactly the same package name, function signature and return type
  * with the production one.
  */
-fun Modifier.datadog(name: String, isImageRole: Boolean = false): Modifier {
+internal fun Modifier.instrumentedDatadog(name: String, isImageRole: Boolean = false): Modifier {
     return this.semantics {
         this.datadog = name
         if (isImageRole) {