Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid ArrayIndexOutOfBoundsException on Android cpu data collection #3598

Merged
merged 3 commits into from
Aug 1, 2024
Merged

Avoid ArrayIndexOutOfBoundsException on Android cpu data collection #3598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acf7d08
added ArrayIndexOutOfBoundsException to try catch block in AndroidCpu…
stefanosiano Jul 23, 2024
61539fe
updated changelog
stefanosiano Jul 23, 2024
f79e95c
Merge branch 'main' into fix/android-cpu-collector-oob
stefanosiano Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Fixes

- Avoid ArrayIndexOutOfBoundsException on Android cpu data collection ([#3598](https://github.com/getsentry/sentry-java/pull/3598))
- Fix lazy select queries instrumentation ([#3604](https://github.com/getsentry/sentry-java/pull/3604))

## 7.13.0
Expand Down
2 changes: 1 addition & 1 deletion sentry-android-core/src/main/java/io/sentry/android/core/AndroidCpuCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading