Fix: Make ActivityFramesTracker operations thread-safe (#1762)

getsentry · Oct 14, 2021 · 7fd6b52 · 7fd6b52
1 parent 23884c0
commit 7fd6b52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+* Fix: Make ActivityFramesTracker operations thread-safe (#1762)
 * Fix: Clone Scope Contexts (#1763)
 
 ## 5.2.2

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityFramesTracker.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityFramesTracker.java
@@ -47,15 +47,15 @@ private boolean isFrameMetricsAggregatorAvailable() {
   }
 
   @SuppressWarnings("NullAway")
-  void addActivity(final @NotNull Activity activity) {
+  synchronized void addActivity(final @NotNull Activity activity) {
     if (!isFrameMetricsAggregatorAvailable()) {
       return;
     }
     frameMetricsAggregator.add(activity);
   }
 
   @SuppressWarnings("NullAway")
-  void setMetrics(final @NotNull Activity activity, final @NotNull SentryId sentryId) {
+  synchronized void setMetrics(final @NotNull Activity activity, final @NotNull SentryId sentryId) {
     if (!isFrameMetricsAggregatorAvailable()) {
       return;
     }
@@ -101,7 +101,8 @@ void setMetrics(final @NotNull Activity activity, final @NotNull SentryId sentry
   }
 
   @Nullable
-  Map<String, @NotNull MeasurementValue> takeMetrics(final @NotNull SentryId sentryId) {
+  synchronized Map<String, @NotNull MeasurementValue> takeMetrics(
+      final @NotNull SentryId sentryId) {
     if (!isFrameMetricsAggregatorAvailable()) {
       return null;
     }
@@ -113,7 +114,7 @@ void setMetrics(final @NotNull Activity activity, final @NotNull SentryId sentry
   }
 
   @SuppressWarnings("NullAway")
-  void stop() {
+  synchronized void stop() {
     if (isFrameMetricsAggregatorAvailable()) {
       frameMetricsAggregator.stop();
     }