Merge branch 'main' into rz/feat/session-replay

Author: romtsn

.github/workflows/build.yml

@@ -35,10 +35,11 @@ jobs:
         run: make preMerge
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # pin@v3
+        uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # pin@v4
         with:
           name: sentry-java
           fail_ci_if_error: false
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload test results
         if: always()

CHANGELOG.md

@@ -6,14 +6,39 @@
 
 We released our second Alpha version of the SDK with support. To get access, it requires adding your Sentry org to our feature flag. Please let us know on the [waitlist](https://sentry.io/lp/mobile-replay-beta/) if you're interested
 
+### Fixes
+
+- Move onFinishCallback before span or transaction is finished ([#3459](https://github.com/getsentry/sentry-java/pull/3459))
+- Add timestamp when a profile starts ([#3442](https://github.com/getsentry/sentry-java/pull/3442))
+- Move fragment auto span finish to onFragmentStarted ([#3424](https://github.com/getsentry/sentry-java/pull/3424))
+- Remove profiling timeout logic and disable profiling on API 21 ([#3478](https://github.com/getsentry/sentry-java/pull/3478))
+- Properly reset metric flush flag on metric emission ([#3493](https://github.com/getsentry/sentry-java/pull/3493))
+
+## 7.10.0
+
+### Features
+
+- Publish Gradle module metadata ([#3422](https://github.com/getsentry/sentry-java/pull/3422))
+
+### Fixes
+
+- Fix faulty `span.frame_delay` calculation for early app start spans ([#3427](https://github.com/getsentry/sentry-java/pull/3427))
+- Fix crash when installing `ShutdownHookIntegration` and the VM is shutting down ([#3456](https://github.com/getsentry/sentry-java/pull/3456))
+
+## 7.9.0
+
 ### Features
 
 - Add start_type to app context ([#3379](https://github.com/getsentry/sentry-java/pull/3379))
+- Add ttid/ttfd contribution flags ([#3386](https://github.com/getsentry/sentry-java/pull/3386))
 
 ### Fixes
 
+- (Internal) Metrics code cleanup ([#3403](https://github.com/getsentry/sentry-java/pull/3403))
 - Fix Frame measurements in app start transactions ([#3382](https://github.com/getsentry/sentry-java/pull/3382))
 - Fix timing metric value different from span duration ([#3368](https://github.com/getsentry/sentry-java/pull/3368))
+- Do not always write startup crash marker ([#3409](https://github.com/getsentry/sentry-java/pull/3409))
+  - This may have been causing the SDK init logic to block the main thread
 
 ## 7.8.0
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Sentry
+Copyright (c) 2019-2024 Sentry
 Copyright (c) 2015 Salomon BRYS for Android ANRWatchDog
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

build.gradle.kts

@@ -161,16 +161,7 @@ subprojects {
             if (this@subprojects.name.contains("-compose")) {
                 this.configureForMultiplatform(this@subprojects)
             } else {
-                this.getByName("main").contents {
-                    // non android modules
-                    from("build${sep}libs")
-                    from("build${sep}publications${sep}maven")
-                    // android modules
-                    from("build${sep}outputs${sep}aar") {
-                        include("*-release*")
-                    }
-                    from("build${sep}publications${sep}release")
-                }
+                this.configureForJvm(this@subprojects)
             }
             // craft only uses zip archives
             this.forEach { dist ->

buildSrc/src/main/java/Publication.kt

@@ -10,9 +10,12 @@ private object Consts {
 // configure distZip tasks for multiplatform
 fun DistributionContainer.configureForMultiplatform(project: Project) {
     val sep = File.separator
+    val version = project.properties["versionName"].toString()
 
     this.maybeCreate("android").contents {
-        from("build${sep}publications${sep}androidRelease")
+        from("build${sep}publications${sep}androidRelease") {
+            renameModule(project.name, "android", version = version)
+        }
         from("build${sep}outputs${sep}aar") {
             include("*-release*")
             rename {
@@ -25,7 +28,9 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
         }
     }
     this.getByName("main").contents {
-        from("build${sep}publications${sep}kotlinMultiplatform")
+        from("build${sep}publications${sep}kotlinMultiplatform") {
+            renameModule(project.name, version = version)
+        }
         from("build${sep}kotlinToolingMetadata")
         from("build${sep}libs") {
             include("*compose-kotlin*")
@@ -39,7 +44,9 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
     }
     this.maybeCreate("desktop").contents {
         // kotlin multiplatform modules
-        from("build${sep}publications${sep}desktop")
+        from("build${sep}publications${sep}desktop") {
+            renameModule(project.name, "desktop", version = version)
+        }
         from("build${sep}libs") {
             include("*desktop*")
             withJavadoc(renameTo = "compose-desktop")
@@ -53,6 +60,26 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
     project.tasks.getByName("distZip").finalizedBy(*platformDists)
 }
 
+fun DistributionContainer.configureForJvm(project: Project) {
+    val sep = File.separator
+    val version = project.properties["versionName"].toString()
+
+    this.getByName("main").contents {
+        // non android modules
+        from("build${sep}libs")
+        from("build${sep}publications${sep}maven") {
+            renameModule(project.name, version = version)
+        }
+        // android modules
+        from("build${sep}outputs${sep}aar") {
+            include("*-release*")
+        }
+        from("build${sep}publications${sep}release") {
+            renameModule(project.name, version = version)
+        }
+    }
+}
+
 private fun CopySpec.withJavadoc(renameTo: String = "compose") {
     include("*javadoc*")
     rename {
@@ -63,3 +90,13 @@ private fun CopySpec.withJavadoc(renameTo: String = "compose") {
         }
     }
 }
+
+private fun CopySpec.renameModule(projectName: String, renameTo: String = "", version: String) {
+    var target = ""
+    if (renameTo.isNotEmpty()) {
+        target = "-$renameTo"
+    }
+    rename {
+        it.replace("module.json", "$projectName$target-$version.module")
+    }
+}

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

@@ -81,7 +81,8 @@ public class io/sentry/android/core/AndroidProfiler$ProfileEndData {
 public class io/sentry/android/core/AndroidProfiler$ProfileStartData {
 	public final field startCpuMillis J
 	public final field startNanos J
-	public fun <init> (JJ)V
+	public final field startTimestamp Ljava/util/Date;
+	public fun <init> (JJLjava/util/Date;)V
 }
 
 public final class io/sentry/android/core/AnrIntegration : io/sentry/Integration, java/io/Closeable {
@@ -206,6 +207,7 @@ public abstract interface class io/sentry/android/core/IDebugImagesLoader {
 public final class io/sentry/android/core/InternalSentrySdk {
 	public fun <init> ()V
 	public static fun captureEnvelope ([B)Lio/sentry/protocol/SentryId;
+	public static fun getAppStartMeasurement ()Ljava/util/Map;
 	public static fun getCurrentScope ()Lio/sentry/IScope;
 	public static fun serializeScope (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/IScope;)Ljava/util/Map;
 }

sentry-android-core/build.gradle.kts

@@ -78,6 +78,7 @@ dependencies {
     compileOnly(projects.sentryAndroidTimber)
     compileOnly(projects.sentryAndroidReplay)
     compileOnly(projects.sentryCompose)
+    compileOnly(projects.sentryComposeHelper)
 
     // lifecycle processor, session tracking
     implementation(Config.Libs.lifecycleProcess)

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

@@ -6,6 +6,7 @@
 import android.os.Process;
 import android.os.SystemClock;
 import io.sentry.CpuCollectionData;
+import io.sentry.DateUtils;
 import io.sentry.ILogger;
 import io.sentry.ISentryExecutorService;
 import io.sentry.MemoryCollectionData;
@@ -17,6 +18,7 @@
 import io.sentry.util.Objects;
 import java.io.File;
 import java.util.ArrayDeque;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,10 +35,13 @@ public class AndroidProfiler {
   public static class ProfileStartData {
     public final long startNanos;
     public final long startCpuMillis;
+    public final @NotNull Date startTimestamp;
 
-    public ProfileStartData(final long startNanos, final long startCpuMillis) {
+    public ProfileStartData(
+        final long startNanos, final long startCpuMillis, final @NotNull Date startTimestamp) {
       this.startNanos = startNanos;
       this.startCpuMillis = startCpuMillis;
+      this.startTimestamp = startTimestamp;
     }
   }
 
@@ -79,7 +84,6 @@ public ProfileEndData(
   private @Nullable Future<?> scheduledFinish = null;
   private @Nullable File traceFile = null;
   private @Nullable String frameMetricsCollectorId;
-  private volatile @Nullable ProfileEndData timedOutProfilingData = null;
   private final @NotNull SentryFrameMetricsCollector frameMetricsCollector;
   private final @NotNull ArrayDeque<ProfileMeasurementValue> screenFrameRateMeasurements =
       new ArrayDeque<>();
@@ -182,8 +186,7 @@ public void onFrameMetricCollected(
     // We stop profiling after a timeout to avoid huge profiles to be sent
     try {
       scheduledFinish =
-          executorService.schedule(
-              () -> timedOutProfilingData = endAndCollect(true, null), PROFILING_TIMEOUT_MILLIS);
+          executorService.schedule(() -> endAndCollect(true, null), PROFILING_TIMEOUT_MILLIS);
     } catch (RejectedExecutionException e) {
       logger.log(
           SentryLevel.ERROR,
@@ -192,6 +195,7 @@ public void onFrameMetricCollected(
     }
 
     profileStartNanos = SystemClock.elapsedRealtimeNanos();
+    final @NotNull Date profileStartTimestamp = DateUtils.getCurrentDateTime();
     long profileStartCpuMillis = Process.getElapsedCpuTime();
 
     // We don't make any check on the file existence or writeable state, because we don't want to
@@ -203,7 +207,7 @@ public void onFrameMetricCollected(
       // tests)
       Debug.startMethodTracingSampling(traceFile.getPath(), BUFFER_SIZE_BYTES, intervalUs);
       isRunning = true;
-      return new ProfileStartData(profileStartNanos, profileStartCpuMillis);
+      return new ProfileStartData(profileStartNanos, profileStartCpuMillis, profileStartTimestamp);
     } catch (Throwable e) {
       endAndCollect(false, null);
       logger.log(SentryLevel.ERROR, "Unable to start a profile: ", e);
@@ -216,10 +220,6 @@ public void onFrameMetricCollected(
   public synchronized @Nullable ProfileEndData endAndCollect(
       final boolean isTimeout,
       final @Nullable List<PerformanceCollectionData> performanceCollectionData) {
-    // check if profiling timed out
-    if (timedOutProfilingData != null) {
-      return timedOutProfilingData;
-    }
 
     if (!isRunning) {
       logger.log(SentryLevel.WARNING, "Profiler not running");

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

@@ -9,6 +9,7 @@
 import android.os.Build;
 import android.os.Process;
 import android.os.SystemClock;
+import io.sentry.DateUtils;
 import io.sentry.HubAdapter;
 import io.sentry.IHub;
 import io.sentry.ILogger;
@@ -24,6 +25,7 @@
 import io.sentry.android.core.internal.util.SentryFrameMetricsCollector;
 import io.sentry.util.Objects;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -44,6 +46,7 @@ final class AndroidTransactionProfiler implements ITransactionProfiler {
   private @Nullable AndroidProfiler profiler = null;
   private long profileStartNanos;
   private long profileStartCpuMillis;
+  private @NotNull Date profileStartTimestamp;
 
   /**
    * @deprecated please use a constructor that doesn't takes a {@link IHub} instead, as it would be
@@ -95,6 +98,7 @@ public AndroidTransactionProfiler(
     this.profilingTracesHz = profilingTracesHz;
     this.executorService =
         Objects.requireNonNull(executorService, "The ISentryExecutorService is required.");
+    this.profileStartTimestamp = DateUtils.getCurrentDateTime();
   }
 
   private void init() {
@@ -133,8 +137,9 @@ private void init() {
 
   @Override
   public synchronized void start() {
-    // Debug.startMethodTracingSampling() is only available since Lollipop
-    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP) return;
+    // Debug.startMethodTracingSampling() is only available since Lollipop, but Android Profiler
+    // causes crashes on api 21 -> https://github.com/getsentry/sentry-java/issues/3392
+    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return;
 
     // Let's initialize trace folder and profiling interval
     init();
@@ -164,6 +169,7 @@ private boolean onFirstStart() {
     }
     profileStartNanos = startData.startNanos;
     profileStartCpuMillis = startData.startCpuMillis;
+    profileStartTimestamp = startData.startTimestamp;
     return true;
   }
 
@@ -204,9 +210,9 @@ public synchronized void bindTransaction(final @NotNull ITransaction transaction
       return null;
     }
 
-    // onTransactionStart() is only available since Lollipop
+    // onTransactionStart() is only available since Lollipop_MR1
     // and SystemClock.elapsedRealtimeNanos() since Jelly Bean
-    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP) return null;
+    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return null;
 
     // Transaction finished, but it's not in the current profile
     if (currentProfilingTransactionData == null
@@ -274,6 +280,7 @@ public synchronized void bindTransaction(final @NotNull ITransaction transaction
     // done in the background when the trace file is read
     return new ProfilingTraceData(
         endData.traceFile,
+        profileStartTimestamp,
         transactionList,
         transactionName,
         transactionId,