Merge branch 'develop' into aleksandr-gringauz/update-docker-image-to-jammy

Author: aleksandr-gringauz

CONTRIBUTING.md

@@ -24,23 +24,28 @@ In addition, to be able to run the static analysis tools locally, you should run
 This project hosts the following modules:
 
   - `dd-sdk-android-core`: the main library implementing the core functionality of SDK (storage and upload of data, core APIs);
+  - `dd-sdk-android-internal`: a library providing internal APIs, classes and utilities shared by the SDK modules;
   - `features/***`: a set of libraries implementing Datadog products: 
     - `features/dd-sdk-android-logs`: a library to send logs to Datadog;
     - `features/dd-sdk-android-rum`: a library to track user navigation and interaction;
     - `features/dd-sdk-android-ndk`: a lightweight library to track crashes from NDK libraries;
     - `features/dd-sdk-android-session-replay`: a library to capture the window content;
+    - `features/dd-sdk-android-session-replay-compose`: an extension for Session Replay to integrate with the Jetpack Compose;
     - `features/dd-sdk-android-session-replay-material`: an extension for Session Replay to integrate with the Material Design library;
-    - `features/dd-sdk-android-session-trace`: a library to measure performance of operations locally;
-    - `features/dd-sdk-android-session-webview`: a library to forward logs and RUM events captured in a webview to be linked with the mobile session;
+    - `features/dd-sdk-android-trace`: a library to measure performance of operations locally;
+    - `features/dd-sdk-android-trace-otel`: an extension of Trace library to integrate with OpenTelemetry;
+    - `features/dd-sdk-android-webview`: a library to forward logs and RUM events captured in a webview to be linked with the mobile session;
   - `integrations/***`: a set of libraries integrating Datadog products in third party libraries:
     - `integrations/dd-sdk-android-coil`: a lightweight library providing a bridge integration between Datadog SDK and [Coil](https://coil-kt.github.io/coil/);
     - `integrations/dd-sdk-android-compose`: a lightweight library providing a bridge integration between Datadog SDK and [Jetpack Compose](https://developer.android.com/jetpack/compose);
     - `integrations/dd-sdk-android-fresco`: a lightweight library providing a bridge integration between Datadog SDK and [Fresco](https://frescolib.org/);
     - `integrations/dd-sdk-android-okhttp`: a lightweight library providing an instrumentation for [OkHttp](https://square.github.io/okhttp/);
+    - `integrations/dd-sdk-android-okhttp-otel`: a lightweight library a support of OpenTelemetry for the [OkHttp](https://square.github.io/okhttp/) instrumentation;
     - `integrations/dd-sdk-android-rx`: a lightweight library providing a bridge integration between Datadog SDK and [RxJava](https://github.com/ReactiveX/RxJava);
     - `integrations/dd-sdk-android-sqldelight`: a lightweight library providing a bridge integration between Datadog SDK and [SQLDelight](https://cashapp.github.io/sqldelight/);
     - `integrations/dd-sdk-android-tv`: a lightweight library providing extensions for [Android TV](https://www.android.com/tv/)
-    - `integrations/dd-sdk-android-ktx`: a set of Kotlin extensions to make the Datadog SDK more Kotlin friendly;
+    - `integrations/dd-sdk-android-trace-coroutines`: a set of extensions for Kotlin Coroutines to ease the work with the Trace library;
+    - `integrations/dd-sdk-android-rum-coroutines`: a set of extensions for Kotlin Coroutines to ease the work with the RUM library;
     - `integrations/dd-sdk-android-glide`: a lightweight library providing a bridge integration between Datadog SDK and [Glide](https://bumptech.github.io/glide/);
     - `integrations/dd-sdk-android-timber`: a lightweight library providing a bridge integration between Datadog SDK and [Timber](https://github.com/JakeWharton/timber);
   - `instrumented/***`: a set of modules used to run instrumented tests:
@@ -52,8 +57,11 @@ This project hosts the following modules:
     - `tools/unit`: a utility library with code to help writing unit tests;
   - `sample/***`: a few sample applications showcasing how to use the library features in production code;
     - `sample/kotlin`: a sample mobile application;
-    - `sample/vendor-lib`: a sample android library, to showcase vendors using Datadog in a host app also using Datadog;
-    - `sample/wear`: a sample watch application;
+    - `sample/vendor-lib`: a sample Android library, to showcase vendors using Datadog in a host app also using Datadog;
+    - `sample/wear`: a sample Wear OS application;
+    - `sample/automotive`: a sample Automotive OS application;
+    - `sample/tv`: a sample Android TV OS application;
+    - `sample/benchmark`: a sample application to collect SDK performance metrics;
 
 ### Building the SDK
 

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/async/RecordedDataQueueHandler.kt

@@ -99,7 +99,6 @@ internal class RecordedDataQueueHandler(
      * for example if a snapshot failed to traverse the tree).
      * If neither of the previous conditions occurs, the loop breaks.
      */
-    @MainThread
     override fun tryToConsumeItems() {
         // no need to create a thread if the queue is empty
         if (recordedDataQueue.isEmpty()) {

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/async/RecordedDataQueueRefs.kt

@@ -6,15 +6,11 @@
 
 package com.datadog.android.sessionreplay.internal.async
 
-import android.os.Handler
-import android.os.Looper
-
 /**
  * References to the work queue context.
  */
 internal data class RecordedDataQueueRefs(
-    private val recordedDataQueueHandler: RecordedDataQueueHandler,
-    private val mainThreadHandler: Handler = Handler(Looper.getMainLooper())
+    private val recordedDataQueueHandler: RecordedDataQueueHandler
 ) {
     // this can only be populated after the snapshot has been created
     internal var recordedDataQueueItem: SnapshotRecordedDataQueueItem? = null
@@ -28,9 +24,6 @@ internal data class RecordedDataQueueRefs(
     }
 
     internal fun tryToConsumeItem() {
-        mainThreadHandler.post {
-            @Suppress("ThreadSafety") // we are in the main thread context
-            recordedDataQueueHandler.tryToConsumeItems()
-        }
+        recordedDataQueueHandler.tryToConsumeItems()
     }
 }

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/processor/NodeFlattener.kt

@@ -19,7 +19,7 @@ internal class NodeFlattener(private val wireframeUtils: WireframeUtils = Wirefr
         stack.push(root)
         while (stack.isNotEmpty()) {
             val node = stack.pop()
-            node.wireframes
+            node.wireframes.toList()
                 .map { wireframe ->
                     val clip = wireframeUtils.resolveWireframeClip(wireframe, node.parents)
                     wireframe.copy(clip = clip)

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/async/RecordedDataQueueRefsTest.kt

@@ -6,7 +6,6 @@
 
 package com.datadog.android.sessionreplay.internal.async
 
-import android.os.Handler
 import com.datadog.android.sessionreplay.forge.ForgeConfigurator
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
 import fr.xgouchet.elmyr.junit5.ForgeExtension
@@ -15,10 +14,8 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.api.extension.Extensions
 import org.mockito.Mock
-import org.mockito.Mockito.`when`
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.junit.jupiter.MockitoSettings
-import org.mockito.kotlin.any
 import org.mockito.kotlin.verify
 import org.mockito.quality.Strictness
 
@@ -37,18 +34,9 @@ internal class RecordedDataQueueRefsTest {
     @Mock
     lateinit var mockRecordedDataQueueItem: SnapshotRecordedDataQueueItem
 
-    @Mock
-    lateinit var mockHandler: Handler
-
     @BeforeEach
     fun setup() {
-        // make mockHandler execute all runnables immediately
-        `when`(mockHandler.post(any())).thenAnswer {
-            (it.arguments[0] as Runnable).run()
-            true
-        }
-
-        testedDataQueueRefs = RecordedDataQueueRefs(mockDataQueueHandler, mockHandler)
+        testedDataQueueRefs = RecordedDataQueueRefs(mockDataQueueHandler)
         testedDataQueueRefs.recordedDataQueueItem = mockRecordedDataQueueItem
     }
 

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/processor/NodeFlattenerTest.kt

@@ -15,6 +15,7 @@ import fr.xgouchet.elmyr.junit5.ForgeExtension
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertDoesNotThrow
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.api.extension.Extensions
 import org.mockito.Mock
@@ -25,7 +26,6 @@ import org.mockito.kotlin.eq
 import org.mockito.kotlin.whenever
 import org.mockito.quality.Strictness
 import java.util.LinkedList
-import kotlin.collections.ArrayList
 import kotlin.math.pow
 
 @Extensions(
@@ -135,10 +135,51 @@ internal class NodeFlattenerTest {
         assertThat(wireframes).isEqualTo(expectedList)
     }
 
+    @Test
+    fun `M not have ConcurrentModificationException W modifying nodes concurrently`(forge: Forge) {
+        // Given
+        val maxWidth = forge.aLong(2, 1000)
+        val maxHeight = forge.aLong(2, 1000)
+        val wireframeSize = forge.anInt(min = 10, max = 100)
+        val expectedList: MutableList<MobileSegment.Wireframe> =
+            Array<MobileSegment.Wireframe>(wireframeSize) {
+                // just to avoid collisions we will add the wireframes manually
+                val width = forge.aLong(min = 1, max = maxWidth)
+                val height = forge.aLong(min = 1, max = maxHeight)
+                val x = it * maxWidth
+                val y = it * maxHeight
+                forge.getForgery<MobileSegment.Wireframe.ShapeWireframe>()
+                    .copy(width = width, height = height, x = x, y = y)
+            }.toMutableList()
+        val fakeSnapshot = generateFlattenNodeFromList(expectedList)
+
+        // When
+        val thread = Thread {
+            repeat(forge.anInt(1, wireframeSize - 1)) {
+                expectedList.removeAt(0)
+            }
+        }
+
+        // Then
+        assertDoesNotThrow {
+            thread.start()
+            testedNodeFlattener.flattenNode(fakeSnapshot)
+            thread.join()
+        }
+    }
+
     // endregion
 
     // region Internals
 
+    private fun generateFlattenNodeFromList(list: List<MobileSegment.Wireframe>): Node {
+        return Node(
+            wireframes = list,
+            children = emptyList(),
+            parents = emptyList()
+        )
+    }
+
     private fun generateTreeFromList(list: List<MobileSegment.Wireframe>): Node {
         val mutableList = list.toMutableList()
         val root = mutableList.removeAt(0).toNode()

local_ci.sh

@@ -102,6 +102,7 @@ if [[ $CLEANUP == 1 ]]; then
   rm -rf features/dd-sdk-android-ndk/build/
   rm -rf features/dd-sdk-android-rum/build/
   rm -rf features/dd-sdk-android-session-replay/build/
+  rm -rf features/dd-sdk-android-session-replay-compose/build/
   rm -rf features/dd-sdk-android-session-replay-material/build/
   rm -rf features/dd-sdk-android-trace/build/
   rm -rf features/dd-sdk-android-trace-otel/build/