Merge branch '8.x.x' into feat/merge-main-into-8-x-7-16

CHANGELOG.md

@@ -2,13 +2,20 @@
 
 ## Unreleased
 
+### Breaking Changes
+
+- The Android minSdk level for all Android modules is now 21 ([#3852](https://github.com/getsentry/sentry-java/pull/3852))
+- The minSdk level for sentry-android-ndk changed from 19 to 21 ([#3851](https://github.com/getsentry/sentry-java/pull/3851))
+
 ### Features
 
 - Add `globalHubMode` to options ([#3805](https://github.com/getsentry/sentry-java/pull/3805))
   - `globalHubMode` used to only be a param on `Sentry.init`. To make it easier to be used in e.g. Desktop environments, we now additionally added it as an option on SentryOptions that can also be set via `sentry.properties`.
   - If both the param on `Sentry.init` and the option are set, the option will win. By default the option is set to `null` meaning whatever is passed to `Sentry.init` takes effect.
 - Lazy uuid generation for SentryId and SpanId ([#3770](https://github.com/getsentry/sentry-java/pull/3770))
 - Use a separate `Random` instance per thread to improve SDK performance ([#3835](https://github.com/getsentry/sentry-java/pull/3835))
+- Android 15: Add support for 16KB page sizes ([#3851](https://github.com/getsentry/sentry-java/pull/3851))
+  - See https://developer.android.com/guide/practices/page-sizes for more details
 
 ### Fixes
 
@@ -17,6 +24,12 @@
 - Accept manifest integer values when requiring floating values ([#3823](https://github.com/getsentry/sentry-java/pull/3823))
 
 
+### Dependencies
+
+- Bump Native SDK from v0.7.5 to v0.7.8 ([#3851](https://github.com/getsentry/sentry-java/pull/3851))
+    - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#078)
+    - [diff](https://github.com/getsentry/sentry-native/compare/0.7.5...0.7.8)
+
 ### Behavioural Changes
 
 - (Android) Enable Performance V2 by default ([#3824](https://github.com/getsentry/sentry-java/pull/3824))

README.md

@@ -18,24 +18,24 @@ Sentry SDK for Java and Android
 
 | Packages                                | Maven Central                                                                                                                                                                                                                        | Minimum Android API Version |
 |-----------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ------- |
-| sentry-android                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android)                                                   | 19 |
-| sentry-android-core                     | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-core)                                         | 19 |
-| sentry-android-ndk                      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-ndk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-ndk)                                           | 19 |
-| sentry-android-timber                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-timber/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-timber)                                     | 19 |
-| sentry-android-fragment                 | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-fragment/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-fragment)                                 | 19 |
-| sentry-android-navigation               | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-navigation/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-navigation)                             | 19 |
-| sentry-android-sqlite                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-sqlite/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-sqlite)                                     | 19 |
+| sentry-android                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android)                                                   | 21 |
+| sentry-android-core                     | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-core)                                         | 21 |
+| sentry-android-ndk                      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-ndk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-ndk)                                           | 21 |
+| sentry-android-timber                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-timber/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-timber)                                     | 21 |
+| sentry-android-fragment                 | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-fragment/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-fragment)                                 | 21 |
+| sentry-android-navigation               | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-navigation/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-navigation)                             | 21 |
+| sentry-android-sqlite                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-sqlite/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-sqlite)                                     | 21 |
 | sentry-android-replay                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-replay/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-android-replay)                                     | 26 |
 | sentry-compose-android                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-android/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-android)                                   | 21 |
 | sentry-compose-desktop                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-desktop/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose-desktop)                                   | 
 | sentry-compose                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-compose)                                                   | 
 | sentry-apache-http-client-5             | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apache-http-client-5/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apache-http-client-5)                         |
-| sentry                                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry)                                                                   | 19 |
+| sentry                                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry)                                                                   | 21 |
 | sentry-jul                              | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-jul/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-jul)                                                           |
 | sentry-jdbc                             | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-jdbc)                                                         |
-| sentry-apollo                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo)                                                     | 19 |
-| sentry-apollo-3                         | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-3/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-3)                                                 | 19 |
-| sentry-kotlin-extensions                | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-extensions)                               | 19 |
+| sentry-apollo                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo)                                                     | 21 |
+| sentry-apollo-3                         | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-3/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-3)                                                 | 21 |
+| sentry-kotlin-extensions                | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-extensions)                               | 21 |
 | sentry-servlet                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet)                                                   | |
 | sentry-servlet-jakarta                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet-jakarta/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet-jakarta)                                   | |
 | sentry-spring-boot                      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot)                                           |

buildSrc/src/main/java/Config.kt

@@ -33,11 +33,7 @@ object Config {
     object Android {
         private val sdkVersion = 34
 
-        val minSdkVersion = 19
-        val minSdkVersionOkHttp = 21
-        val minSdkVersionReplay = 19
-        val minSdkVersionNdk = 19
-        val minSdkVersionCompose = 21
+        val minSdkVersion = 21
         val targetSdkVersion = sdkVersion
         val compileSdkVersion = sdkVersion
 
@@ -156,6 +152,8 @@ object Config {
 
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
 
+        val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.7.8"
+
         object OpenTelemetry {
             val otelVersion = "1.41.0"
             val otelAlphaVersion = "$otelVersion-alpha"

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

@@ -37,7 +37,7 @@ public final class io/sentry/android/core/ActivityLifecycleIntegration : android
 }
 
 public final class io/sentry/android/core/AndroidCpuCollector : io/sentry/IPerformanceSnapshotCollector {
-	public fun <init> (Lio/sentry/ILogger;Lio/sentry/android/core/BuildInfoProvider;)V
+	public fun <init> (Lio/sentry/ILogger;)V
 	public fun collect (Lio/sentry/PerformanceCollectionData;)V
 	public fun setup ()V
 }
@@ -64,7 +64,7 @@ public class io/sentry/android/core/AndroidMemoryCollector : io/sentry/IPerforma
 
 public class io/sentry/android/core/AndroidProfiler {
 	protected final field lock Lio/sentry/util/AutoClosableReentrantLock;
-	public fun <init> (Ljava/lang/String;ILio/sentry/android/core/internal/util/SentryFrameMetricsCollector;Lio/sentry/ISentryExecutorService;Lio/sentry/ILogger;Lio/sentry/android/core/BuildInfoProvider;)V
+	public fun <init> (Ljava/lang/String;ILio/sentry/android/core/internal/util/SentryFrameMetricsCollector;Lio/sentry/ISentryExecutorService;Lio/sentry/ILogger;)V
 	public fun close ()V
 	public fun endAndCollect (ZLjava/util/List;)Lio/sentry/android/core/AndroidProfiler$ProfileEndData;
 	public fun start ()Lio/sentry/android/core/AndroidProfiler$ProfileStartData;

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

@@ -1,7 +1,5 @@
 package io.sentry.android.core;
 
-import android.annotation.SuppressLint;
-import android.os.Build;
 import android.os.SystemClock;
 import android.system.Os;
 import android.system.OsConstants;
@@ -41,35 +39,25 @@ public final class AndroidCpuCollector implements IPerformanceSnapshotCollector
   private final @NotNull File selfStat = new File("/proc/self/stat");
 
   private final @NotNull ILogger logger;
-  private final @NotNull BuildInfoProvider buildInfoProvider;
   private boolean isEnabled = false;
   private final @NotNull Pattern newLinePattern = Pattern.compile("[\n\t\r ]");
 
-  public AndroidCpuCollector(
-      final @NotNull ILogger logger, final @NotNull BuildInfoProvider buildInfoProvider) {
+  public AndroidCpuCollector(final @NotNull ILogger logger) {
     this.logger = Objects.requireNonNull(logger, "Logger is required.");
-    this.buildInfoProvider =
-        Objects.requireNonNull(buildInfoProvider, "BuildInfoProvider is required.");
   }
 
-  @SuppressLint("NewApi")
   @Override
   public void setup() {
-    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP) {
-      isEnabled = false;
-      return;
-    }
     isEnabled = true;
     clockSpeedHz = Os.sysconf(OsConstants._SC_CLK_TCK);
     numCores = Os.sysconf(OsConstants._SC_NPROCESSORS_CONF);
     nanosecondsPerClockTick = NANOSECOND_PER_SECOND / (double) clockSpeedHz;
     lastCpuNanos = readTotalCpuNanos();
   }
 
-  @SuppressLint("NewApi")
   @Override
   public void collect(final @NotNull PerformanceCollectionData performanceCollectionData) {
-    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP || !isEnabled) {
+    if (!isEnabled) {
       return;
     }
     final long nowNanos = SystemClock.elapsedRealtimeNanos();

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

@@ -212,8 +212,7 @@ static void initializeIntegrationsAndProcessors(
     options.setThreadChecker(AndroidThreadChecker.getInstance());
     if (options.getPerformanceCollectors().isEmpty()) {
       options.addPerformanceCollector(new AndroidMemoryCollector());
-      options.addPerformanceCollector(
-          new AndroidCpuCollector(options.getLogger(), buildInfoProvider));
+      options.addPerformanceCollector(new AndroidCpuCollector(options.getLogger()));
 
       if (options.isEnablePerformanceV2()) {
         options.addPerformanceCollector(

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

@@ -1,7 +1,6 @@
 package io.sentry.android.core;
 
 import android.annotation.SuppressLint;
-import android.os.Build;
 import android.os.Debug;
 import android.os.Process;
 import android.os.SystemClock;
@@ -94,7 +93,6 @@ public ProfileEndData(
   private final @NotNull ArrayDeque<ProfileMeasurementValue> frozenFrameRenderMeasurements =
       new ArrayDeque<>();
   private final @NotNull Map<String, ProfileMeasurement> measurementsMap = new HashMap<>();
-  private final @NotNull BuildInfoProvider buildInfoProvider;
   private final @NotNull ISentryExecutorService executorService;
   private final @NotNull ILogger logger;
   private boolean isRunning = false;
@@ -105,17 +103,14 @@ public AndroidProfiler(
       final int intervalUs,
       final @NotNull SentryFrameMetricsCollector frameMetricsCollector,
       final @NotNull ISentryExecutorService executorService,
-      final @NotNull ILogger logger,
-      final @NotNull BuildInfoProvider buildInfoProvider) {
+      final @NotNull ILogger logger) {
     this.traceFilesDir =
         new File(Objects.requireNonNull(tracesFilesDirPath, "TracesFilesDirPath is required"));
     this.intervalUs = intervalUs;
     this.logger = Objects.requireNonNull(logger, "Logger is required");
     this.executorService = Objects.requireNonNull(executorService, "ExecutorService is required.");
     this.frameMetricsCollector =
         Objects.requireNonNull(frameMetricsCollector, "SentryFrameMetricsCollector is required");
-    this.buildInfoProvider =
-        Objects.requireNonNull(buildInfoProvider, "The BuildInfoProvider is required.");
   }
 
   @SuppressLint("NewApi")
@@ -133,9 +128,6 @@ public AndroidProfiler(
         return null;
       }
 
-      // and SystemClock.elapsedRealtimeNanos() since Jelly Bean
-      if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP) return null;
-
       // We create a file with a uuid name, so no need to check if it already exists
       traceFile = new File(traceFilesDir, UUID.randomUUID() + ".trace");
 
@@ -232,9 +224,6 @@ public void onFrameMetricCollected(
         return null;
       }
 
-      // and SystemClock.elapsedRealtimeNanos() since Jelly Bean
-      if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP) return null;
-
       try {
         // If there is any problem with the file this method could throw, but the start is also
         // wrapped, so this should never happen (except for tests, where this is the only method
@@ -304,12 +293,6 @@ public void close() {
   private void putPerformanceCollectionDataInMeasurements(
       final @Nullable List<PerformanceCollectionData> performanceCollectionData) {
 
-    // onTransactionStart() is only available since Lollipop
-    // and SystemClock.elapsedRealtimeNanos() since Jelly Bean
-    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP) {
-      return;
-    }
-
     // This difference is required, since the PerformanceCollectionData timestamps are expressed in
     // terms of System.currentTimeMillis() and measurements timestamps require the nanoseconds since
     // the beginning, expressed with SystemClock.elapsedRealtimeNanos()

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

@@ -121,8 +121,7 @@ private void init() {
             (int) SECONDS.toMicros(1) / profilingTracesHz,
             frameMetricsCollector,
             executorService,
-            logger,
-            buildInfoProvider);
+            logger);
   }
 
   @Override

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

@@ -629,7 +629,7 @@ private void setDevice(final @NotNull SentryBaseEvent event) {
     device.setFamily(ContextUtils.getFamily(options.getLogger()));
     device.setModel(Build.MODEL);
     device.setModelId(Build.ID);
-    device.setArchs(ContextUtils.getArchitectures(buildInfoProvider));
+    device.setArchs(ContextUtils.getArchitectures());
 
     final ActivityManager.MemoryInfo memInfo =
         ContextUtils.getMemInfo(context, options.getLogger());

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

@@ -293,16 +293,8 @@ public static boolean isForegroundImportance() {
     return Settings.Global.getString(context.getContentResolver(), "device_name");
   }
 
-  @SuppressWarnings("deprecation")
-  @SuppressLint("NewApi") // we're wrapping into if-check with sdk version
-  static @NotNull String[] getArchitectures(final @NotNull BuildInfoProvider buildInfoProvider) {
-    final String[] supportedAbis;
-    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.LOLLIPOP) {
-      supportedAbis = Build.SUPPORTED_ABIS;
-    } else {
-      supportedAbis = new String[] {Build.CPU_ABI, Build.CPU_ABI2};
-    }
-    return supportedAbis;
+  static @NotNull String[] getArchitectures() {
+    return Build.SUPPORTED_ABIS;
   }
 
   /**