fix(ios): Use conditional import for SentrySwizzle.h#6186
Merged
Conversation
Contributor
Semver Impact of This PR⚪ None (no version bump detected) 📋 Changelog PreviewThis is how your changes will appear in the changelog.
Plus 7 more 🤖 This preview updates automatically when you update the PR. |
…CocoaPods and SPM Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
antonis
force-pushed
the
fix/ios-sentry-swizzle-conditional-import
branch
from
2cca6b4 to
a4d4e44
Compare
10 tasks
antonis
commented
May 19, 2026
Contributor
Author
antonis
left a comment
antonis
left a comment
There was a problem hiding this comment.
Skipping changelog since this is an internal change that hasn't been shipped.
📲 Install BuildsAndroid
|
Contributor
iOS (new) Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 5fe1c6c+dirty | 1201.36 ms | 1209.15 ms | 7.78 ms |
| 7d8c8bd+dirty | 3847.98 ms | 1230.77 ms | -2617.21 ms |
| df5d108+dirty | 1207.34 ms | 1210.50 ms | 3.16 ms |
| 23598c3+dirty | 1223.59 ms | 1229.13 ms | 5.53 ms |
| bc0d8cf+dirty | 3834.64 ms | 1223.91 ms | -2610.73 ms |
| 5a21b51+dirty | 3837.87 ms | 1223.47 ms | -2614.40 ms |
| 3817909+dirty | 1210.76 ms | 1215.64 ms | 4.89 ms |
| d2eadf8+dirty | 3841.53 ms | 1216.15 ms | -2625.39 ms |
| 5c1e987+dirty | 1208.43 ms | 1220.72 ms | 12.29 ms |
| 7d6fd3a+dirty | 1210.89 ms | 1217.63 ms | 6.74 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 5fe1c6c+dirty | 3.38 MiB | 4.77 MiB | 1.39 MiB |
| 7d8c8bd+dirty | 5.15 MiB | 6.68 MiB | 1.53 MiB |
| df5d108+dirty | 3.38 MiB | 4.73 MiB | 1.35 MiB |
| 23598c3+dirty | 3.38 MiB | 4.80 MiB | 1.42 MiB |
| bc0d8cf+dirty | 5.15 MiB | 6.67 MiB | 1.51 MiB |
| 5a21b51+dirty | 5.15 MiB | 6.67 MiB | 1.51 MiB |
| 3817909+dirty | 3.38 MiB | 4.73 MiB | 1.35 MiB |
| d2eadf8+dirty | 5.15 MiB | 6.67 MiB | 1.51 MiB |
| 5c1e987+dirty | 3.38 MiB | 4.73 MiB | 1.35 MiB |
| 7d6fd3a+dirty | 3.38 MiB | 4.77 MiB | 1.39 MiB |
Contributor
iOS (legacy) Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 5fe1c6c+dirty | 1220.79 ms | 1217.63 ms | -3.16 ms |
| 7d8c8bd+dirty | 3837.24 ms | 1215.51 ms | -2621.73 ms |
| df5d108+dirty | 1225.90 ms | 1220.14 ms | -5.76 ms |
| 23598c3+dirty | 1207.00 ms | 1209.90 ms | 2.90 ms |
| bc0d8cf+dirty | 3830.33 ms | 1220.52 ms | -2609.81 ms |
| 5a21b51+dirty | 3823.11 ms | 1214.46 ms | -2608.65 ms |
| 3817909+dirty | 1183.90 ms | 1187.50 ms | 3.60 ms |
| d2eadf8+dirty | 3842.42 ms | 1228.91 ms | -2613.50 ms |
| 5c1e987+dirty | 1204.30 ms | 1222.15 ms | 17.85 ms |
| 7d6fd3a+dirty | 1223.29 ms | 1229.57 ms | 6.28 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 5fe1c6c+dirty | 3.38 MiB | 4.77 MiB | 1.39 MiB |
| 7d8c8bd+dirty | 5.15 MiB | 6.68 MiB | 1.53 MiB |
| df5d108+dirty | 3.38 MiB | 4.73 MiB | 1.35 MiB |
| 23598c3+dirty | 3.38 MiB | 4.80 MiB | 1.42 MiB |
| bc0d8cf+dirty | 5.15 MiB | 6.67 MiB | 1.51 MiB |
| 5a21b51+dirty | 5.15 MiB | 6.67 MiB | 1.51 MiB |
| 3817909+dirty | 3.38 MiB | 4.73 MiB | 1.35 MiB |
| d2eadf8+dirty | 5.15 MiB | 6.67 MiB | 1.51 MiB |
| 5c1e987+dirty | 3.38 MiB | 4.73 MiB | 1.35 MiB |
| 7d6fd3a+dirty | 3.38 MiB | 4.77 MiB | 1.39 MiB |
alwx
approved these changes
May 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📢 Type of change
📜 Description
Uses
__has_includeto conditionally importSentrySwizzle.hwith framework-style (<Sentry/SentrySwizzle.h>) when available, falling back to quote-style ("SentrySwizzle.h") otherwise.SentrySwizzle.his a private header in sentry-cocoa (lives inSources/Sentry/include/, notSources/Sentry/Public/). The previous fix in #6181 switched to a framework-style import unconditionally, which broke CocoaPods source builds because private headers aren't exposed via<Framework/...>in that configuration. It was reverted.Neither import style works for all consumption methods:
#import "SentrySwizzle.h"#import <Sentry/SentrySwizzle.h>The conditional
__has_includeresolves this by using whichever path is available at compile time.💡 Motivation and Context
Fixes the build regression from #6181 while still supporting SPM xcframework consumption (#6170, #6182).
💚 How did you test it?
📝 Checklist
sendDefaultPIIis enabled🔮 Next steps