Merge branch 'main' into feat/profiling-remove-vendored-code

Author: lbloder

.github/workflows/agp-matrix.yml

@@ -60,7 +60,7 @@ jobs:
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # pin@v2
         with:
           api-level: 30
           target: aosp_atd
@@ -79,7 +79,7 @@ jobs:
 
       # We tried to use the cache action to cache gradle stuff, but it made tests slower and timeout
       - name: Run instrumentation tests
-        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # pin@v2
         with:
           api-level: 30
           target: aosp_atd

.github/workflows/generate-javadocs.yml

@@ -26,7 +26,7 @@ jobs:
         run: |
           ./gradlew aggregateJavadocs
       - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # pin@4.7.3
+        uses: JamesIves/github-pages-deploy-action@4a3abc783e1a24aeb44c16e869ad83caf6b4cc23 # pin@4.7.4
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH: gh-pages

.github/workflows/integration-tests-ui-critical.yml

@@ -96,7 +96,7 @@ jobs:
 
       - name: Create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # pin@v2
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}
@@ -120,7 +120,7 @@ jobs:
           version: ${{env.MAESTRO_VERSION}}
 
       - name: Run tests
-        uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2.34.0
+        uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # pin@v2.35.0
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}

CHANGELOG.md

@@ -13,6 +13,8 @@
 - Fix visual artifacts for the Canvas strategy on some devices ([#4861](https://github.com/getsentry/sentry-java/pull/4861))
 - [Config] Trim whitespace on properties path ([#4880](https://github.com/getsentry/sentry-java/pull/4880))
 - Only set `DefaultReplayBreadcrumbConverter` if replay is available ([#4888](https://github.com/getsentry/sentry-java/pull/4888))
+- Session Replay: Cache connection status instead of using blocking calls ([#4891](https://github.com/getsentry/sentry-java/pull/4891))
+- Fix log count in client reports ([#4869](https://github.com/getsentry/sentry-java/pull/4869))
 
 ### Improvements
 

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

@@ -190,6 +190,7 @@ private void start() {
       }
 
       // If device is offline, we don't start the profiler, to avoid flooding the cache
+      // TODO .getConnectionStatus() may be blocking, investigate if this can be done async
       if (scopes.getOptions().getConnectionStatusProvider().getConnectionStatus() == DISCONNECTED) {
         logger.log(SentryLevel.WARNING, "Device is offline. Stopping profiler.");
         // Let's stop and reset profiler id, as the profile is now broken anyway

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

@@ -203,6 +203,7 @@ private void setDeviceIO(final @NotNull Device device, final boolean includeDyna
       device.setBatteryTemperature(getBatteryTemperature(batteryIntent));
     }
 
+    // TODO .getConnectionStatus() may be blocking, investigate if this can be done async
     Boolean connected;
     switch (options.getConnectionStatusProvider().getConnectionStatus()) {
       case DISCONNECTED:

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

@@ -95,6 +95,7 @@ public class ReplayIntegration(
     this.gestureRecorderProvider = gestureRecorderProvider
   }
 
+  @Volatile private var lastKnownConnectionStatus: ConnectionStatus = ConnectionStatus.UNKNOWN
   private var debugMaskingEnabled: Boolean = false
   private lateinit var options: SentryOptions
   private var scopes: IScopes? = null
@@ -219,7 +220,7 @@ public class ReplayIntegration(
 
       if (
         isManualPause.get() ||
-          options.connectionStatusProvider.connectionStatus == DISCONNECTED ||
+          lastKnownConnectionStatus == DISCONNECTED ||
           scopes?.rateLimiter?.isActiveForCategory(All) == true ||
           scopes?.rateLimiter?.isActiveForCategory(Replay) == true
       ) {
@@ -335,6 +336,8 @@ public class ReplayIntegration(
   }
 
   override fun onConnectionStatusChanged(status: ConnectionStatus) {
+    lastKnownConnectionStatus = status
+
     if (captureStrategy !is SessionCaptureStrategy) {
       // we only want to stop recording when offline for session mode
       return
@@ -375,7 +378,7 @@ public class ReplayIntegration(
   private fun checkCanRecord() {
     if (
       captureStrategy is SessionCaptureStrategy &&
-        (options.connectionStatusProvider.connectionStatus == DISCONNECTED ||
+        (lastKnownConnectionStatus == DISCONNECTED ||
           scopes?.rateLimiter?.isActiveForCategory(All) == true ||
           scopes?.rateLimiter?.isActiveForCategory(Replay) == true)
     ) {

sentry-android-replay/src/test/java/io/sentry/android/replay/ReplayIntegrationTest.kt

@@ -120,7 +120,6 @@ class ReplayIntegrationTest {
       context: Context,
       sessionSampleRate: Double = 1.0,
       onErrorSampleRate: Double = 1.0,
-      isOffline: Boolean = false,
       isRateLimited: Boolean = false,
       recorderProvider: (() -> Recorder)? = null,
       replayCaptureStrategyProvider: ((isFullSession: Boolean) -> CaptureStrategy)? = null,
@@ -130,9 +129,6 @@ class ReplayIntegrationTest {
       options.run {
         sessionReplay.onErrorSampleRate = onErrorSampleRate
         sessionReplay.sessionSampleRate = sessionSampleRate
-        connectionStatusProvider = mock {
-          on { connectionStatus }.thenReturn(if (isOffline) DISCONNECTED else CONNECTED)
-        }
       }
       if (isRateLimited) {
         whenever(rateLimiter.isActiveForCategory(any())).thenReturn(true)
@@ -623,13 +619,13 @@ class ReplayIntegrationTest {
         context,
         recorderProvider = { recorder },
         replayCaptureStrategyProvider = { captureStrategy },
-        isOffline = true,
       )
 
     replay.register(fixture.scopes, fixture.options)
     replay.start()
     replay.onScreenshotRecorded(mock<Bitmap>())
 
+    replay.onConnectionStatusChanged(DISCONNECTED)
     verify(recorder).pause()
   }
 
@@ -903,10 +899,10 @@ class ReplayIntegrationTest {
         context,
         recorderProvider = { recorder },
         replayCaptureStrategyProvider = { captureStrategy },
-        isOffline = true,
       )
 
     replay.register(fixture.scopes, fixture.options)
+    replay.onConnectionStatusChanged(DISCONNECTED)
     replay.start()
 
     replay.pause()

sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java

@@ -6,6 +6,7 @@
 import io.sentry.SentryEnvelopeItem;
 import io.sentry.SentryItemType;
 import io.sentry.SentryLevel;
+import io.sentry.SentryLogEvents;
 import io.sentry.SentryOptions;
 import io.sentry.protocol.SentrySpan;
 import io.sentry.protocol.SentryTransaction;
@@ -98,9 +99,19 @@ public void recordLostEnvelopeItem(
                 reason.getReason(), DataCategory.Span.getCategory(), spans.size() + 1L);
             executeOnDiscard(reason, DataCategory.Span, spans.size() + 1L);
           }
+          recordLostEventInternal(reason.getReason(), itemCategory.getCategory(), 1L);
+          executeOnDiscard(reason, itemCategory, 1L);
+        } else if (itemCategory.equals(DataCategory.LogItem)) {
+          final @Nullable SentryLogEvents logs = envelopeItem.getLogs(options.getSerializer());
+          if (logs != null) {
+            final long count = logs.getItems().size();
+            recordLostEventInternal(reason.getReason(), itemCategory.getCategory(), count);
+            executeOnDiscard(reason, itemCategory, count);
+          }
+        } else {
+          recordLostEventInternal(reason.getReason(), itemCategory.getCategory(), 1L);
+          executeOnDiscard(reason, itemCategory, 1L);
         }
-        recordLostEventInternal(reason.getReason(), itemCategory.getCategory(), 1L);
-        executeOnDiscard(reason, itemCategory, 1L);
       }
     } catch (Throwable e) {
       options.getLogger().log(SentryLevel.ERROR, e, "Unable to record lost envelope item.");

sentry/src/test/java/io/sentry/clientreport/ClientReportTest.kt

@@ -16,6 +16,10 @@ import io.sentry.SentryEnvelope
 import io.sentry.SentryEnvelopeHeader
 import io.sentry.SentryEnvelopeItem
 import io.sentry.SentryEvent
+import io.sentry.SentryLogEvent
+import io.sentry.SentryLogEvents
+import io.sentry.SentryLogLevel
+import io.sentry.SentryLongDate
 import io.sentry.SentryOptions
 import io.sentry.SentryReplayEvent
 import io.sentry.SentryTracer
@@ -347,6 +351,34 @@ class ClientReportTest {
     verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Profile, 1)
   }
 
+  @Test
+  fun `recording lost client report counts log entries`() {
+    val onDiscardMock = mock<SentryOptions.OnDiscardCallback>()
+    givenClientReportRecorder { options -> options.onDiscard = onDiscardMock }
+
+    val envelope =
+      testHelper.newEnvelope(
+        SentryEnvelopeItem.fromLogs(
+          opts.serializer,
+          SentryLogEvents(
+            listOf(
+              SentryLogEvent(SentryId(), SentryLongDate(1), "log message 1", SentryLogLevel.ERROR),
+              SentryLogEvent(SentryId(), SentryLongDate(2), "log message 2", SentryLogLevel.WARN),
+            )
+          ),
+        )
+      )
+
+    clientReportRecorder.recordLostEnvelopeItem(DiscardReason.NETWORK_ERROR, envelope.items.first())
+
+    verify(onDiscardMock, times(1)).execute(DiscardReason.NETWORK_ERROR, DataCategory.LogItem, 2)
+
+    val clientReport = clientReportRecorder.resetCountsAndGenerateClientReport()
+    val logItem =
+      clientReport!!.discardedEvents!!.first { it.category == DataCategory.LogItem.category }
+    assertEquals(2, logItem.quantity)
+  }
+
   private fun givenClientReportRecorder(
     callback: Sentry.OptionsConfiguration<SentryOptions>? = null
   ) {