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.

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

Merge hotfix 6.4.4 back into main #2283

Merged
merged 8 commits into from Oct 10, 2022
Merged

Merge hotfix 6.4.4 back into main #2283

merged 8 commits into from Oct 10, 2022

Conversation

adinauer
Copy link
Member

@adinauer adinauer commented Oct 10, 2022

#skip-changelog

Fix for ConcurrentModificationException caused by manipulating FrameMetricsAggregator needs to be merged into main after hotfixing 6.4 (#2282).

adinauer and others added 4 commits September 30, 2022 19:47
This reverts commit bb1d054.
Co-authored-by: Philipp Hofmann <philipp.hofmann@sentry.io>
Copy link
Member

@philipphofmann philipphofmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some merge conflicts must be resolved, @adinauer.

@adinauer
Copy link
Member Author

adinauer commented Oct 10, 2022

Some merge conflicts must be resolved

@philipphofmann we can only do that once the release is merged back in here otherwise we'll have another failed release as we did last week ;-)

adinauer and others added 4 commits October 10, 2022 16:23
…ipulation (#2282)

* fix: frameMetricsAggregator calls may not get executed on main thread

* fix: try/catch all FrameMetricsAggregator calls

* Add FrameMetricsAggregator fixes to changelog

* Add logging and main-thread tests to ActivityFramesTracker

* Split up tests for FrameMetricsTracker

* Update CHANGELOG.md

Co-authored-by: Alexander Dinauer <adinauer@users.noreply.github.com>

* Wrap main-thread / exception handling code in runSafelyOnUiThread method

Co-authored-by: Markus Hintersteiner <markus.hintersteiner@sentry.io>
Co-authored-by: Markus Hintersteiner <m.hintersteiner@gmail.com>
@adinauer adinauer marked this pull request as ready for review October 10, 2022 16:00
@github-actions
Copy link
Contributor

Performance metrics 🚀

  Plain With Sentry Diff
Startup time 329.40 ms 393.96 ms 64.56 ms
Size 1.73 MiB 2.29 MiB 579.93 KiB

Baseline results on branch: main

Startup times

Revision Plain With Sentry Diff
54cebc8 331.12 ms 385.14 ms 54.02 ms
2f079a1 296.91 ms 337.43 ms 40.51 ms
4dd88fe 302.12 ms 331.17 ms 29.04 ms
1e4690d 354.69 ms 387.88 ms 33.19 ms
4dd88fe 306.88 ms 391.58 ms 84.70 ms
3d89dea 345.59 ms 364.06 ms 18.47 ms
c5ccd8a 329.98 ms 365.52 ms 35.54 ms
7300956 324.20 ms 353.79 ms 29.58 ms
7300956 337.57 ms 384.21 ms 46.64 ms
d4087ee 278.00 ms 313.86 ms 35.86 ms

App size

Revision Plain With Sentry Diff
54cebc8 1.73 MiB 2.29 MiB 579.43 KiB
2f079a1 1.74 MiB 2.33 MiB 605.56 KiB
4dd88fe 1.73 MiB 2.29 MiB 579.50 KiB
1e4690d 1.74 MiB 2.33 MiB 604.92 KiB
4dd88fe 1.73 MiB 2.29 MiB 579.50 KiB
3d89dea 1.74 MiB 2.33 MiB 604.92 KiB
c5ccd8a 1.74 MiB 2.33 MiB 607.44 KiB
7300956 1.73 MiB 2.29 MiB 578.69 KiB
7300956 1.73 MiB 2.29 MiB 578.69 KiB
d4087ee 1.73 MiB 2.29 MiB 579.50 KiB

@adinauer adinauer merged commit cb27996 into main Oct 10, 2022
@adinauer adinauer deleted the 6.4.x-hotfix branch October 10, 2022 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants