Merge pull request #2921 from DataDog/aleksandr-gringauz/feature/app-launch-prs

Umbrella PR for TTID telemetry reporting

Author: aleksandr-gringauz

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogCore.kt

@@ -743,8 +743,5 @@ internal class DatadogCore(
             "SDK core already has \"%s\" listener registered."
 
         internal val CONFIGURATION_TELEMETRY_DELAY_MS = TimeUnit.SECONDS.toMillis(5)
-
-        // fallback for APIs below Android N, see [DefaultAppStartTimeProvider].
-        internal val startupTimeNs: Long = System.nanoTime()
     }
 }

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/time/DefaultAppStartTimeProvider.kt

@@ -10,8 +10,8 @@ import android.annotation.SuppressLint
 import android.os.Build
 import android.os.Process
 import android.os.SystemClock
-import com.datadog.android.core.internal.DatadogCore
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
+import com.datadog.android.rum.DdRumContentProvider
 import java.util.concurrent.TimeUnit
 
 internal class DefaultAppStartTimeProvider(
@@ -25,7 +25,7 @@ internal class DefaultAppStartTimeProvider(
                 val diffMs = SystemClock.elapsedRealtime() - Process.getStartElapsedRealtime()
                 System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(diffMs)
             }
-            else -> DatadogCore.startupTimeNs
+            else -> DdRumContentProvider.createTimeNs
         }
     }
 }

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/time/DefaultAppStartTimeProviderTest.kt

@@ -9,8 +9,8 @@ package com.datadog.android.core.internal.time
 import android.os.Build
 import android.os.Process
 import android.os.SystemClock
-import com.datadog.android.core.internal.DatadogCore
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
+import com.datadog.android.rum.DdRumContentProvider
 import fr.xgouchet.elmyr.annotation.IntForgery
 import fr.xgouchet.elmyr.junit5.ForgeExtension
 import org.assertj.core.api.Assertions.assertThat
@@ -47,13 +47,13 @@ class DefaultAppStartTimeProviderTest {
     }
 
     @Test
-    fun `M return rum load time W appStartTime { Legacy }`(
+    fun `M return content provider load time W appStartTime { Legacy }`(
         @IntForgery(min = Build.VERSION_CODES.M, max = Build.VERSION_CODES.N) apiVersion: Int
     ) {
         // GIVEN
         val mockBuildSdkVersionProvider: BuildSdkVersionProvider = mock()
         whenever(mockBuildSdkVersionProvider.version) doReturn apiVersion
-        val startTimeNs = DatadogCore.startupTimeNs
+        val startTimeNs = DdRumContentProvider.createTimeNs
 
         // WHEN
         val timeProvider = DefaultAppStartTimeProvider(mockBuildSdkVersionProvider)

dd-sdk-android-internal/api/apiSurface

@@ -100,6 +100,13 @@ interface com.datadog.android.internal.time.TimeProvider
   fun getServerOffsetNanos(): Long
   fun getServerOffsetMillis(): Long
 fun ByteArray.toHexString(): String
+interface com.datadog.android.internal.utils.DDCoreSubscription<T: Any>
+  fun addListener(T)
+  fun removeListener(T)
+  fun notifyListeners(T.() -> Unit)
+  val listenersCount: Int
+  companion object 
+    fun <T: Any> create(): DDCoreSubscription<T>
 object com.datadog.android.internal.utils.ImageViewUtils
   fun resolveParentRectAbsPosition(android.view.View, Boolean = true): android.graphics.Rect
   fun calculateClipping(android.graphics.Rect, android.graphics.Rect, Float): android.graphics.Rect
@@ -118,5 +125,15 @@ fun Thread.safeGetThreadId(): Long
 fun Thread.State.asString(): String
 fun Array<StackTraceElement>.loggableStackTrace(): String
 fun Throwable.loggableStackTrace(): String
+class com.datadog.android.rum.DdRumContentProvider : android.content.ContentProvider
+  override fun onCreate(): Boolean
+  override fun query(android.net.Uri, Array<String>?, String?, Array<String>?, String?): android.database.Cursor?
+  override fun getType(android.net.Uri): String?
+  override fun insert(android.net.Uri, android.content.ContentValues?): android.net.Uri?
+  override fun delete(android.net.Uri, String?, Array<String>?): Int
+  override fun update(android.net.Uri, android.content.ContentValues?, String?, Array<String>?): Int
+  companion object 
+    var processImportance: Int
+    val createTimeNs: Long
 annotation com.datadog.tools.annotation.NoOpImplementation
   constructor(Boolean = false)

dd-sdk-android-internal/api/dd-sdk-android-internal.api

@@ -259,6 +259,18 @@ public final class com/datadog/android/internal/utils/ByteArrayExtKt {
 	public static final fun toHexString ([B)Ljava/lang/String;
 }
 
+public abstract interface class com/datadog/android/internal/utils/DDCoreSubscription {
+	public static final field Companion Lcom/datadog/android/internal/utils/DDCoreSubscription$Companion;
+	public abstract fun addListener (Ljava/lang/Object;)V
+	public abstract fun getListenersCount ()I
+	public abstract fun notifyListeners (Lkotlin/jvm/functions/Function1;)V
+	public abstract fun removeListener (Ljava/lang/Object;)V
+}
+
+public final class com/datadog/android/internal/utils/DDCoreSubscription$Companion {
+	public final fun create ()Lcom/datadog/android/internal/utils/DDCoreSubscription;
+}
+
 public final class com/datadog/android/internal/utils/ImageViewUtils {
 	public static final field INSTANCE Lcom/datadog/android/internal/utils/ImageViewUtils;
 	public final fun calculateClipping (Landroid/graphics/Rect;Landroid/graphics/Rect;F)Landroid/graphics/Rect;
@@ -306,6 +318,23 @@ public final class com/datadog/android/internal/utils/ThrowableExtKt {
 	public static final fun loggableStackTrace (Ljava/lang/Throwable;)Ljava/lang/String;
 }
 
+public final class com/datadog/android/rum/DdRumContentProvider : android/content/ContentProvider {
+	public static final field Companion Lcom/datadog/android/rum/DdRumContentProvider$Companion;
+	public fun <init> ()V
+	public fun delete (Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I
+	public fun getType (Landroid/net/Uri;)Ljava/lang/String;
+	public fun insert (Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;
+	public fun onCreate ()Z
+	public fun query (Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
+	public fun update (Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I
+}
+
+public final class com/datadog/android/rum/DdRumContentProvider$Companion {
+	public final fun getCreateTimeNs ()J
+	public final fun getProcessImportance ()I
+	public final fun setProcessImportance (I)V
+}
+
 public abstract interface annotation class com/datadog/tools/annotation/NoOpImplementation : java/lang/annotation/Annotation {
 	public abstract fun publicNoOpImplementation ()Z
 }

dd-sdk-android-internal/build.gradle.kts

@@ -22,6 +22,7 @@ plugins {
     id("com.github.ben-manes.versions")
 
     // Tests
+    id("de.mobilej.unmock")
     id("org.jetbrains.kotlinx.kover")
 
     // Internal Generation
@@ -69,6 +70,7 @@ dependencies {
             )
         }
     }
+    unmock(libs.robolectric)
 }
 
 kotlinConfig(jvmBytecodeTarget = JvmTarget.JVM_11)
@@ -80,3 +82,24 @@ publishingConfig(
     "Internal library to be used by the Datadog SDK modules."
 )
 detektCustomConfig()
+
+unMock {
+    keep("android.os.BaseBundle")
+    keep("android.os.Bundle")
+    keep("android.os.Parcel")
+    keepStartingWith("com.android.internal.util.")
+    keepStartingWith("android.util.")
+    keep("android.content.ComponentName")
+    keep("android.content.ContentProvider")
+    keep("android.content.IContentProvider")
+    keep("android.content.ContentProviderNative")
+    keep("android.net.Uri")
+    keep("android.os.Handler")
+    keep("android.os.IMessenger")
+    keep("android.os.Looper")
+    keep("android.os.Message")
+    keep("android.os.MessageQueue")
+    keep("android.os.SystemProperties")
+    keep("android.view.DisplayEventReceiver")
+    keepStartingWith("org.json")
+}

features/dd-sdk-android-rum/src/main/AndroidManifest.xml renamed to dd-sdk-android-internal/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <application>
 
         <provider
-            android:name=".DdRumContentProvider"
+            android:name="com.datadog.android.rum.DdRumContentProvider"
             android:authorities="${applicationId}.provider.datadog.rum"
             android:exported="false" />
 

dd-sdk-android-internal/src/main/java/com/datadog/android/internal/utils/DDCoreSubscription.kt

@@ -0,0 +1,50 @@
+/*
+ * 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.internal.utils
+
+import java.util.concurrent.CopyOnWriteArraySet
+
+/**
+ * A utility that holds listeners and notifies them. It satisfies the following requirements:
+ * 1. All methods can be called from any thread.
+ * 2. It is possible to call [addListener] and [removeListener] inside a listener callback.
+ * 3. Listeners are notified in the order [addListener] is called on them.
+ */
+@Suppress("UndocumentedPublicFunction", "UndocumentedPublicProperty")
+interface DDCoreSubscription<T : Any> {
+    fun addListener(listener: T)
+
+    fun removeListener(listener: T)
+
+    fun notifyListeners(block: T.() -> Unit)
+
+    val listenersCount: Int
+
+    companion object {
+        fun <T : Any> create(): DDCoreSubscription<T> {
+            return DDCoreSubscriptionImpl()
+        }
+    }
+}
+
+private class DDCoreSubscriptionImpl<T : Any> : DDCoreSubscription<T> {
+    private val listeners = CopyOnWriteArraySet<T>()
+
+    override fun addListener(listener: T) {
+        listeners.add(listener)
+    }
+
+    override fun removeListener(listener: T) {
+        listeners.remove(listener)
+    }
+
+    override fun notifyListeners(block: T.() -> Unit) {
+        listeners.forEach { it.block() }
+    }
+
+    override val listenersCount: Int get() = listeners.size
+}

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/DdRumContentProvider.kt renamed to dd-sdk-android-internal/src/main/java/com/datadog/android/rum/DdRumContentProvider.kt

@@ -64,19 +64,19 @@ class DdRumContentProvider : ContentProvider() {
         return 0
     }
 
-    internal companion object {
+    companion object {
         internal const val DEFAULT_IMPORTANCE: Int =
             ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
-        internal var processImportance = 0
 
-        @Suppress("unused") // Used for instrumented tests
-        @JvmStatic
-        private fun overrideProcessImportance(importance: Int) {
-            Log.w(
-                "DdRumContentProvider",
-                "override processImportance: $processImportance -> $importance"
-            )
-            processImportance = importance
-        }
+        /**
+         * Process importance at the moment of creating [DdRumContentProvider]
+         * Should be set from the outside only in tests.
+         */
+        var processImportance: Int = 0
+
+        /**
+         * fallback for APIs below Android N, see [DefaultAppStartTimeProvider].
+         */
+        val createTimeNs: Long = System.nanoTime()
     }
 }

dd-sdk-android-internal/src/test/java/com/datadog/android/internal/forge/Configurator.kt

@@ -9,11 +9,13 @@ package com.datadog.android.internal.forge
 import com.datadog.android.internal.tests.elmyr.InternalTelemetryErrorLogForgeryFactory
 import com.datadog.tools.unit.forge.BaseConfigurator
 import fr.xgouchet.elmyr.Forge
+import fr.xgouchet.elmyr.jvm.useJvmFactories
 
 internal class Configurator :
     BaseConfigurator() {
     override fun configure(forge: Forge) {
         super.configure(forge)
+        forge.useJvmFactories()
         forge.addFactory(InternalTelemetryErrorLogForgeryFactory())
     }
 }