RUM-10163: Add proper CI setup for Coil3

Author: jonathanmos

CONTRIBUTING.md

@@ -40,6 +40,7 @@ This project hosts the following modules:
   - `integrations/***`: a set of libraries integrating Datadog products in third party libraries:
     - `integrations/dd-sdk-android-apollo`: a lightweight library providing a bridge integration between Datadog SDK and [Apollo Kotlin](https://github.com/apollographql/apollo-kotlin)
     - `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-coil3`: a lightweight library providing a bridge integration between Datadog SDK and [Coil 3](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-glide`: a lightweight library providing a bridge integration between Datadog SDK and [Glide](https://bumptech.github.io/glide/);

ci/pipelines/default-pipeline.yml

@@ -118,6 +118,7 @@ analysis:detekt-custom:
     - ./gradlew :features:dd-sdk-android-trace-otel:customDetektRules
     - ./gradlew :features:dd-sdk-android-webview:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-coil:customDetektRules
+    - ./gradlew :integrations:dd-sdk-android-coil3:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-compose:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-cronet:customDetektRules
     - ./gradlew :integrations:dd-sdk-android-fresco:customDetektRules
@@ -782,6 +783,23 @@ publish:release-coil:
     paths:
       - integrations/dd-sdk-android-coil/verification-metadata.xml
 
+publish:release-coil3:
+  tags: [ "arch:amd64" ]
+  only:
+    - tags
+    - develop
+  image: $CI_IMAGE_DOCKER
+  stage: publish
+  timeout: 30m
+  script:
+    - !reference [.snippets, set-publishing-credentials]
+    - ./gradlew :integrations:dd-sdk-android-coil3:publishToSonatype closeSonatypeStagingRepository --stacktrace --no-daemon
+  artifacts:
+    when: on_success
+    expire_in: 7 days
+    paths:
+      - integrations/dd-sdk-android-coil3/verification-metadata.xml
+
 publish:release-compose:
   tags: [ "arch:amd64" ]
   only:
@@ -1116,6 +1134,7 @@ notify:merge-verification-metadata:
     - publish:release-session-replay-compose
     - publish:release-webview
     - publish:release-coil
+    - publish:release-coil3
     - publish:release-compose
     - publish:release-cronet
     - publish:release-fresco

features/dd-sdk-android-session-replay-compose/src/main/kotlin/com/datadog/android/sessionreplay/compose/internal/reflection/ComposeReflection.kt

@@ -184,16 +184,14 @@ internal fun Field.getSafe(target: Any?): Any? {
         return null
     }
     return try {
+        @Suppress("UnsafeThirdPartyFunctionCall") // null is checked above so no npe possible
         get(target)
     } catch (e: IllegalAccessException) {
         logReflectionException(name, LOG_TYPE_FIELD, LOG_REASON_FIELD_NO_ACCESSIBLE, e)
         null
     } catch (e: IllegalArgumentException) {
         logReflectionException(name, LOG_TYPE_FIELD, LOG_REASON_INCOMPATIBLE_TYPE, e)
         null
-    } catch (e: NullPointerException) {
-        logNullPointerException(name, LOG_TYPE_FIELD, e)
-        null
     } catch (e: ExceptionInInitializerError) {
         logReflectionException(name, LOG_TYPE_FIELD, LOG_REASON_INITIALIZATION_ERROR, e)
         null

integrations/dd-sdk-android-coil/src/test/kotlin/com/datadog/android/coil/DatadogCoilRequestListenerTest.kt

@@ -49,7 +49,7 @@ import kotlin.reflect.jvm.isAccessible
 @MockitoSettings(strictness = Strictness.LENIENT)
 internal class DatadogCoilRequestListenerTest {
 
-    lateinit var underTest: DatadogCoilRequestListener
+    private lateinit var testable: DatadogCoilRequestListener
 
     @Mock
     lateinit var mockRumMonitor: RumMonitor
@@ -68,7 +68,7 @@ internal class DatadogCoilRequestListenerTest {
             isAccessible = true
             call(GlobalRumMonitor::class.objectInstance, mockRumMonitor, mockSdkCore)
         }
-        underTest = DatadogCoilRequestListener(mockSdkCore)
+        testable = DatadogCoilRequestListener(mockSdkCore)
     }
 
     @AfterEach
@@ -88,7 +88,7 @@ internal class DatadogCoilRequestListenerTest {
         mockRequest = mockImageRequest(fakePath)
 
         // WHEN
-        underTest.onError(mockRequest, fakeException)
+        testable.onError(mockRequest, fakeException)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -114,7 +114,7 @@ internal class DatadogCoilRequestListenerTest {
         mockRequest = mockImageRequest(mockUri)
 
         // WHEN
-        underTest.onError(mockRequest, fakeException)
+        testable.onError(mockRequest, fakeException)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -137,7 +137,7 @@ internal class DatadogCoilRequestListenerTest {
         mockRequest = mockImageRequest(fakeHttpUrl)
 
         // WHEN
-        underTest.onError(mockRequest, fakeException)
+        testable.onError(mockRequest, fakeException)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -160,7 +160,7 @@ internal class DatadogCoilRequestListenerTest {
         mockRequest = mockImageRequest(fakeFile)
 
         // WHEN
-        underTest.onError(mockRequest, fakeException)
+        testable.onError(mockRequest, fakeException)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -183,7 +183,7 @@ internal class DatadogCoilRequestListenerTest {
         mockRequest = mockImageRequest(mockDrawable)
 
         // WHEN
-        underTest.onError(mockRequest, fakeException)
+        testable.onError(mockRequest, fakeException)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -203,7 +203,7 @@ internal class DatadogCoilRequestListenerTest {
         mockRequest = mockImageRequest(mockDrawable)
 
         // WHEN
-        underTest.onError(mockRequest, fakeException)
+        testable.onError(mockRequest, fakeException)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()

integrations/dd-sdk-android-coil3/.gitignore

@@ -0,0 +1,19 @@
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+build/
+

integrations/dd-sdk-android-coil3/src/test/kotlin/com/datadog/android/coil3/DatadogCoilRequestListenerTest.kt

@@ -48,7 +48,7 @@ import kotlin.reflect.jvm.isAccessible
 @MockitoSettings(strictness = Strictness.LENIENT)
 internal class DatadogCoilRequestListenerTest {
 
-    lateinit var underTest: DatadogCoilRequestListener
+    private lateinit var testable: DatadogCoilRequestListener
 
     @Mock
     lateinit var mockRumMonitor: RumMonitor
@@ -69,7 +69,7 @@ internal class DatadogCoilRequestListenerTest {
             isAccessible = true
             call(GlobalRumMonitor::class.objectInstance, mockRumMonitor, mockSdkCore)
         }
-        underTest = DatadogCoilRequestListener(mockSdkCore)
+        testable = DatadogCoilRequestListener(mockSdkCore)
     }
 
     @AfterEach
@@ -90,7 +90,7 @@ internal class DatadogCoilRequestListenerTest {
         mockErrorResult = mockErrorResult(fakeException)
 
         // WHEN
-        underTest.onError(mockRequest, mockErrorResult)
+        testable.onError(mockRequest, mockErrorResult)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -117,7 +117,7 @@ internal class DatadogCoilRequestListenerTest {
         mockErrorResult = mockErrorResult(fakeException)
 
         // WHEN
-        underTest.onError(mockRequest, mockErrorResult)
+        testable.onError(mockRequest, mockErrorResult)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -141,7 +141,7 @@ internal class DatadogCoilRequestListenerTest {
         mockErrorResult = mockErrorResult(fakeException)
 
         // WHEN
-        underTest.onError(mockRequest, mockErrorResult)
+        testable.onError(mockRequest, mockErrorResult)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -165,7 +165,7 @@ internal class DatadogCoilRequestListenerTest {
         mockErrorResult = mockErrorResult(fakeException)
 
         // WHEN
-        underTest.onError(mockRequest, mockErrorResult)
+        testable.onError(mockRequest, mockErrorResult)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()
@@ -189,7 +189,7 @@ internal class DatadogCoilRequestListenerTest {
         mockErrorResult = mockErrorResult(fakeException)
 
         // WHEN
-        underTest.onError(mockRequest, mockErrorResult)
+        testable.onError(mockRequest, mockErrorResult)
 
         // THEN
         val argumentCaptor = argumentCaptor<Map<String, Any?>>()

local_ci.sh

@@ -106,6 +106,7 @@ if [[ $CLEANUP == 1 ]]; then
   rm -rf features/dd-sdk-android-trace-otel/build/
   rm -rf features/dd-sdk-android-webview/build/
   rm -rf integrations/dd-sdk-android-coil/build/
+  rm -rf integrations/dd-sdk-android-coil3/build/
   rm -rf integrations/dd-sdk-android-compose/build/
   rm -rf integrations/dd-sdk-android-cronet/build/
   rm -rf integrations/dd-sdk-android-fresco/build/