Apply review suggestions

Author: kikoveiga

dd-sdk-android-core/api/apiSurface

@@ -177,7 +177,7 @@ interface com.datadog.android.api.instrumentation.network.HttpResponseInfo
   val headers: Map<String, List<String>>
   val contentType: String?
   val contentLength: Long?
-  val request: HttpRequestInfo
+  val request: HttpRequestInfo?
 interface com.datadog.android.api.instrumentation.network.MutableHttpRequestInfo
   fun newBuilder(): HttpRequestInfoBuilder
 data class com.datadog.android.api.net.Request

dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/instrumentation/network/HttpResponseInfo.kt

@@ -40,7 +40,7 @@ interface HttpResponseInfo {
     val contentLength: Long?
 
     /**
-     * Represents the HTTP request associated with the response.
+     * Represents the HTTP request associated with the response, or null when not available.
      */
-    val request: HttpRequestInfo
+    val request: HttpRequestInfo?
 }

integrations/dd-sdk-android-cronet/src/main/kotlin/com/datadog/android/cronet/internal/CronetHttpResponseInfo.kt

@@ -5,14 +5,13 @@
  */
 package com.datadog.android.cronet.internal
 
-import com.datadog.android.api.instrumentation.network.HttpRequestInfo
 import com.datadog.android.api.instrumentation.network.HttpResponseInfo
 import com.datadog.android.internal.network.HttpSpec
 import org.chromium.net.UrlResponseInfo
 
 internal data class CronetHttpResponseInfo(
     private val response: UrlResponseInfo,
-    override val request: HttpRequestInfo
+    override val request: CronetHttpRequestInfo?
 ) : HttpResponseInfo {
 
     override val url: String get() = response.url

integrations/dd-sdk-android-cronet/src/main/kotlin/com/datadog/android/cronet/internal/CronetRequestCallback.kt

@@ -102,25 +102,25 @@ internal class CronetRequestCallback(
     ) = delegate.onReadCompleted(request, info, byteBuffer)
 
     private fun finishSuccessRequestTracing(response: UrlResponseInfo?) {
-        val requestInfo = apmTracingStateHolder.get()?.createRequestInfo()
-            ?: distributedTracingStateHolder.get()?.createRequestInfo()
-        val responseInfo = if (response != null && requestInfo != null) {
-            CronetHttpResponseInfo(response, requestInfo)
-        } else {
-            null
-        }
-
         apmTracingStateHolder.getAndSet(null)?.let { apmTracingState ->
-            if (responseInfo != null) {
-                apmNetworkInstrumentation?.onResponseSucceeded(apmTracingState, responseInfo)
+            if (response != null) {
+                val requestInfo = apmTracingState.createRequestInfo() as? CronetHttpRequestInfo
+                apmNetworkInstrumentation?.onResponseSucceeded(
+                    apmTracingState,
+                    CronetHttpResponseInfo(response, requestInfo)
+                )
             }
         } ?: apmNetworkInstrumentation?.reportInstrumentationError {
             "Request tracing state not found for ${response?.url}. Instrumentation may be broken."
         }
 
         distributedTracingStateHolder.getAndSet(null)?.let { distributedTracingState ->
-            if (responseInfo != null) {
-                distributedTracingInstrumentation?.onResponseSucceeded(distributedTracingState, responseInfo)
+            if (response != null) {
+                val requestInfo = distributedTracingState.createRequestInfo() as? CronetHttpRequestInfo
+                distributedTracingInstrumentation?.onResponseSucceeded(
+                    distributedTracingState,
+                    CronetHttpResponseInfo(response, requestInfo)
+                )
             }
         }
     }

integrations/dd-sdk-android-cronet/src/main/kotlin/com/datadog/android/cronet/internal/CronetRequestFinishedInfoListener.kt

@@ -6,7 +6,6 @@
 package com.datadog.android.cronet.internal
 
 import androidx.annotation.WorkerThread
-import com.datadog.android.api.instrumentation.network.HttpRequestInfo
 import com.datadog.android.rum.RumAttributes
 import com.datadog.android.rum.internal.domain.event.ResourceTiming
 import com.datadog.android.rum.internal.net.RumNetworkInstrumentation
@@ -25,7 +24,7 @@ internal class CronetRequestFinishedInfoListener(
 
     @WorkerThread
     override fun onRequestFinished(finishedInfo: RequestFinishedInfo) {
-        val requestInfo = finishedInfo.annotations?.filterIsInstance<HttpRequestInfo>()?.firstOrNull()
+        val requestInfo = finishedInfo.annotations?.filterIsInstance<CronetHttpRequestInfo>()?.firstOrNull()
         val distributingTracingState = finishedInfo.annotations?.filterIsInstance<RequestTracingState>()?.firstOrNull()
         if (requestInfo == null) {
             rumNetworkInstrumentation.reportInstrumentationError {

integrations/dd-sdk-android-cronet/src/test/kotlin/com/datadog/android/cronet/internal/CronetRequestCallbackTest.kt

@@ -388,7 +388,6 @@ internal class CronetRequestCallbackTest {
         // Given
         val mockDistributedTracingState: RequestTracingState = mock()
         whenever(mockDistributedTracingInstrumentation.onRequest(fakeRequestInfo)) doReturn mockDistributedTracingState
-        whenever(mockDistributedTracingState.createRequestInfo()) doReturn mockMutableRequestInfo
         testedCallback.onRequestStarted(fakeRequestInfo)
 
         // When
@@ -477,7 +476,6 @@ internal class CronetRequestCallbackTest {
         // Given
         val mockDistributedTracingState: RequestTracingState = mock()
         whenever(mockDistributedTracingInstrumentation.onRequest(fakeRequestInfo)) doReturn mockDistributedTracingState
-        whenever(mockDistributedTracingState.createRequestInfo()) doReturn mockMutableRequestInfo
         testedCallback.onRequestStarted(fakeRequestInfo)
 
         // When

integrations/dd-sdk-android-cronet/src/test/kotlin/com/datadog/android/cronet/internal/CronetRequestFinishedInfoListenerTest.kt

@@ -5,7 +5,6 @@
  */
 package com.datadog.android.cronet.internal
 
-import com.datadog.android.api.instrumentation.network.HttpRequestInfo
 import com.datadog.android.cronet.internal.CronetRequestFinishedInfoListener.Companion.minus
 import com.datadog.android.rum.internal.domain.event.ResourceTiming
 import com.datadog.android.rum.internal.net.RumNetworkInstrumentation
@@ -54,8 +53,8 @@ internal class CronetRequestFinishedInfoListenerTest {
     @Mock
     private lateinit var mockResponseInfo: UrlResponseInfo
 
-    @Forgery
-    private lateinit var fakeRequestInfo: HttpRequestInfo
+    @Mock
+    private lateinit var fakeRequestInfo: CronetHttpRequestInfo
 
     private lateinit var testedListener: CronetRequestFinishedInfoListener
 

integrations/dd-sdk-android-cronet/src/test/kotlin/com/datadog/android/cronet/internal/CronetResponseInfoTest.kt

@@ -6,7 +6,6 @@
 
 package com.datadog.android.cronet.internal
 
-import com.datadog.android.api.instrumentation.network.HttpRequestInfo
 import com.datadog.android.internal.network.HttpSpec
 import com.datadog.android.utils.forge.Configurator
 import com.datadog.tools.unit.forge.exhaustiveAttributes
@@ -40,7 +39,7 @@ internal class CronetResponseInfoTest {
     lateinit var mockUrlResponseInfo: UrlResponseInfo
 
     @Mock
-    lateinit var mockRequestInfo: HttpRequestInfo
+    lateinit var mockRequestInfo: CronetHttpRequestInfo
 
     lateinit var fakeHeaders: Map<String, List<String>>
 
@@ -134,6 +133,18 @@ internal class CronetResponseInfoTest {
         assertThat(result).isSameAs(mockRequestInfo)
     }
 
+    @Test
+    fun `M return null W request property { null request }`() {
+        // Given
+        val responseInfo = CronetHttpResponseInfo(mockUrlResponseInfo, null)
+
+        // When
+        val result = responseInfo.request
+
+        // Then
+        assertThat(result).isNull()
+    }
+
     @Test
     fun `M return content length from header W computeContentLength() { header present }`(
         @LongForgery(min = 1) fakeContentLength: Long