Merge f7d8315 into 27d7cf8

stefanosiano · web-flow · commit 54a0e3dc21a2 · 2025-10-24T12:31:52.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 ### Fixes
 
+- [ANR] Removed AndroidTransactionProfiler lock ([#4817](https://github.com/getsentry/sentry-java/pull/4817))
 - Avoid StrictMode warnings ([#4724](https://github.com/getsentry/sentry-java/pull/4724))
 - Use logger from options for JVM profiler ([#4771](https://github.com/getsentry/sentry-java/pull/4771))
 - Session Replay: Avoid deadlock when pausing replay if no connection ([#4788](https://github.com/getsentry/sentry-java/pull/4788))
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidProfiler.java
@@ -354,4 +354,8 @@ private void putPerformanceCollectionDataInMeasurements(
       }
     }
   }
+
+  boolean isRunning() {
+    return isRunning;
+  }
 }
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransactionProfiler.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidTransactionProfiler.java
@@ -5,8 +5,6 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
-import android.os.Process;
-import android.os.SystemClock;
 import io.sentry.DateUtils;
 import io.sentry.ILogger;
 import io.sentry.ISentryExecutorService;
@@ -26,9 +24,9 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
 
 final class AndroidTransactionProfiler implements ITransactionProfiler {
   private final @NotNull Context context;
@@ -39,10 +37,10 @@ final class AndroidTransactionProfiler implements ITransactionProfiler {
   private final @NotNull ISentryExecutorService executorService;
   private final @NotNull BuildInfoProvider buildInfoProvider;
   private boolean isInitialized = false;
-  private int transactionsCounter = 0;
+  private final @NotNull AtomicBoolean isRunning = new AtomicBoolean(false);
   private final @NotNull SentryFrameMetricsCollector frameMetricsCollector;
   private @Nullable ProfilingTransactionData currentProfilingTransactionData;
-  private @Nullable AndroidProfiler profiler = null;
+  private volatile @Nullable AndroidProfiler profiler = null;
   private long profileStartNanos;
   private long profileStartCpuMillis;
   private @NotNull Date profileStartTimestamp;
@@ -95,6 +93,7 @@ private void init() {
       return;
     }
     isInitialized = true;
+
     if (!isProfilingEnabled) {
       logger.log(SentryLevel.INFO, "Profiling is disabled in options.");
       return;
@@ -124,22 +123,30 @@ private void init() {
 
   @Override
   public void start() {
-    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
-      // 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;
+    // 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;
 
+    // When the first transaction is starting, we can start profiling
+    if (!isRunning.getAndSet(true)) {
       // Let's initialize trace folder and profiling interval
       init();
 
-      transactionsCounter++;
-      // When the first transaction is starting, we can start profiling
-      if (transactionsCounter == 1 && onFirstStart()) {
+      if (onFirstStart()) {
         logger.log(SentryLevel.DEBUG, "Profiler started.");
       } else {
-        transactionsCounter--;
-        logger.log(
-            SentryLevel.WARNING, "A profile is already running. This profile will be ignored.");
+        // If profiler is not null and is running, it means that a profile is already running
+        if (profiler != null && profiler.isRunning()) {
+          logger.log(
+              SentryLevel.WARNING, "A profile is already running. This profile will be ignored.");
+        } else {
+          try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+            // Ensure we unbind any transaction data, just in case of concurrent starts
+            currentProfilingTransactionData = null;
+          }
+          // Otherwise we update the flag, because it means the profiler is not running
+          isRunning.set(false);
+        }
       }
     }
   }
@@ -164,11 +171,14 @@ private boolean onFirstStart() {
 
   @Override
   public void bindTransaction(final @NotNull ITransaction transaction) {
-    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
-      // If the profiler is running, but no profilingTransactionData is set, we bind it here
-      if (transactionsCounter > 0 && currentProfilingTransactionData == null) {
-        currentProfilingTransactionData =
-            new ProfilingTransactionData(transaction, profileStartNanos, profileStartCpuMillis);
+    // If the profiler is running, but no profilingTransactionData is set, we bind it here
+    if (isRunning.get() && currentProfilingTransactionData == null) {
+      try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+        // If the profiler is running, but no profilingTransactionData is set, we bind it here
+        if (isRunning.get() && currentProfilingTransactionData == null) {
+          currentProfilingTransactionData =
+              new ProfilingTransactionData(transaction, profileStartNanos, profileStartCpuMillis);
+        }
       }
     }
   }
@@ -178,15 +188,13 @@ public void bindTransaction(final @NotNull ITransaction transaction) {
       final @NotNull ITransaction transaction,
       final @Nullable List<PerformanceCollectionData> performanceCollectionData,
       final @NotNull SentryOptions options) {
-    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
-      return onTransactionFinish(
-          transaction.getName(),
-          transaction.getEventId().toString(),
-          transaction.getSpanContext().getTraceId().toString(),
-          false,
-          performanceCollectionData,
-          options);
-    }
+    return onTransactionFinish(
+        transaction.getName(),
+        transaction.getEventId().toString(),
+        transaction.getSpanContext().getTraceId().toString(),
+        false,
+        performanceCollectionData,
+        options);
   }
 
   @SuppressLint("NewApi")
@@ -197,20 +205,23 @@ public void bindTransaction(final @NotNull ITransaction transaction) {
       final boolean isTimeout,
       final @Nullable List<PerformanceCollectionData> performanceCollectionData,
       final @NotNull SentryOptions options) {
-    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
-      // check if profiler was created
-      if (profiler == null) {
-        return null;
-      }
 
-      // onTransactionStart() is only available since Lollipop_MR1
-      // and SystemClock.elapsedRealtimeNanos() since Jelly Bean
-      // and SUPPORTED_ABIS since KITKAT
-      if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return null;
+    // onTransactionStart() is only available since Lollipop_MR1
+    // and SystemClock.elapsedRealtimeNanos() since Jelly Bean
+    // and SUPPORTED_ABIS since KITKAT
+    if (buildInfoProvider.getSdkInfoVersion() < Build.VERSION_CODES.LOLLIPOP_MR1) return null;
+
+    // check if profiler was created
+    if (profiler == null) {
+      return null;
+    }
+
+    final ProfilingTransactionData txData;
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      txData = currentProfilingTransactionData;
 
       // Transaction finished, but it's not in the current profile
-      if (currentProfilingTransactionData == null
-          || !currentProfilingTransactionData.getId().equals(transactionId)) {
+      if (txData == null || !txData.getId().equals(transactionId)) {
         // A transaction is finishing, but it's not profiled. We can skip it
         logger.log(
             SentryLevel.INFO,
@@ -219,118 +230,90 @@ public void bindTransaction(final @NotNull ITransaction transaction) {
             traceId);
         return null;
       }
+      currentProfilingTransactionData = null;
+    }
 
-      if (transactionsCounter > 0) {
-        transactionsCounter--;
-      }
-
-      logger.log(SentryLevel.DEBUG, "Transaction %s (%s) finished.", transactionName, traceId);
+    logger.log(SentryLevel.DEBUG, "Transaction %s (%s) finished.", transactionName, traceId);
 
-      if (transactionsCounter != 0) {
-        // We notify the data referring to this transaction that it finished
-        if (currentProfilingTransactionData != null) {
-          currentProfilingTransactionData.notifyFinish(
-              SystemClock.elapsedRealtimeNanos(),
-              profileStartNanos,
-              Process.getElapsedCpuTime(),
-              profileStartCpuMillis);
-        }
-        return null;
-      }
-
-      final AndroidProfiler.ProfileEndData endData =
-          profiler.endAndCollect(false, performanceCollectionData);
-      // check if profiler end successfully
-      if (endData == null) {
-        return null;
-      }
+    final AndroidProfiler.ProfileEndData endData =
+        profiler.endAndCollect(false, performanceCollectionData);
 
-      long transactionDurationNanos = endData.endNanos - profileStartNanos;
+    isRunning.set(false);
 
-      List<ProfilingTransactionData> transactionList = new ArrayList<>(1);
-      final ProfilingTransactionData txData = currentProfilingTransactionData;
-      if (txData != null) {
-        transactionList.add(txData);
-      }
-      currentProfilingTransactionData = null;
-      // We clear the counter in case of a timeout
-      transactionsCounter = 0;
+    // check if profiler end successfully
+    if (endData == null) {
+      return null;
+    }
 
-      String totalMem = "0";
-      final @Nullable Long memory =
-          (options instanceof SentryAndroidOptions)
-              ? DeviceInfoUtil.getInstance(context, (SentryAndroidOptions) options).getTotalMemory()
-              : null;
-      if (memory != null) {
-        totalMem = Long.toString(memory);
-      }
-      String[] abis = Build.SUPPORTED_ABIS;
+    long transactionDurationNanos = endData.endNanos - profileStartNanos;
 
-      // We notify all transactions data that all transactions finished.
-      // Some may not have been really finished, in case of a timeout
-      for (ProfilingTransactionData t : transactionList) {
-        t.notifyFinish(
-            endData.endNanos, profileStartNanos, endData.endCpuMillis, profileStartCpuMillis);
-      }
+    final @NotNull List<ProfilingTransactionData> transactionList = new ArrayList<>(1);
+    transactionList.add(txData);
+    txData.notifyFinish(
+        endData.endNanos, profileStartNanos, endData.endCpuMillis, profileStartCpuMillis);
 
-      // cpu max frequencies are read with a lambda because reading files is involved, so it will be
-      // done in the background when the trace file is read
-      return new ProfilingTraceData(
-          endData.traceFile,
-          profileStartTimestamp,
-          transactionList,
-          transactionName,
-          transactionId,
-          traceId,
-          Long.toString(transactionDurationNanos),
-          buildInfoProvider.getSdkInfoVersion(),
-          abis != null && abis.length > 0 ? abis[0] : "",
-          () -> CpuInfoUtils.getInstance().readMaxFrequencies(),
-          buildInfoProvider.getManufacturer(),
-          buildInfoProvider.getModel(),
-          buildInfoProvider.getVersionRelease(),
-          buildInfoProvider.isEmulator(),
-          totalMem,
-          options.getProguardUuid(),
-          options.getRelease(),
-          options.getEnvironment(),
-          (endData.didTimeout || isTimeout)
-              ? ProfilingTraceData.TRUNCATION_REASON_TIMEOUT
-              : ProfilingTraceData.TRUNCATION_REASON_NORMAL,
-          endData.measurementsMap);
+    String totalMem = "0";
+    final @Nullable Long memory =
+        (options instanceof SentryAndroidOptions)
+            ? DeviceInfoUtil.getInstance(context, (SentryAndroidOptions) options).getTotalMemory()
+            : null;
+    if (memory != null) {
+      totalMem = Long.toString(memory);
     }
+    final String[] abis = Build.SUPPORTED_ABIS;
+
+    // cpu max frequencies are read with a lambda because reading files is involved, so it will be
+    // done in the background when the trace file is read
+    return new ProfilingTraceData(
+        endData.traceFile,
+        profileStartTimestamp,
+        transactionList,
+        transactionName,
+        transactionId,
+        traceId,
+        Long.toString(transactionDurationNanos),
+        buildInfoProvider.getSdkInfoVersion(),
+        abis != null && abis.length > 0 ? abis[0] : "",
+        () -> CpuInfoUtils.getInstance().readMaxFrequencies(),
+        buildInfoProvider.getManufacturer(),
+        buildInfoProvider.getModel(),
+        buildInfoProvider.getVersionRelease(),
+        buildInfoProvider.isEmulator(),
+        totalMem,
+        options.getProguardUuid(),
+        options.getRelease(),
+        options.getEnvironment(),
+        (endData.didTimeout || isTimeout)
+            ? ProfilingTraceData.TRUNCATION_REASON_TIMEOUT
+            : ProfilingTraceData.TRUNCATION_REASON_NORMAL,
+        endData.measurementsMap);
   }
 
   @Override
   public boolean isRunning() {
-    return transactionsCounter != 0;
+    return isRunning.get();
   }
 
   @Override
   public void close() {
+    final @Nullable ProfilingTransactionData txData = currentProfilingTransactionData;
     // we stop profiling
-    if (currentProfilingTransactionData != null) {
+    if (txData != null) {
       onTransactionFinish(
-          currentProfilingTransactionData.getName(),
-          currentProfilingTransactionData.getId(),
-          currentProfilingTransactionData.getTraceId(),
+          txData.getName(),
+          txData.getId(),
+          txData.getTraceId(),
           true,
           null,
           ScopesAdapter.getInstance().getOptions());
-    } else if (transactionsCounter != 0) {
-      // in case the app start profiling is running, and it's not bound to a transaction, we still
-      // stop profiling, but we also have to manually update the counter.
-      transactionsCounter--;
     }
+    // in case the app start profiling is running, and it's not bound to a transaction, we still
+    // stop profiling, but we also have to manually update the flag.
+    isRunning.set(false);
 
     // we have to first stop profiling otherwise we would lost the last profile
     if (profiler != null) {
       profiler.close();
     }
   }
-
-  @TestOnly
-  int getTransactionsCounter() {
-    return transactionsCounter;
-  }
 }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/AndroidTransactionProfilerTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/AndroidTransactionProfilerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -354,4 +354,8 @@ private void putPerformanceCollectionDataInMeasurements(`
`354`	`354`	`}`
`355`	`355`	`}`
`356`	`356`	`}`
	`357`	`+`
	`358`	`+ boolean isRunning() {`
	`359`	`+ return isRunning;`
	`360`	`+ }`
`357`	`361`	`}`