RUM-3532 fix PR comments

DataDog · Mar 29, 2024 · 764ebdf · 764ebdf
1 parent 140ed18
commit 764ebdf
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt
@@ -34,7 +34,7 @@ import com.datadog.android.rum.model.ErrorEvent
 import com.datadog.android.rum.model.LongTaskEvent
 import com.datadog.android.rum.model.ResourceEvent
 import com.datadog.android.rum.model.ViewEvent
-import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
+import com.datadog.android.rum.tracking.NavigationViewTrackingStrategy
 import com.datadog.android.sample.data.db.LocalDataSource
 import com.datadog.android.sample.data.remote.RemoteDataSource
 import com.datadog.android.sample.picture.CoilImageLoader
@@ -193,12 +193,11 @@ class SampleApplication : Application() {
                 }
             }
             .useViewTrackingStrategy(
-                ActivityViewTrackingStrategy(true)
-//                NavigationViewTrackingStrategy(
-//                    R.id.nav_host_fragment,
-//                    true,
-//                    SampleNavigationPredicate()
-//                )
+                NavigationViewTrackingStrategy(
+                    R.id.nav_host_fragment,
+                    true,
+                    SampleNavigationPredicate()
+                )
             )
             .setTelemetrySampleRate(100f)
             .trackUserInteractions()

diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/webview/DatadogSiteExt.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/webview/DatadogSiteExt.kt
@@ -0,0 +1,35 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.datadog.android.sample.webview
+
+import com.datadog.android.DatadogSite
+import com.datadog.android.sample.BuildConfig
+import timber.log.Timber
+
+internal val BROWSER_SITE: String
+    get() {
+        return try {
+            DatadogSite.valueOf(BuildConfig.DD_SITE_NAME)
+        } catch (e: IllegalArgumentException) {
+            Timber.e("Error setting site to ${BuildConfig.DD_SITE_NAME}")
+            null
+        }.browserSite()
+    }
+
+private fun DatadogSite?.browserSite(): String {
+    return when (this) {
+        DatadogSite.US1,
+        DatadogSite.STAGING,
+        null -> "datadoghq.com"
+
+        DatadogSite.US3 -> "us3.datadoghq.com"
+        DatadogSite.US5 -> "us5.datadoghq.com"
+        DatadogSite.EU1 -> "datadoghq.eu"
+        DatadogSite.AP1 -> "ap1.datadoghq.com"
+        DatadogSite.US1_FED -> "ddog-gov.com"
+    }
+}
diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/webview/WebViewModel.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/webview/WebViewModel.kt
@@ -20,7 +20,7 @@ internal class WebViewModel(
             "https://datadoghq.dev/browser-sdk-test-playground/" +
                 "?client_token=${BuildConfig.DD_CLIENT_TOKEN}" +
                 "&application_id=${BuildConfig.DD_RUM_APPLICATION_ID}" +
-                "&site=datadoghq.com"
+                "&site=${BROWSER_SITE}"
         )
     }
 

diff --git a/sample/kotlin/src/main/res/menu/sr_webview.xml b/sample/kotlin/src/main/res/menu/sr_webview.xml
@@ -16,4 +16,4 @@
             android:title="@string/webview_hide"
             android:id="@+id/webview_hide"
     />
-</menu>
+</menu>