Merge fae1f84 into 7c81e67

Author: 43jay

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -16,6 +16,7 @@
 import io.sentry.NoOpCompositePerformanceCollector;
 import io.sentry.NoOpConnectionStatusProvider;
 import io.sentry.NoOpContinuousProfiler;
+import io.sentry.NoOpReplayBreadcrumbConverter;
 import io.sentry.NoOpSocketTagger;
 import io.sentry.NoOpTransactionProfiler;
 import io.sentry.NoopVersionDetector;
@@ -253,6 +254,11 @@ static void initializeIntegrationsAndProcessors(
       options.setCompositePerformanceCollector(new DefaultCompositePerformanceCollector(options));
     }
 
+    if (options.getReplayController().getBreadcrumbConverter() instanceof NoOpReplayBreadcrumbConverter) {
+      options.getReplayController().setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter(options));
+
+    }
+
     // Check if the profiler was already instantiated in the app start.
     // We use the Android profiler, that uses a global start/stop api, so we need to preserve the
     // state of the profiler, and it's only possible retaining the instance.
@@ -406,7 +412,6 @@ static void installDefaultIntegrations(
     if (isReplayAvailable) {
       final ReplayIntegration replay =
           new ReplayIntegration(context, CurrentDateProvider.getInstance());
-      replay.setBreadcrumbConverter(new DefaultReplayBreadcrumbConverter());
       options.addIntegration(replay);
       options.setReplayController(replay);
     }

sentry-android-replay/api/sentry-android-replay.api

@@ -9,6 +9,7 @@ public final class io/sentry/android/replay/BuildConfig {
 public class io/sentry/android/replay/DefaultReplayBreadcrumbConverter : io/sentry/ReplayBreadcrumbConverter {
 	public static final field $stable I
 	public fun <init> ()V
+	public fun <init> (Lio/sentry/SentryOptions;)V
 	public fun convert (Lio/sentry/Breadcrumb;)Lio/sentry/rrweb/RRWebEvent;
 }
 

sentry-android-replay/src/main/java/io/sentry/android/replay/DefaultReplayBreadcrumbConverter.kt

@@ -1,17 +1,33 @@
 package io.sentry.android.replay
 
 import io.sentry.Breadcrumb
+import io.sentry.Hint
 import io.sentry.ReplayBreadcrumbConverter
 import io.sentry.SentryLevel
+import io.sentry.SentryOptions
+import io.sentry.SentryOptions.BeforeBreadcrumbCallback
 import io.sentry.SpanDataConvention
+import io.sentry.TypeCheckHint.SENTRY_REPLAY_NETWORK_DETAILS
 import io.sentry.rrweb.RRWebBreadcrumbEvent
 import io.sentry.rrweb.RRWebEvent
 import io.sentry.rrweb.RRWebSpanEvent
+import io.sentry.util.network.NetworkRequestData
+import java.util.Collections
 import kotlin.LazyThreadSafetyMode.NONE
 
-public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
+public open class DefaultReplayBreadcrumbConverter() : ReplayBreadcrumbConverter {
+  private var options: SentryOptions? = null
+
+  public constructor(options: SentryOptions) : this() {
+    // We modify options, so keep it around to make that explicit.
+    this.options = options
+    this.options?.beforeBreadcrumb = ReplayBeforeBreadcrumbCallback(options.beforeBreadcrumb)
+  }
+
   internal companion object {
+    private const val MAX_HTTP_NETWORK_DETAILS = 32
     private val snakecasePattern by lazy(NONE) { "_[a-z]".toRegex() }
+
     private val supportedNetworkData =
       HashSet<String>().apply {
         add("status_code")
@@ -23,16 +39,68 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
       }
   }
 
+  /**
+   * Intercept the breadcrumb to process any Network Details data on the hint. Delegate to any
+   * user-provided callback to provide the actual breadcrumb to process.
+   */
+  private inner class ReplayBeforeBreadcrumbCallback(
+    private val delegate: BeforeBreadcrumbCallback?
+  ) : BeforeBreadcrumbCallback {
+    override fun execute(breadcrumb: Breadcrumb, hint: Hint): Breadcrumb? {
+      val resultBreadcrumb =
+        if (delegate != null) {
+          delegate.execute(breadcrumb, hint)
+        } else {
+          breadcrumb
+        }
+
+      resultBreadcrumb?.let { finalBreadcrumb ->
+        extractNetworkRequestDataFromHint(finalBreadcrumb, hint)?.let { networkData ->
+          httpNetworkDetails[finalBreadcrumb] = networkData
+        }
+      }
+
+      return resultBreadcrumb
+    }
+
+    private fun extractNetworkRequestDataFromHint(
+      breadcrumb: Breadcrumb,
+      breadcrumbHint: Hint,
+    ): NetworkRequestData? {
+      if (breadcrumb.type != "http" && breadcrumb.category != "http") {
+        return null
+      }
+
+      return breadcrumbHint.get(SENTRY_REPLAY_NETWORK_DETAILS) as? NetworkRequestData
+    }
+  }
+
   private var lastConnectivityState: String? = null
 
+  private val httpNetworkDetails =
+    Collections.synchronizedMap(
+      object : LinkedHashMap<Breadcrumb, NetworkRequestData>() {
+        override fun removeEldestEntry(
+          eldest: MutableMap.MutableEntry<Breadcrumb, NetworkRequestData>?
+        ): Boolean {
+          return size > MAX_HTTP_NETWORK_DETAILS
+        }
+      }
+    )
+
   override fun convert(breadcrumb: Breadcrumb): RRWebEvent? {
     var breadcrumbMessage: String? = null
-    var breadcrumbCategory: String? = null
+    val breadcrumbCategory: String?
     var breadcrumbLevel: SentryLevel? = null
     val breadcrumbData = mutableMapOf<String, Any?>()
+
     when {
       breadcrumb.category == "http" -> {
-        return if (breadcrumb.isValidForRRWebSpan()) breadcrumb.toRRWebSpanEvent() else null
+        return if (breadcrumb.isValidForRRWebSpan()) {
+          breadcrumb.toRRWebSpanEvent()
+        } else {
+          null
+        }
       }
 
       breadcrumb.type == "navigation" && breadcrumb.category == "app.lifecycle" -> {
@@ -42,6 +110,7 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
       breadcrumb.type == "navigation" && breadcrumb.category == "device.orientation" -> {
         breadcrumbCategory = breadcrumb.category!!
         val position = breadcrumb.data["position"]
+
         if (position == "landscape" || position == "portrait") {
           breadcrumbData["position"] = position
         } else {
@@ -53,8 +122,9 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
         breadcrumbCategory = "navigation"
         breadcrumbData["to"] =
           when {
-            breadcrumb.data["state"] == "resumed" ->
+            breadcrumb.data["state"] == "resumed" -> {
               (breadcrumb.data["screen"] as? String)?.substringAfterLast('.')
+            }
             "to" in breadcrumb.data -> breadcrumb.data["to"] as? String
             else -> null
           } ?: return null
@@ -67,6 +137,7 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
             ?: breadcrumb.data["view.tag"]
             ?: breadcrumb.data["view.class"])
             as? String ?: return null
+
         breadcrumbData.putAll(breadcrumb.data)
       }
 
@@ -75,18 +146,18 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
         breadcrumbData["state"] =
           when {
             breadcrumb.data["action"] == "NETWORK_LOST" -> "offline"
-            "network_type" in breadcrumb.data ->
+            "network_type" in breadcrumb.data -> {
               if (!(breadcrumb.data["network_type"] as? String).isNullOrEmpty()) {
                 breadcrumb.data["network_type"]
               } else {
                 return null
               }
-
+            }
             else -> return null
           }
 
         if (lastConnectivityState == breadcrumbData["state"]) {
-          // debounce same state
+          // Debounce same state
           return null
         }
 
@@ -105,6 +176,7 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
         breadcrumbData.putAll(breadcrumb.data)
       }
     }
+
     return if (!breadcrumbCategory.isNullOrEmpty()) {
       RRWebBreadcrumbEvent().apply {
         timestamp = breadcrumb.timestamp.time
@@ -120,29 +192,34 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
     }
   }
 
-  private fun Breadcrumb.isValidForRRWebSpan(): Boolean =
-    !(data["url"] as? String).isNullOrEmpty() &&
+  private fun Breadcrumb.isValidForRRWebSpan(): Boolean {
+    return !(data["url"] as? String).isNullOrEmpty() &&
       SpanDataConvention.HTTP_START_TIMESTAMP in data &&
       SpanDataConvention.HTTP_END_TIMESTAMP in data
+  }
 
-  private fun String.snakeToCamelCase(): String =
-    replace(snakecasePattern) { it.value.last().toString().uppercase() }
+  private fun String.snakeToCamelCase(): String {
+    return replace(snakecasePattern) { it.value.last().toString().uppercase() }
+  }
 
   private fun Breadcrumb.toRRWebSpanEvent(): RRWebSpanEvent {
     val breadcrumb = this
     val httpStartTimestamp = breadcrumb.data[SpanDataConvention.HTTP_START_TIMESTAMP]
     val httpEndTimestamp = breadcrumb.data[SpanDataConvention.HTTP_END_TIMESTAMP]
+
     return RRWebSpanEvent().apply {
       timestamp = breadcrumb.timestamp.time
       op = "resource.http"
       description = breadcrumb.data["url"] as String
-      // can be double if it was serialized to disk
+
+      // Can be double if it was serialized to disk
       startTimestamp =
         if (httpStartTimestamp is Double) {
           httpStartTimestamp / 1000.0
         } else {
           (httpStartTimestamp as Long) / 1000.0
         }
+
       endTimestamp =
         if (httpEndTimestamp is Double) {
           httpEndTimestamp / 1000.0
@@ -151,13 +228,54 @@ public open class DefaultReplayBreadcrumbConverter : ReplayBreadcrumbConverter {
         }
 
       val breadcrumbData = mutableMapOf<String, Any?>()
+
+      val networkDetailData = httpNetworkDetails.remove(breadcrumb)
+
+      // Add Network Details data when available
+      networkDetailData?.let { networkData ->
+        networkData.method?.let { breadcrumbData["method"] = it }
+        networkData.statusCode?.let { breadcrumbData["statusCode"] = it }
+        networkData.requestBodySize?.let { breadcrumbData["requestBodySize"] = it }
+        networkData.responseBodySize?.let { breadcrumbData["responseBodySize"] = it }
+
+        networkData.request?.let { request ->
+          val requestData = mutableMapOf<String, Any?>()
+          request.size?.let { requestData["size"] = it }
+          request.body?.let { requestData["body"] = it.value }
+
+          if (request.headers.isNotEmpty()) {
+            requestData["headers"] = request.headers
+          }
+
+          if (requestData.isNotEmpty()) {
+            breadcrumbData["request"] = requestData
+          }
+        }
+
+        networkData.response?.let { response ->
+          val responseData = mutableMapOf<String, Any?>()
+          response.size?.let { responseData["size"] = it }
+          response.body?.let { responseData["body"] = it.value }
+
+          if (response.headers.isNotEmpty()) {
+            responseData["headers"] = response.headers
+          }
+
+          if (responseData.isNotEmpty()) {
+            breadcrumbData["response"] = responseData
+          }
+        }
+      }
+
+      // Original breadcrumb http data
       for ((key, value) in breadcrumb.data) {
         if (key in supportedNetworkData) {
-          breadcrumbData[
-            key.replace("content_length", "body_size").substringAfter(".").snakeToCamelCase(),
-          ] = value
+          val formattedKey =
+            key.replace("content_length", "body_size").substringAfter(".").snakeToCamelCase()
+          breadcrumbData[formattedKey] = value
         }
       }
+
       data = breadcrumbData
     }
   }