Merge branch 'main' into lcian/feat/spring-profiles-event-processor

Author: lcian

CHANGELOG.md

@@ -8,9 +8,12 @@
 
 ### Features
 
-- Create onCreate and onStart spans for all Activities ([#4025](https://github.com/getsentry/sentry-java/pull/4025))
 - A list of active Spring profiles is attached to the trace context and displayed in the Sentry UI when using our Spring or Spring Boot integrations ([#4147](https://github.com/getsentry/sentry-java/pull/4147))
   - This consists of an empty list when only the default profile is active
+- Create onCreate and onStart spans for all Activities ([#4025](https://github.com/getsentry/sentry-java/pull/4025))
+- Add split apks info to the `App` context ([#3193](https://github.com/getsentry/sentry-java/pull/3193))
+- Expose new `withSentryObservableEffect` method overload that accepts `SentryNavigationListener` as a parameter ([#4143](https://github.com/getsentry/sentry-java/pull/4143))
+  - This allows sharing the same `SentryNavigationListener` instance across fragments and composables to preserve the trace 
 
 ### Fixes
 
@@ -22,6 +25,8 @@
   - Fix `IllegalStateException` when registering `onDrawListener`
   - Fix SIGABRT native crashes on Motorola devices when encoding a video
 - Mention javadoc and sources for published artifacts in Gradle `.module` metadata ([#3936](https://github.com/getsentry/sentry-java/pull/3936))
+- (Jetpack Compose) Modifier.sentryTag now uses Modifier.Node ([#4029](https://github.com/getsentry/sentry-java/pull/4029))
+  - This allows Composables that use this modifier to be skippable
 
 ### Dependencies
 

buildSrc/src/main/java/Config.kt

@@ -208,6 +208,7 @@ object Config {
         val javaFaker = "com.github.javafaker:javafaker:1.0.2"
         val msgpack = "org.msgpack:msgpack-core:0.9.8"
         val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
+        val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:1.6.8"
     }
 
     object QualityPlugins {

sentry-android-core/api/sentry-android-core.api

@@ -195,6 +195,7 @@ public final class io/sentry/android/core/DeviceInfoUtil {
 	public static fun getInstance (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;)Lio/sentry/android/core/DeviceInfoUtil;
 	public fun getOperatingSystem ()Lio/sentry/protocol/OperatingSystem;
 	public fun getSideLoadedInfo ()Lio/sentry/android/core/ContextUtils$SideLoadedInfo;
+	public fun getSplitApksInfo ()Lio/sentry/android/core/ContextUtils$SplitApksInfo;
 	public fun getTotalMemory ()Ljava/lang/Long;
 	public static fun isCharging (Landroid/content/Intent;Lio/sentry/SentryOptions;)Ljava/lang/Boolean;
 	public static fun resetInstance ()V

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

@@ -404,6 +404,19 @@ private void setApp(final @NotNull SentryBaseEvent event, final @NotNull Object
       }
     }
 
+    try {
+      final ContextUtils.SplitApksInfo splitApksInfo =
+          DeviceInfoUtil.getInstance(context, options).getSplitApksInfo();
+      if (splitApksInfo != null) {
+        app.setSplitApks(splitApksInfo.isSplitApks());
+        if (splitApksInfo.getSplitNames() != null) {
+          app.setSplitNames(Arrays.asList(splitApksInfo.getSplitNames()));
+        }
+      }
+    } catch (Throwable e) {
+      options.getLogger().log(SentryLevel.ERROR, "Error getting split apks info.", e);
+    }
+
     event.getContexts().setApp(app);
   }
 

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

@@ -26,6 +26,7 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import org.jetbrains.annotations.ApiStatus;
@@ -63,6 +64,27 @@ public boolean isSideLoaded() {
     }
   }
 
+  static class SplitApksInfo {
+    // https://github.com/google/bundletool/blob/master/src/main/java/com/android/tools/build/bundletool/model/AndroidManifest.java#L257-L263
+    static final String SPLITS_REQUIRED = "com.android.vending.splits.required";
+
+    private final boolean isSplitApks;
+    private final String[] splitNames;
+
+    public SplitApksInfo(final boolean isSplitApks, final String[] splitNames) {
+      this.isSplitApks = isSplitApks;
+      this.splitNames = splitNames;
+    }
+
+    public boolean isSplitApks() {
+      return isSplitApks;
+    }
+
+    public @Nullable String[] getSplitNames() {
+      return splitNames;
+    }
+  }
+
   private ContextUtils() {}
 
   // to avoid doing a bunch of Binder calls we use LazyEvaluator to cache the values that are static
@@ -322,6 +344,26 @@ public static boolean isForegroundImportance() {
     return null;
   }
 
+  @SuppressWarnings({"deprecation"})
+  static @Nullable SplitApksInfo retrieveSplitApksInfo(
+      final @NotNull Context context, final @NotNull BuildInfoProvider buildInfoProvider) {
+    String[] splitNames = null;
+    final ApplicationInfo applicationInfo = getApplicationInfo(context, buildInfoProvider);
+    final PackageInfo packageInfo = getPackageInfo(context, buildInfoProvider);
+
+    if (packageInfo != null) {
+      splitNames = packageInfo.splitNames;
+      boolean isSplitApks = false;
+      if (applicationInfo != null && applicationInfo.metaData != null) {
+        isSplitApks = applicationInfo.metaData.getBoolean(SplitApksInfo.SPLITS_REQUIRED);
+      }
+
+      return new SplitApksInfo(isSplitApks, splitNames);
+    }
+
+    return null;
+  }
+
   /**
    * Get the human-facing Application name.
    *
@@ -422,6 +464,7 @@ public static boolean isForegroundImportance() {
   static void setAppPackageInfo(
       final @NotNull PackageInfo packageInfo,
       final @NotNull BuildInfoProvider buildInfoProvider,
+      final @Nullable DeviceInfoUtil deviceInfoUtil,
       final @NotNull App app) {
     app.setAppIdentifier(packageInfo.packageName);
     app.setAppVersion(packageInfo.versionName);
@@ -446,6 +489,19 @@ static void setAppPackageInfo(
       }
     }
     app.setPermissions(permissions);
+
+    if (deviceInfoUtil != null) {
+      try {
+        final ContextUtils.SplitApksInfo splitApksInfo = deviceInfoUtil.getSplitApksInfo();
+        if (splitApksInfo != null) {
+          app.setSplitApks(splitApksInfo.isSplitApks());
+          if (splitApksInfo.getSplitNames() != null) {
+            app.setSplitNames(Arrays.asList(splitApksInfo.getSplitNames()));
+          }
+        }
+      } catch (Throwable e) {
+      }
+    }
   }
 
   /**

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

@@ -239,7 +239,15 @@ private void setPackageInfo(final @NotNull SentryBaseEvent event, final @NotNull
       String versionCode = ContextUtils.getVersionCode(packageInfo, buildInfoProvider);
 
       setDist(event, versionCode);
-      ContextUtils.setAppPackageInfo(packageInfo, buildInfoProvider, app);
+
+      @Nullable DeviceInfoUtil deviceInfoUtil = null;
+      try {
+        deviceInfoUtil = this.deviceInfoUtil.get();
+      } catch (Throwable e) {
+        options.getLogger().log(SentryLevel.ERROR, "Failed to retrieve device info", e);
+      }
+
+      ContextUtils.setAppPackageInfo(packageInfo, buildInfoProvider, deviceInfoUtil, app);
     }
   }
 

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

@@ -49,6 +49,7 @@ public final class DeviceInfoUtil {
   private final @NotNull BuildInfoProvider buildInfoProvider;
   private final @Nullable Boolean isEmulator;
   private final @Nullable ContextUtils.SideLoadedInfo sideLoadedInfo;
+  private final @Nullable ContextUtils.SplitApksInfo splitApksInfo;
   private final @NotNull OperatingSystem os;
 
   private final @Nullable Long totalMem;
@@ -65,6 +66,7 @@ public DeviceInfoUtil(
     isEmulator = buildInfoProvider.isEmulator();
     sideLoadedInfo =
         ContextUtils.retrieveSideLoadedInfo(context, options.getLogger(), buildInfoProvider);
+    splitApksInfo = ContextUtils.retrieveSplitApksInfo(context, buildInfoProvider);
     final @Nullable ActivityManager.MemoryInfo memInfo =
         ContextUtils.getMemInfo(context, options.getLogger());
     if (memInfo != null) {
@@ -188,6 +190,11 @@ public ContextUtils.SideLoadedInfo getSideLoadedInfo() {
     return sideLoadedInfo;
   }
 
+  @Nullable
+  public ContextUtils.SplitApksInfo getSplitApksInfo() {
+    return splitApksInfo;
+  }
+
   private void setDeviceIO(final @NotNull Device device, final boolean includeDynamicData) {
     final Intent batteryIntent = getBatteryIntent();
     if (batteryIntent != null) {

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

@@ -124,7 +124,7 @@ public static Map<String, Object> serializeScope(
           ContextUtils.getPackageInfo(
               context, PackageManager.GET_PERMISSIONS, options.getLogger(), buildInfoProvider);
       if (packageInfo != null) {
-        ContextUtils.setAppPackageInfo(packageInfo, buildInfoProvider, app);
+        ContextUtils.setAppPackageInfo(packageInfo, buildInfoProvider, deviceInfoUtil, app);
       }
       scope.getContexts().setApp(app);
 

sentry-android-core/src/test/java/io/sentry/android/core/ContextUtilsTest.kt

@@ -7,6 +7,9 @@ import android.app.ActivityManager.RunningAppProcessInfo
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.IntentFilter
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Process
 import androidx.test.core.app.ApplicationProvider
@@ -26,6 +29,7 @@ import org.robolectric.shadows.ShadowActivityManager
 import org.robolectric.shadows.ShadowBuild
 import kotlin.test.BeforeTest
 import kotlin.test.Test
+import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
@@ -116,6 +120,38 @@ class ContextUtilsTest {
         assertEquals("play.google.com", sideLoadedInfo.installerStore)
     }
 
+    @Test
+    fun `given a valid PackageInfo, returns valid splitNames`() {
+        val splitNames = arrayOf<String?>("config.arm64_v8a")
+        val mockedContext = mock<Context>()
+        val mockedPackageManager = mock<PackageManager>()
+        val mockedApplicationInfo = mock<ApplicationInfo>()
+        val mockedPackageInfo = mock<PackageInfo>()
+        mockedPackageInfo.splitNames = splitNames
+
+        whenever(mockedContext.packageName).thenReturn("dummy")
+
+        whenever(
+            mockedPackageManager.getApplicationInfo(
+                any<String>(),
+                any<PackageManager.ApplicationInfoFlags>()
+            )
+        ).thenReturn(mockedApplicationInfo)
+
+        whenever(
+            mockedPackageManager.getPackageInfo(
+                any<String>(),
+                any<PackageManager.PackageInfoFlags>()
+            )
+        ).thenReturn(mockedPackageInfo)
+
+        whenever(mockedContext.packageManager).thenReturn(mockedPackageManager)
+
+        val splitApksInfo =
+            ContextUtils.retrieveSplitApksInfo(mockedContext, BuildInfoProvider(logger))
+        assertContentEquals(splitNames, splitApksInfo!!.splitNames)
+    }
+
     @Test
     @Config(qualifiers = "w360dp-h640dp-xxhdpi")
     fun `when display metrics specified, getDisplayMetrics returns correct values`() {

sentry-compose/api/android/sentry-compose.api

@@ -18,6 +18,7 @@ public final class io/sentry/compose/SentryModifier {
 }
 
 public final class io/sentry/compose/SentryNavigationIntegrationKt {
+	public static final fun withSentryObservableEffect (Landroidx/navigation/NavHostController;Lio/sentry/android/navigation/SentryNavigationListener;Landroidx/compose/runtime/Composer;I)Landroidx/navigation/NavHostController;
 	public static final fun withSentryObservableEffect (Landroidx/navigation/NavHostController;ZZLandroidx/compose/runtime/Composer;II)Landroidx/navigation/NavHostController;
 }