Merge dbdc7df into 4ca1d7b

markushi · web-flow · commit 2d19800d380d · 2022-10-12T10:45:18.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Remove verbose FrameMetricsAggregator failure logging ([#2293](https://github.com/getsentry/sentry-java/pull/2293))
+
 ## 6.5.0
 
 ### Fixes
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
@@ -140,8 +140,7 @@ public synchronized void setMetrics(
     // there was no
     // Observers, See
     // https://android.googlesource.com/platform/frameworks/base/+/140ff5ea8e2d99edc3fbe63a43239e459334c76b
-    runSafelyOnUiThread(
-        () -> frameMetricsAggregator.remove(activity), "FrameMetricsAggregator.remove");
+    runSafelyOnUiThread(() -> frameMetricsAggregator.remove(activity), null);
 
     final @Nullable FrameCounts frameCounts = diffFrameCountsAtEnd(activity);
 
@@ -215,16 +214,16 @@ private void runSafelyOnUiThread(final Runnable runnable, final String tag) {
             () -> {
               try {
                 runnable.run();
-              } catch (Throwable t) {
-                if (logger != null) {
-                  logger.log(SentryLevel.ERROR, "Failed to execute " + tag, t);
+              } catch (Throwable ignored) {
+                if (logger != null && tag != null) {
+                  logger.log(SentryLevel.WARNING, "Failed to execute " + tag);
                 }
               }
             });
       }
-    } catch (Throwable t) {
-      if (logger != null) {
-        logger.log(SentryLevel.ERROR, "Failed to execute " + tag, t);
+    } catch (Throwable ignored) {
+      if (logger != null && tag != null) {
+        logger.log(SentryLevel.WARNING, "Failed to execute " + tag);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,7 @@ public synchronized void setMetrics(`
`140`	`140`	`// there was no`
`141`	`141`	`// Observers, See`
`142`	`142`	`// https://android.googlesource.com/platform/frameworks/base/+/140ff5ea8e2d99edc3fbe63a43239e459334c76b`
`143`		`- runSafelyOnUiThread(`
`144`		`- () -> frameMetricsAggregator.remove(activity), "FrameMetricsAggregator.remove");`
	`143`	`+ runSafelyOnUiThread(() -> frameMetricsAggregator.remove(activity), null);`
`145`	`144`
`146`	`145`	`final @Nullable FrameCounts frameCounts = diffFrameCountsAtEnd(activity);`
`147`	`146`
`@@ -215,16 +214,16 @@ private void runSafelyOnUiThread(final Runnable runnable, final String tag) {`
`215`	`214`	`() -> {`
`216`	`215`	`try {`
`217`	`216`	`runnable.run();`
`218`		`- } catch (Throwable t) {`
`219`		`- if (logger != null) {`
`220`		`- logger.log(SentryLevel.ERROR, "Failed to execute " + tag, t);`
	`217`	`+ } catch (Throwable ignored) {`
	`218`	`+ if (logger != null && tag != null) {`
	`219`	`+ logger.log(SentryLevel.WARNING, "Failed to execute " + tag);`
`221`	`220`	`}`
`222`	`221`	`}`
`223`	`222`	`});`
`224`	`223`	`}`
`225`		`- } catch (Throwable t) {`
`226`		`- if (logger != null) {`
`227`		`- logger.log(SentryLevel.ERROR, "Failed to execute " + tag, t);`
	`224`	`+ } catch (Throwable ignored) {`
	`225`	`+ if (logger != null && tag != null) {`
	`226`	`+ logger.log(SentryLevel.WARNING, "Failed to execute " + tag);`
`228`	`227`	`}`
`229`	`228`	`}`
`230`	`229`	`}`