Merge branch 'main' into fix/ci/remove-obsolete-ndk-symbols

Author: markushi

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased
+
+### Improvements
+
+- Session Replay: Use main thread looper to schedule replay capture ([#4542](https://github.com/getsentry/sentry-java/pull/4542))
+
+### Fixes
+
+- Cache network capabilities and status to reduce IPC calls ([#4560](https://github.com/getsentry/sentry-java/pull/4560))
+- Deduplicate battery breadcrumbs ([#4561](https://github.com/getsentry/sentry-java/pull/4561))
+
+
 ## 8.18.0
 
 ### Features

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

@@ -28,6 +28,7 @@
 import io.sentry.android.core.internal.gestures.AndroidViewGestureTargetLocator;
 import io.sentry.android.core.internal.modules.AssetsModulesLoader;
 import io.sentry.android.core.internal.util.AndroidConnectionStatusProvider;
+import io.sentry.android.core.internal.util.AndroidCurrentDateProvider;
 import io.sentry.android.core.internal.util.AndroidThreadChecker;
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.android.core.performance.AppStartMetrics;
@@ -157,7 +158,8 @@ static void initializeIntegrationsAndProcessors(
 
     if (options.getConnectionStatusProvider() instanceof NoOpConnectionStatusProvider) {
       options.setConnectionStatusProvider(
-          new AndroidConnectionStatusProvider(context, options.getLogger(), buildInfoProvider));
+          new AndroidConnectionStatusProvider(
+              context, options, buildInfoProvider, AndroidCurrentDateProvider.getInstance()));
     }
 
     if (options.getCacheDirPath() != null) {

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

@@ -71,6 +71,8 @@ public final class SystemEventsBreadcrumbsIntegration implements Integration, Cl
   private volatile boolean isStopped = false;
   private volatile IntentFilter filter = null;
   private final @NotNull AutoClosableReentrantLock receiverLock = new AutoClosableReentrantLock();
+  // Track previous battery state to avoid duplicate breadcrumbs when values haven't changed
+  private @Nullable BatteryState previousBatteryState;
 
   public SystemEventsBreadcrumbsIntegration(final @NotNull Context context) {
     this(context, getDefaultActionsInternal());
@@ -331,7 +333,7 @@ public void onStop(@NonNull LifecycleOwner owner) {
     }
   }
 
-  static final class SystemEventsBroadcastReceiver extends BroadcastReceiver {
+  final class SystemEventsBroadcastReceiver extends BroadcastReceiver {
 
     private static final long DEBOUNCE_WAIT_TIME_MS = 60 * 1000;
     private final @NotNull IScopes scopes;
@@ -350,19 +352,36 @@ public void onReceive(final Context context, final @NotNull Intent intent) {
       final @Nullable String action = intent.getAction();
       final boolean isBatteryChanged = ACTION_BATTERY_CHANGED.equals(action);
 
-      // aligning with iOS which only captures battery status changes every minute at maximum
-      if (isBatteryChanged && batteryChangedDebouncer.checkForDebounce()) {
-        return;
+      @Nullable BatteryState batteryState = null;
+      if (isBatteryChanged) {
+        if (batteryChangedDebouncer.checkForDebounce()) {
+          // aligning with iOS which only captures battery status changes every minute at maximum
+          return;
+        }
+
+        // For battery changes, check if the actual values have changed
+        final @Nullable Float batteryLevel = DeviceInfoUtil.getBatteryLevel(intent, options);
+        final @Nullable Integer currentBatteryLevel =
+            batteryLevel != null ? batteryLevel.intValue() : null;
+        final @Nullable Boolean currentChargingState = DeviceInfoUtil.isCharging(intent, options);
+        batteryState = new BatteryState(currentBatteryLevel, currentChargingState);
+
+        // Only create breadcrumb if battery state has actually changed
+        if (batteryState.equals(previousBatteryState)) {
+          return;
+        }
+
+        previousBatteryState = batteryState;
       }
 
+      final BatteryState state = batteryState;
       final long now = System.currentTimeMillis();
       try {
         options
             .getExecutorService()
             .submit(
                 () -> {
-                  final Breadcrumb breadcrumb =
-                      createBreadcrumb(now, intent, action, isBatteryChanged);
+                  final Breadcrumb breadcrumb = createBreadcrumb(now, intent, action, state);
                   final Hint hint = new Hint();
                   hint.set(ANDROID_INTENT, intent);
                   scopes.addBreadcrumb(breadcrumb, hint);
@@ -411,7 +430,7 @@ String getStringAfterDotFast(final @Nullable String str) {
         final long timeMs,
         final @NotNull Intent intent,
         final @Nullable String action,
-        boolean isBatteryChanged) {
+        final @Nullable BatteryState batteryState) {
       final Breadcrumb breadcrumb = new Breadcrumb(timeMs);
       breadcrumb.setType("system");
       breadcrumb.setCategory("device.event");
@@ -420,14 +439,12 @@ String getStringAfterDotFast(final @Nullable String str) {
         breadcrumb.setData("action", shortAction);
       }
 
-      if (isBatteryChanged) {
-        final Float batteryLevel = DeviceInfoUtil.getBatteryLevel(intent, options);
-        if (batteryLevel != null) {
-          breadcrumb.setData("level", batteryLevel);
+      if (batteryState != null) {
+        if (batteryState.level != null) {
+          breadcrumb.setData("level", batteryState.level);
         }
-        final Boolean isCharging = DeviceInfoUtil.isCharging(intent, options);
-        if (isCharging != null) {
-          breadcrumb.setData("charging", isCharging);
+        if (batteryState.charging != null) {
+          breadcrumb.setData("charging", batteryState.charging);
         }
       } else {
         final Bundle extras = intent.getExtras();
@@ -458,4 +475,26 @@ String getStringAfterDotFast(final @Nullable String str) {
       return breadcrumb;
     }
   }
+
+  static final class BatteryState {
+    private final @Nullable Integer level;
+    private final @Nullable Boolean charging;
+
+    BatteryState(final @Nullable Integer level, final @Nullable Boolean charging) {
+      this.level = level;
+      this.charging = charging;
+    }
+
+    @Override
+    public boolean equals(final @Nullable Object other) {
+      if (!(other instanceof BatteryState)) return false;
+      BatteryState that = (BatteryState) other;
+      return Objects.equals(level, that.level) && Objects.equals(charging, that.charging);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(level, charging);
+    }
+  }
 }