Merge main into 8.x.x again

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,7 @@ jobs:
           gradle-home-cache-cleanup: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # pin@v2
+        uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # pin@v2
         with:
           languages: ${{ matrix.language }}
 
@@ -55,4 +55,4 @@ jobs:
           ./gradlew buildForCodeQL
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # pin@v2
+        uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # pin@v2

README.md

@@ -57,7 +57,13 @@ Sentry SDK for Java and Android
 | sentry-opentelemetry-core               | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-core)                             |
 | sentry-okhttp                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-okhttp/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-okhttp)                                                     |
 
+# Releases
 
+This repo uses the following ways to release SDK updates:
+
+- `Pre-release`: We create pre-releases (alpha, beta, RC,…) for larger and potentially more impactful changes, such as new features or major versions.
+- `Latest`: We continuously release major/minor/hotfix versions from the `main` branch. These releases go through all our internal quality gates and are very safe to use and intended to be the default for most teams.
+- `Stable`: We promote releases from `Latest` when they have been used in the field for some time and in scale, considering time since release, adoption, and other quality and stability metrics. These releases will be indicated on the releases page (https://github.com/getsentry/sentry-java/releases/) with the `Stable` suffix.
 
 # Useful links and docs
 

buildSrc/src/main/java/Config.kt

@@ -53,7 +53,7 @@ object Config {
         val appCompat = "androidx.appcompat:appcompat:1.3.0"
         val timber = "com.jakewharton.timber:timber:4.7.1"
         val okhttp = "com.squareup.okhttp3:okhttp:$okHttpVersion"
-        val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"
+        val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.14"
         val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.3"
 
         private val lifecycleVersion = "2.2.0"
@@ -148,8 +148,11 @@ object Config {
         val composeActivity = "androidx.activity:activity-compose:1.4.0"
         val composeFoundation = "androidx.compose.foundation:foundation:$composeVersion"
         val composeUi = "androidx.compose.ui:ui:$composeVersion"
+
+        val composeUiReplay = "androidx.compose.ui:ui:1.5.0" // Note: don't change without testing forwards compatibility
         val composeFoundationLayout = "androidx.compose.foundation:foundation-layout:$composeVersion"
         val composeMaterial = "androidx.compose.material3:material3:1.0.0-alpha13"
+        val composeCoil = "io.coil-kt:coil-compose:2.0.0"
 
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
 
@@ -199,6 +202,7 @@ object Config {
         val hsqldb = "org.hsqldb:hsqldb:2.6.1"
         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"
     }
 
     object QualityPlugins {

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

@@ -160,6 +160,7 @@ public final class io/sentry/android/core/BuildInfoProvider {
 }
 
 public final class io/sentry/android/core/ContextUtils {
+	public static fun getApplicationContext (Landroid/content/Context;)Landroid/content/Context;
 	public static fun isForegroundImportance ()Z
 }
 

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

@@ -394,7 +394,7 @@ public void onActivityCreated(
 
       firstActivityCreated = true;
 
-      if (fullyDisplayedReporter != null) {
+      if (performanceEnabled && ttfdSpan != null && fullyDisplayedReporter != null) {
         fullyDisplayedReporter.registerFullyDrawnListener(() -> onFullFrameDrawn(ttfdSpan));
       }
     }

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

@@ -92,10 +92,7 @@ static void loadDefaultAndMetadataOptions(
       final @NotNull BuildInfoProvider buildInfoProvider) {
     Objects.requireNonNull(context, "The context is required.");
 
-    // it returns null if ContextImpl, so let's check for nullability
-    if (context.getApplicationContext() != null) {
-      context = context.getApplicationContext();
-    }
+    context = ContextUtils.getApplicationContext(context);
 
     Objects.requireNonNull(options, "The options object is required.");
     Objects.requireNonNull(logger, "The ILogger object is required.");

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

@@ -75,7 +75,9 @@ public AndroidTransactionProfiler(
       final boolean isProfilingEnabled,
       final int profilingTracesHz,
       final @NotNull ISentryExecutorService executorService) {
-    this.context = Objects.requireNonNull(context, "The application context is required");
+    this.context =
+        Objects.requireNonNull(
+            ContextUtils.getApplicationContext(context), "The application context is required");
     this.logger = Objects.requireNonNull(logger, "ILogger is required");
     this.frameMetricsCollector =
         Objects.requireNonNull(frameMetricsCollector, "SentryFrameMetricsCollector is required");

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

@@ -35,7 +35,7 @@ public final class AnrIntegration implements Integration, Closeable {
   private final @NotNull AutoClosableReentrantLock startLock = new AutoClosableReentrantLock();
 
   public AnrIntegration(final @NotNull Context context) {
-    this.context = context;
+    this.context = ContextUtils.getApplicationContext(context);
   }
 
   /**

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

@@ -97,7 +97,7 @@ public AnrV2EventProcessor(
       final @NotNull SentryAndroidOptions options,
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @Nullable SecureRandom random) {
-    this.context = context;
+    this.context = ContextUtils.getApplicationContext(context);
     this.options = options;
     this.buildInfoProvider = buildInfoProvider;
     this.random = random;

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

@@ -63,7 +63,7 @@ public AnrV2Integration(final @NotNull Context context) {
 
   AnrV2Integration(
       final @NotNull Context context, final @NotNull ICurrentDateProvider dateProvider) {
-    this.context = context;
+    this.context = ContextUtils.getApplicationContext(context);
     this.dateProvider = dateProvider;
   }
 

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

@@ -29,7 +29,8 @@ public final class AppComponentsBreadcrumbsIntegration
   private @Nullable SentryAndroidOptions options;
 
   public AppComponentsBreadcrumbsIntegration(final @NotNull Context context) {
-    this.context = Objects.requireNonNull(context, "Context is required");
+    this.context =
+        Objects.requireNonNull(ContextUtils.getApplicationContext(context), "Context is required");
   }
 
   @Override
@@ -84,43 +85,25 @@ public void close() throws IOException {
   @SuppressWarnings("deprecation")
   @Override
   public void onConfigurationChanged(@NotNull Configuration newConfig) {
-    if (scopes != null) {
-      final Device.DeviceOrientation deviceOrientation =
-          DeviceOrientations.getOrientation(context.getResources().getConfiguration().orientation);
-
-      String orientation;
-      if (deviceOrientation != null) {
-        orientation = deviceOrientation.name().toLowerCase(Locale.ROOT);
-      } else {
-        orientation = "undefined";
-      }
-
-      final Breadcrumb breadcrumb = new Breadcrumb();
-      breadcrumb.setType("navigation");
-      breadcrumb.setCategory("device.orientation");
-      breadcrumb.setData("position", orientation);
-      breadcrumb.setLevel(SentryLevel.INFO);
-
-      final Hint hint = new Hint();
-      hint.set(ANDROID_CONFIGURATION, newConfig);
-
-      scopes.addBreadcrumb(breadcrumb, hint);
-    }
+    final long now = System.currentTimeMillis();
+    executeInBackground(() -> captureConfigurationChangedBreadcrumb(now, newConfig));
   }
 
   @Override
   public void onLowMemory() {
-    createLowMemoryBreadcrumb(null);
+    final long now = System.currentTimeMillis();
+    executeInBackground(() -> captureLowMemoryBreadcrumb(now, null));
   }
 
   @Override
   public void onTrimMemory(final int level) {
-    createLowMemoryBreadcrumb(level);
+    final long now = System.currentTimeMillis();
+    executeInBackground(() -> captureLowMemoryBreadcrumb(now, level));
   }
 
-  private void createLowMemoryBreadcrumb(final @Nullable Integer level) {
+  private void captureLowMemoryBreadcrumb(final long timeMs, final @Nullable Integer level) {
     if (scopes != null) {
-      final Breadcrumb breadcrumb = new Breadcrumb();
+      final Breadcrumb breadcrumb = new Breadcrumb(timeMs);
       if (level != null) {
         // only add breadcrumb if TRIM_MEMORY_BACKGROUND, TRIM_MEMORY_MODERATE or
         // TRIM_MEMORY_COMPLETE.
@@ -146,4 +129,42 @@ private void createLowMemoryBreadcrumb(final @Nullable Integer level) {
       scopes.addBreadcrumb(breadcrumb);
     }
   }
+
+  private void captureConfigurationChangedBreadcrumb(
+      final long timeMs, final @NotNull Configuration newConfig) {
+    if (scopes != null) {
+      final Device.DeviceOrientation deviceOrientation =
+          DeviceOrientations.getOrientation(context.getResources().getConfiguration().orientation);
+
+      String orientation;
+      if (deviceOrientation != null) {
+        orientation = deviceOrientation.name().toLowerCase(Locale.ROOT);
+      } else {
+        orientation = "undefined";
+      }
+
+      final Breadcrumb breadcrumb = new Breadcrumb(timeMs);
+      breadcrumb.setType("navigation");
+      breadcrumb.setCategory("device.orientation");
+      breadcrumb.setData("position", orientation);
+      breadcrumb.setLevel(SentryLevel.INFO);
+
+      final Hint hint = new Hint();
+      hint.set(ANDROID_CONFIGURATION, newConfig);
+
+      scopes.addBreadcrumb(breadcrumb, hint);
+    }
+  }
+
+  private void executeInBackground(final @NotNull Runnable runnable) {
+    if (options != null) {
+      try {
+        options.getExecutorService().submit(runnable);
+      } catch (Throwable t) {
+        options
+            .getLogger()
+            .log(SentryLevel.ERROR, t, "Failed to submit app components breadcrumb task");
+      }
+    }
+  }
 }

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

@@ -383,4 +383,19 @@ static void setAppPackageInfo(
     }
     app.setPermissions(permissions);
   }
+
+  /**
+   * Get the app context
+   *
+   * @return the app context, or if not available, the provided context
+   */
+  @NotNull
+  public static Context getApplicationContext(final @NotNull Context context) {
+    // it returns null if ContextImpl, so let's check for nullability
+    final @Nullable Context appContext = context.getApplicationContext();
+    if (appContext != null) {
+      return appContext;
+    }
+    return context;
+  }
 }

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

@@ -47,7 +47,9 @@ public DefaultAndroidEventProcessor(
       final @NotNull Context context,
       final @NotNull BuildInfoProvider buildInfoProvider,
       final @NotNull SentryAndroidOptions options) {
-    this.context = Objects.requireNonNull(context, "The application context is required.");
+    this.context =
+        Objects.requireNonNull(
+            ContextUtils.getApplicationContext(context), "The application context is required.");
     this.buildInfoProvider =
         Objects.requireNonNull(buildInfoProvider, "The BuildInfoProvider is required.");
     this.options = Objects.requireNonNull(options, "The options object is required.");
@@ -57,7 +59,7 @@ public DefaultAndroidEventProcessor(
     // some device info performs disk I/O, but it's result is cached, let's pre-cache it
     final @NotNull ExecutorService executorService = Executors.newSingleThreadExecutor();
     this.deviceInfoUtil =
-        executorService.submit(() -> DeviceInfoUtil.getInstance(context, options));
+        executorService.submit(() -> DeviceInfoUtil.getInstance(this.context, options));
     executorService.shutdown();
   }
 

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

@@ -81,7 +81,7 @@ public static DeviceInfoUtil getInstance(
     if (instance == null) {
       try (final @NotNull ISentryLifecycleToken ignored = staticLock.acquire()) {
         if (instance == null) {
-          instance = new DeviceInfoUtil(context.getApplicationContext(), options);
+          instance = new DeviceInfoUtil(ContextUtils.getApplicationContext(context), options);
         }
       }
     }

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

@@ -7,7 +7,6 @@
 import io.sentry.ISentryLifecycleToken;
 import io.sentry.SentryLevel;
 import io.sentry.Session;
-import io.sentry.android.core.internal.util.BreadcrumbFactory;
 import io.sentry.transport.CurrentDateProvider;
 import io.sentry.transport.ICurrentDateProvider;
 import io.sentry.util.AutoClosableReentrantLock;
@@ -92,7 +91,6 @@ private void startSession() {
     if (lastUpdatedSession == 0L
         || (lastUpdatedSession + sessionIntervalMillis) <= currentTimeMillis) {
       if (enableSessionTracking) {
-        addSessionBreadcrumb("start");
         scopes.startSession();
       }
       scopes.getOptions().getReplayController().start();
@@ -127,7 +125,6 @@ private void scheduleEndSession() {
               @Override
               public void run() {
                 if (enableSessionTracking) {
-                  addSessionBreadcrumb("end");
                   scopes.endSession();
                 }
                 scopes.getOptions().getReplayController().stop();
@@ -159,11 +156,6 @@ private void addAppBreadcrumb(final @NotNull String state) {
     }
   }
 
-  private void addSessionBreadcrumb(final @NotNull String state) {
-    final Breadcrumb breadcrumb = BreadcrumbFactory.forSession(state);
-    scopes.addBreadcrumb(breadcrumb);
-  }
-
   @TestOnly
   @Nullable
   TimerTask getTimerTask() {

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

@@ -98,9 +98,9 @@ final class ManifestMetadataReader {
 
   static final String REPLAYS_ERROR_SAMPLE_RATE = "io.sentry.session-replay.on-error-sample-rate";
 
-  static final String REPLAYS_REDACT_ALL_TEXT = "io.sentry.session-replay.redact-all-text";
+  static final String REPLAYS_MASK_ALL_TEXT = "io.sentry.session-replay.mask-all-text";
 
-  static final String REPLAYS_REDACT_ALL_IMAGES = "io.sentry.session-replay.redact-all-images";
+  static final String REPLAYS_MASK_ALL_IMAGES = "io.sentry.session-replay.mask-all-images";
 
   static final String FORCE_INIT = "io.sentry.force-init";
 
@@ -389,12 +389,12 @@ static void applyMetadata(
         options
             .getExperimental()
             .getSessionReplay()
-            .setRedactAllText(readBool(metadata, logger, REPLAYS_REDACT_ALL_TEXT, true));
+            .setMaskAllText(readBool(metadata, logger, REPLAYS_MASK_ALL_TEXT, true));
 
         options
             .getExperimental()
             .getSessionReplay()
-            .setRedactAllImages(readBool(metadata, logger, REPLAYS_REDACT_ALL_IMAGES, true));
+            .setMaskAllImages(readBool(metadata, logger, REPLAYS_MASK_ALL_IMAGES, true));
       }
 
       options