Merge branch 'main' into dependabot/github_actions/actions/checkout-6

Author: romtsn

CHANGELOG.md

@@ -1,5 +1,81 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Add option to capture additional OkHttp network request/response details in session replays ([#4919](https://github.com/getsentry/sentry-java/pull/4919))
+  - Depends on `SentryOkHttpInterceptor` to intercept the request and extract request/response bodies
+  - To enable, add url regexes via the `io.sentry.session-replay.network-detail-allow-urls` metadata tag in AndroidManifest ([code sample](https://github.com/getsentry/sentry-java/blob/b03edbb1b0d8b871c62a09bc02cbd8a4e1f6fea1/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml#L196-L205))
+    - Or you can manually specify SentryReplayOptions via `SentryAndroid#init`:  
+_(Make sure you disable the auto init via manifest meta-data: io.sentry.auto-init=false)_
+
+<details>
+  <summary>Kotlin</summary>
+
+```kotlin
+SentryAndroid.init(
+    this,
+    options -> {
+      // options.dsn = "https://examplePublicKey@o0.ingest.sentry.io/0"
+      // options.sessionReplay.sessionSampleRate = 1.0
+      // options.sessionReplay.onErrorSampleRate = 1.0
+      // ..
+
+      options.sessionReplay.networkDetailAllowUrls = listOf(".*")
+      options.sessionReplay.networkDetailDenyUrls = listOf(".*deny.*")
+      options.sessionReplay.networkRequestHeaders = listOf("Authorization", "X-Custom-Header", "X-Test-Request")
+      options.sessionReplay.networkResponseHeaders = listOf("X-Response-Time", "X-Cache-Status", "X-Test-Response")
+    });
+```
+
+</details>
+
+<details>
+  <summary>Java</summary>
+
+```java
+SentryAndroid.init(
+    this,
+    options -> {
+        options.getSessionReplay().setNetworkDetailAllowUrls(Arrays.asList(".*"));
+        options.getSessionReplay().setNetworkDetailDenyUrls(Arrays.asList(".*deny.*"));
+        options.getSessionReplay().setNetworkRequestHeaders(
+            Arrays.asList("Authorization", "X-Custom-Header", "X-Test-Request"));
+        options.getSessionReplay().setNetworkResponseHeaders(
+            Arrays.asList("X-Response-Time", "X-Cache-Status", "X-Test-Response"));
+    });
+
+```
+
+</details>
+
+
+### Improvements
+
+- Avoid forking `rootScopes` for Reactor if current thread has `NoOpScopes` ([#4793](https://github.com/getsentry/sentry-java/pull/4793))
+  - This reduces the SDKs overhead by avoiding unnecessary scope forks
+
+### Fixes 
+
+- Fix missing thread stacks for ANRv1 events ([#4918](https://github.com/getsentry/sentry-java/pull/4918))
+
+### Internal
+
+- Support `span` envelope item type ([#4935](https://github.com/getsentry/sentry-java/pull/4935))
+
+### Dependencies
+
+- Bump Native SDK from v0.12.1 to v0.12.2 ([#4944](https://github.com/getsentry/sentry-java/pull/4944))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0122)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.12.1...0.12.2)
+
+## 8.27.1
+
+### Fixes
+
+- Do not log if `sentry.properties` in rundir has not been found ([#4929](https://github.com/getsentry/sentry-java/pull/4929))
+
 ## 8.27.0
 
 ### Features

gradle.properties

@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.27.0
+versionName=8.27.1
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

gradle/libs.versions.toml

@@ -142,7 +142,7 @@ quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
 reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
-sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.1" }
+sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.2" }
 servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
 servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

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

@@ -507,7 +507,7 @@ static void applyMetadata(
         }
 
         // Network Details Configuration
-        if (options.getSessionReplay().getNetworkDetailAllowUrls().length == 0) {
+        if (options.getSessionReplay().getNetworkDetailAllowUrls().isEmpty()) {
           final @Nullable List<String> allowUrls =
               readList(metadata, logger, REPLAYS_NETWORK_DETAIL_ALLOW_URLS);
           if (allowUrls != null && !allowUrls.isEmpty()) {
@@ -519,14 +519,12 @@ static void applyMetadata(
               }
             }
             if (!filteredUrls.isEmpty()) {
-              options
-                  .getSessionReplay()
-                  .setNetworkDetailAllowUrls(filteredUrls.toArray(new String[0]));
+              options.getSessionReplay().setNetworkDetailAllowUrls(filteredUrls);
             }
           }
         }
 
-        if (options.getSessionReplay().getNetworkDetailDenyUrls().length == 0) {
+        if (options.getSessionReplay().getNetworkDetailDenyUrls().isEmpty()) {
           final @Nullable List<String> denyUrls =
               readList(metadata, logger, REPLAYS_NETWORK_DETAIL_DENY_URLS);
           if (denyUrls != null && !denyUrls.isEmpty()) {
@@ -538,9 +536,7 @@ static void applyMetadata(
               }
             }
             if (!filteredUrls.isEmpty()) {
-              options
-                  .getSessionReplay()
-                  .setNetworkDetailDenyUrls(filteredUrls.toArray(new String[0]));
+              options.getSessionReplay().setNetworkDetailDenyUrls(filteredUrls);
             }
           }
         }
@@ -554,7 +550,7 @@ static void applyMetadata(
                     REPLAYS_NETWORK_CAPTURE_BODIES,
                     options.getSessionReplay().isNetworkCaptureBodies() /* defaultValue */));
 
-        if (options.getSessionReplay().getNetworkRequestHeaders().length
+        if (options.getSessionReplay().getNetworkRequestHeaders().size()
             == SentryReplayOptions.getNetworkDetailsDefaultHeaders().size()) { // Only has defaults
           final @Nullable List<String> requestHeaders =
               readList(metadata, logger, REPLAYS_NETWORK_REQUEST_HEADERS);
@@ -572,7 +568,7 @@ static void applyMetadata(
           }
         }
 
-        if (options.getSessionReplay().getNetworkResponseHeaders().length
+        if (options.getSessionReplay().getNetworkResponseHeaders().size()
             == SentryReplayOptions.getNetworkDetailsDefaultHeaders().size()) { // Only has defaults
           final @Nullable List<String> responseHeaders =
               readList(metadata, logger, REPLAYS_NETWORK_RESPONSE_HEADERS);

sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt

@@ -10,6 +10,7 @@ import io.sentry.TypeCheckHint
 import io.sentry.transport.CurrentDateProvider
 import io.sentry.util.Platform
 import io.sentry.util.UrlUtils
+import io.sentry.util.network.NetworkRequestData
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -27,6 +28,7 @@ internal class SentryOkHttpEvent(private val scopes: IScopes, private val reques
   internal val callSpan: ISpan?
   private var response: Response? = null
   private var clientErrorResponse: Response? = null
+  private var networkDetails: NetworkRequestData? = null
   internal val isEventFinished = AtomicBoolean(false)
   private var url: String
   private var method: String
@@ -135,6 +137,11 @@ internal class SentryOkHttpEvent(private val scopes: IScopes, private val reques
     }
   }
 
+  /** Sets the [NetworkRequestData] for network detail capture. */
+  fun setNetworkDetails(networkRequestData: NetworkRequestData?) {
+    this.networkDetails = networkRequestData
+  }
+
   /** Record event start if the callRootSpan is not null. */
   fun onEventStart(event: String) {
     callSpan ?: return
@@ -163,6 +170,9 @@ internal class SentryOkHttpEvent(private val scopes: IScopes, private val reques
     hint.set(TypeCheckHint.OKHTTP_REQUEST, request)
     response?.let { hint.set(TypeCheckHint.OKHTTP_RESPONSE, it) }
 
+    // Include network details in the hint for session replay
+    networkDetails?.let { hint.set(TypeCheckHint.SENTRY_REPLAY_NETWORK_DETAILS, it) }
+
     // needs this as unix timestamp for rrweb
     breadcrumb.setData(
       SpanDataConvention.HTTP_END_TIMESTAMP,

sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpInterceptor.kt

@@ -33,6 +33,7 @@ import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
+import org.jetbrains.annotations.VisibleForTesting
 
 /**
  * The Sentry's [SentryOkHttpInterceptor], it will automatically add a breadcrumb and start a span
@@ -209,6 +210,9 @@ public open class SentryOkHttpInterceptor(
         )
       }
 
+      // Set network details on the OkHttpEvent so it can include them in the breadcrumb hint
+      okHttpEvent?.setNetworkDetails(networkDetailData)
+
       finishSpan(span, request, response, isFromEventListener, okHttpEvent)
 
       // The SentryOkHttpEventListener will send the breadcrumb itself if used for this call
@@ -260,10 +264,19 @@ public open class SentryOkHttpInterceptor(
   }
 
   /** Extracts headers from OkHttp Headers object into a map */
-  private fun okhttp3.Headers.toMap(): Map<String, String> {
+  @VisibleForTesting
+  internal fun okhttp3.Headers.toMap(): Map<String, String> {
     val headers = linkedMapOf<String, String>()
     for (i in 0 until size) {
-      headers[name(i)] = value(i)
+      val name = name(i)
+      val value = value(i)
+      val existingValue = headers[name]
+      if (existingValue != null) {
+        // Concatenate duplicate headers with semicolon separator
+        headers[name] = "$existingValue; $value"
+      } else {
+        headers[name] = value
+      }
     }
     return headers
   }

sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpEventTest.kt

@@ -15,6 +15,7 @@ import io.sentry.TransactionContext
 import io.sentry.TypeCheckHint
 import io.sentry.exception.SentryHttpClientException
 import io.sentry.test.getProperty
+import io.sentry.util.network.NetworkRequestData
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -425,6 +426,34 @@ class SentryOkHttpEventTest {
     verify(fixture.scopes, never()).captureEvent(any(), any<Hint>())
   }
 
+  @Test
+  fun `when finish is called, the breadcrumb sent includes network details data on its hint`() {
+    val sut = fixture.getSut()
+    val networkRequestData = NetworkRequestData("GET")
+
+    sut.setNetworkDetails(networkRequestData)
+    sut.finish()
+
+    verify(fixture.scopes)
+      .addBreadcrumb(
+        any<Breadcrumb>(),
+        check { assertEquals(networkRequestData, it[TypeCheckHint.SENTRY_REPLAY_NETWORK_DETAILS]) },
+      )
+  }
+
+  @Test
+  fun `when setNetworkDetails is not called, no network details data is captured`() {
+    val sut = fixture.getSut()
+
+    sut.finish()
+
+    verify(fixture.scopes)
+      .addBreadcrumb(
+        any<Breadcrumb>(),
+        check { assertNull(it[TypeCheckHint.SENTRY_REPLAY_NETWORK_DETAILS]) },
+      )
+  }
+
   /** Retrieve all the spans started in the event using reflection. */
   private fun SentryOkHttpEvent.getEventDates() =
     getProperty<MutableMap<String, SentryDate>>("eventDates")

sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpInterceptorTest.kt

@@ -680,4 +680,39 @@ class SentryOkHttpInterceptorTest {
     assertNotNull(recordedRequest.getHeader(SentryTraceHeader.SENTRY_TRACE_HEADER))
     assertNull(recordedRequest.getHeader(W3CTraceparentHeader.TRACEPARENT_HEADER))
   }
+
+  @Test
+  fun `toMap handles duplicate headers correctly`() {
+    // Create a response with duplicate headers
+    val mockResponse =
+      MockResponse()
+        .setResponseCode(200)
+        .setBody("test")
+        .addHeader("Set-Cookie", "sessionId=123")
+        .addHeader("Set-Cookie", "userId=456")
+        .addHeader("Set-Cookie", "theme=dark")
+        .addHeader("Accept", "text/html")
+        .addHeader("Accept", "application/json")
+        .addHeader("Single-Header", "value")
+
+    fixture.server.enqueue(mockResponse)
+
+    // Execute request to get response with headers
+    val sut = fixture.getSut()
+    val response = sut.newCall(getRequest()).execute()
+    val headers = response.headers
+
+    // Optional: verify OkHttp preserves duplicate headers
+    assertEquals(3, headers.values("Set-Cookie").size)
+    assertEquals(2, headers.values("Accept").size)
+    assertEquals(1, headers.values("Single-Header").size)
+
+    val interceptor = SentryOkHttpInterceptor(fixture.scopes)
+    val headerMap = with(interceptor) { headers.toMap() }
+
+    // Duplicate headers will be collapsed into 1 concatenated entry with "; " separator
+    assertEquals("sessionId=123; userId=456; theme=dark", headerMap["Set-Cookie"])
+    assertEquals("text/html; application/json", headerMap["Accept"])
+    assertEquals("value", headerMap["Single-Header"])
+  }
 }

sentry-reactor/src/main/java/io/sentry/reactor/SentryReactorThreadLocalAccessor.java

@@ -16,7 +16,7 @@ public Object key() {
 
   @Override
   public IScopes getValue() {
-    return Sentry.getCurrentScopes();
+    return Sentry.getCurrentScopes(false);
   }
 
   @Override

sentry-samples/sentry-samples-android/src/main/cpp/native-sample.cpp

@@ -1,15 +1,15 @@
 #include <jni.h>
 #include <android/log.h>
 #include <sentry.h>
+#include <signal.h>
 
 #define TAG "sentry-sample"
 
 extern "C" {
 
 JNIEXPORT void JNICALL Java_io_sentry_samples_android_NativeSample_crash(JNIEnv *env, jclass cls) {
     __android_log_print(ANDROID_LOG_WARN, TAG, "About to crash.");
-    char *ptr = 0;
-    *ptr += 1;
+    raise(SIGSEGV);
 }
 
 JNIEXPORT void JNICALL Java_io_sentry_samples_android_NativeSample_message(JNIEnv *env, jclass cls) {