Merge 61539fe into fc84053

stefanosiano · web-flow · commit af61ea37fed4 · 2024-07-23T18:12:00.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixes
 
+- Avoid ArrayIndexOutOfBoundsException on Android cpu data collection ([#3598](https://github.com/getsentry/sentry-java/pull/3598))
 - Check app start spans time and ignore background app starts ([#3550](https://github.com/getsentry/sentry-java/pull/3550))
   - This should eliminate long-lasting App Start transactions
 
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AndroidCpuCollector.java b/sentry-android-core/src/main/java/io/sentry/android/core/AndroidCpuCollector.java
@@ -115,7 +115,7 @@ private long readTotalCpuNanos() {
         // Amount of clock ticks this process' waited-for children has been scheduled in kernel mode
         long csTime = Long.parseLong(stats[16]);
         return (long) ((uTime + sTime + cuTime + csTime) * nanosecondsPerClockTick);
-      } catch (NumberFormatException e) {
+      } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
         logger.log(SentryLevel.ERROR, "Error parsing /proc/self/stat file.", e);
         return 0;
       }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ private long readTotalCpuNanos() {`
`115`	`115`	`// Amount of clock ticks this process' waited-for children has been scheduled in kernel mode`
`116`	`116`	`long csTime = Long.parseLong(stats[16]);`
`117`	`117`	`return (long) ((uTime + sTime + cuTime + csTime) * nanosecondsPerClockTick);`
`118`		`- } catch (NumberFormatException e) {`
	`118`	`+ } catch (NumberFormatException \| ArrayIndexOutOfBoundsException e) {`
`119`	`119`	`logger.log(SentryLevel.ERROR, "Error parsing /proc/self/stat file.", e);`
`120`	`120`	`return 0;`
`121`	`121`	`}`