Skip to content

Fix main merge #3537

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

Jump to bottom
Merged
merged 2 commits into from
Jul 2, 2024
Merged

Fix main merge #3537

merged 2 commits into from
Jul 2, 2024

Conversation

@stefanosiano
Copy link
Member

@stefanosiano stefanosiano commented Jul 1, 2024

📜 Description

fixed merge conflicts

#skip-changelog

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

  • I reviewed the submitted code.
  • I added tests to verify the changes.
  • No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
  • I updated the docs if needed.
  • Review from the native team if needed.
  • No breaking change or entry added to the changelog.
  • No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

@stefanosiano stefanosiano changed the title fixed merge conflicts Fix main merge Jul 1, 2024
@stefanosiano stefanosiano marked this pull request as ready for review July 1, 2024 19:19
@github-actions
Copy link
Contributor

github-actions bot commented Jul 1, 2024 •
edited
Loading

Performance metrics 🚀

  Plain With Sentry Diff
Startup time 427.96 ms 486.62 ms 58.66 ms
Size 1.70 MiB 2.29 MiB 599.57 KiB

Previous results on branch: fix/main-merge-v8

Startup times

Revision Plain With Sentry Diff
2f9bcfb 430.06 ms 509.27 ms 79.21 ms

App size

Revision Plain With Sentry Diff
2f9bcfb 1.70 MiB 2.29 MiB 599.57 KiB

adinauer
adinauer approved these changes Jul 2, 2024
View reviewed changes
Copy link
Member

@adinauer adinauer left a comment

Choose a reason for hiding this comment

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

The clear call should probably only go to the default write scope, other than that LGTM.

@stefanosiano stefanosiano merged commit 437936e into 8.x.x Jul 2, 2024
@stefanosiano stefanosiano deleted the fix/main-merge-v8 branch July 2, 2024 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@markushi markushi markushi approved these changes

@adinauer adinauer adinauer approved these changes

@romtsn romtsn Awaiting requested review from romtsn

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@stefanosiano @markushi @adinauer