Skip to content

ref: convert SentryViewHierarchyIntegration to Swift #7157

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

Open
philprime wants to merge 6 commits into
base: main
Choose a base branch
from
+291 −198
Open

ref: convert SentryViewHierarchyIntegration to Swift #7157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0409544
ref: convert SentryViewHierarchyIntegration to Swift
philprime Jan 12, 2026
0e7d090
fix compilation of tests
philprime Jan 13, 2026
f8238a0
Merge remote-tracking branch 'origin/main' into philprime/convert-vie…
philprime Jan 20, 2026
116542b
refactor: update SentryViewHierarchyIntegration to use new ClientProv…
philprime Jan 20, 2026
ea058e0
inject client
philprime Jan 20, 2026
e22800c
fix strong reference cycle
philprime Jan 20, 2026
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
34 changes: 16 additions & 18 deletions Sentry.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@
0A56DA5F28ABA01B00C400D5 /* SentryTransactionContext+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A56DA5E28ABA01B00C400D5 /* SentryTransactionContext+Private.h */; };
0A94158228F6C4C2006A5DD1 /* SentryAppStateManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A94158128F6C4C2006A5DD1 /* SentryAppStateManagerTests.swift */; };
0A9415BA28F96CAC006A5DD1 /* TestSentryReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A9415B928F96CAC006A5DD1 /* TestSentryReachability.swift */; };
0A9BF4E228A114940068D266 /* SentryViewHierarchyIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = 0A9BF4E128A114940068D266 /* SentryViewHierarchyIntegration.m */; };
0A9BF4E428A114B50068D266 /* SentryViewHierarchyIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A9BF4E328A114B50068D266 /* SentryViewHierarchyIntegration.h */; };
0A9BF4E928A125390068D266 /* TestSentryViewHierarchyProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A9BF4E628A123270068D266 /* TestSentryViewHierarchyProvider.swift */; };
0A9BF4EB28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A9BF4EA28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift */; };
0A9E917128DC7E7000FB4182 /* SentryInternalCDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0A9E917028DC7E7000FB4182 /* SentryInternalCDefines.h */; };
Expand Down Expand Up @@ -795,6 +793,8 @@
D48954DC2EF950BD0086F240 /* SentryUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48954DB2EF950B70086F240 /* SentryUnitTests.swift */; };
D489551C2EF954EA0086F240 /* SentryAttributeValuableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48955162EF954DD0086F240 /* SentryAttributeValuableTests.swift */; };
D489551E2EF955010086F240 /* SentryAttributeValueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D489551D2EF954FB0086F240 /* SentryAttributeValueTests.swift */; };
D48AFF222F154E5100D2F797 /* SentryViewHierarchyIntegration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48AFF202F154E5100D2F797 /* SentryViewHierarchyIntegration.swift */; };
D48AFF462F15518900D2F797 /* SentryViewHierarchyIntegrationTestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48AFF452F15518900D2F797 /* SentryViewHierarchyIntegrationTestHelper.swift */; };
D48E8B8B2D3E79610032E35E /* SentryTraceOrigin.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48E8B8A2D3E79610032E35E /* SentryTraceOrigin.swift */; };
D48E8B9D2D3E82AC0032E35E /* SentrySpanOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D48E8B9C2D3E82AC0032E35E /* SentrySpanOperation.swift */; };
D49480D32DC23E9300A3B6E9 /* SentryReplayTypeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D49480D22DC23E8E00A3B6E9 /* SentryReplayTypeTests.swift */; };
Expand Down Expand Up @@ -1350,8 +1350,6 @@
0A56DA5E28ABA01B00C400D5 /* SentryTransactionContext+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryTransactionContext+Private.h"; path = "include/SentryTransactionContext+Private.h"; sourceTree = "<group>"; };
0A94158128F6C4C2006A5DD1 /* SentryAppStateManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAppStateManagerTests.swift; sourceTree = "<group>"; };
0A9415B928F96CAC006A5DD1 /* TestSentryReachability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryReachability.swift; sourceTree = "<group>"; };
0A9BF4E128A114940068D266 /* SentryViewHierarchyIntegration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryViewHierarchyIntegration.m; sourceTree = "<group>"; };
0A9BF4E328A114B50068D266 /* SentryViewHierarchyIntegration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryViewHierarchyIntegration.h; path = include/SentryViewHierarchyIntegration.h; sourceTree = "<group>"; };
0A9BF4E628A123270068D266 /* TestSentryViewHierarchyProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryViewHierarchyProvider.swift; sourceTree = "<group>"; };
0A9BF4EA28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryViewHierarchyIntegrationTests.swift; sourceTree = "<group>"; };
0A9E917028DC7E7000FB4182 /* SentryInternalCDefines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryInternalCDefines.h; path = include/SentryInternalCDefines.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2189,6 +2187,8 @@
D48954DB2EF950B70086F240 /* SentryUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUnitTests.swift; sourceTree = "<group>"; };
D48955162EF954DD0086F240 /* SentryAttributeValuableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAttributeValuableTests.swift; sourceTree = "<group>"; };
D489551D2EF954FB0086F240 /* SentryAttributeValueTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAttributeValueTests.swift; sourceTree = "<group>"; };
D48AFF202F154E5100D2F797 /* SentryViewHierarchyIntegration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryViewHierarchyIntegration.swift; sourceTree = "<group>"; };
D48AFF452F15518900D2F797 /* SentryViewHierarchyIntegrationTestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryViewHierarchyIntegrationTestHelper.swift; sourceTree = "<group>"; };
D48E8B8A2D3E79610032E35E /* SentryTraceOrigin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTraceOrigin.swift; sourceTree = "<group>"; };
D48E8B9C2D3E82AC0032E35E /* SentrySpanOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySpanOperation.swift; sourceTree = "<group>"; };
D49480D22DC23E8E00A3B6E9 /* SentryReplayTypeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryReplayTypeTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2306,7 +2306,6 @@
D867063A27C3BC2400048851 /* SentryCoreDataTrackingIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryCoreDataTrackingIntegration.h; path = include/SentryCoreDataTrackingIntegration.h; sourceTree = "<group>"; };
D867063B27C3BC2400048851 /* SentryCoreDataSwizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryCoreDataSwizzling.h; path = include/SentryCoreDataSwizzling.h; sourceTree = "<group>"; };
D867063C27C3BC2400048851 /* SentryCoreDataTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryCoreDataTracker.h; path = include/SentryCoreDataTracker.h; sourceTree = "<group>"; };
D86B6820293F39E000B8B1FC /* TestSentryViewHierarchyProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestSentryViewHierarchyProvider.h; sourceTree = "<group>"; };
D86B6834294348A400B8B1FC /* SentryAttachment+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryAttachment+Private.h"; path = "include/SentryAttachment+Private.h"; sourceTree = "<group>"; };
D86F419727C8FEFA00490520 /* SentryCoreDataTrackerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCoreDataTrackerExtension.swift; sourceTree = "<group>"; };
D8709AC32D3E9C5C006C491E /* SentryReplayMaskPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryReplayMaskPreview.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2662,21 +2661,12 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0A9BF4E028A114690068D266 /* ViewHierarchy */ = {
isa = PBXGroup;
children = (
0A9BF4E328A114B50068D266 /* SentryViewHierarchyIntegration.h */,
0A9BF4E128A114940068D266 /* SentryViewHierarchyIntegration.m */,
);
name = ViewHierarchy;
sourceTree = "<group>";
};
0A9BF4E528A123070068D266 /* ViewHierarchy */ = {
isa = PBXGroup;
children = (
D48AFF452F15518900D2F797 /* SentryViewHierarchyIntegrationTestHelper.swift */,
0A9BF4EA28A127120068D266 /* SentryViewHierarchyIntegrationTests.swift */,
0A9BF4E628A123270068D266 /* TestSentryViewHierarchyProvider.swift */,
D86B6820293F39E000B8B1FC /* TestSentryViewHierarchyProvider.h */,
);
path = ViewHierarchy;
sourceTree = "<group>";
Expand Down Expand Up @@ -2998,7 +2988,6 @@
7BE0DC36272AE80A004FA8B7 /* Session */,
7BE0DC35272AE7BF004FA8B7 /* SentryCrash */,
D85596EF280580BE0041FF8B /* Screenshot */,
0A9BF4E028A114690068D266 /* ViewHierarchy */,
D80CD8D52B752FD9002F710B /* SessionReplay */,
FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */,
7BA235622600B61200E12865 /* SentryInternalNotificationNames.h */,
Expand Down Expand Up @@ -4500,6 +4489,14 @@
path = Transactions;
sourceTree = "<group>";
};
D48AFF212F154E5100D2F797 /* ViewHierarchy */ = {
isa = PBXGroup;
children = (
D48AFF202F154E5100D2F797 /* SentryViewHierarchyIntegration.swift */,
);
path = ViewHierarchy;
sourceTree = "<group>";
};
D4A0C22A2E9E3CE100791353 /* InfoPlist */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4953,6 +4950,7 @@
D8739CF72BECFF92007D2F66 /* Performance */,
D8CAC02C2BA0663E00E38F34 /* SessionReplay */,
D452FCBC2DDB6FA800AFF56F /* WatchdogTerminations */,
D48AFF212F154E5100D2F797 /* ViewHierarchy */,
);
path = Integrations;
sourceTree = "<group>";
Expand Down Expand Up @@ -5235,7 +5233,6 @@
03BCC38E27E2A377003232C7 /* SentryProfilingConditionals.h in Headers */,
848A451A2BBF8D33006AAAEC /* SentryContinuousProfiler.h in Headers */,
8E133FA625E72EB400ABD0BF /* SentrySamplingContext.h in Headers */,
0A9BF4E428A114B50068D266 /* SentryViewHierarchyIntegration.h in Headers */,
D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */,
8E4E7C7425DAAB49006AB9E2 /* SentrySpanProtocol.h in Headers */,
8EC4CF4A25C38DAA0093DEE9 /* SentrySpanStatus.h in Headers */,
Expand Down Expand Up @@ -6047,7 +6044,6 @@
63FE70D720DA4C1000CDBAE8 /* SentryCrashMonitor_MachException.c in Sources */,
7B96572226830D2400C66E25 /* SentryScopeSyncC.c in Sources */,
F44D2B5D2E6B7E8700FF31FA /* SentryProfilingScreenFramesHelper.m in Sources */,
0A9BF4E228A114940068D266 /* SentryViewHierarchyIntegration.m in Sources */,
D8AFC03D2BDA79BF00118BE1 /* SentryReplayVideoMaker.swift in Sources */,
840A11122B61E27500650D02 /* SentrySamplerDecision.m in Sources */,
D48891CE2E98F28E00212823 /* SentryInfoPlistWrapper.swift in Sources */,
Expand Down Expand Up @@ -6248,6 +6244,7 @@
63FE711920DA4C1000CDBAE8 /* SentryCrashMachineContext.c in Sources */,
63FE711B20DA4C1000CDBAE8 /* SentryCrashString.c in Sources */,
7B14089824878F950035403D /* SentryCrashStackEntryMapper.m in Sources */,
D48AFF222F154E5100D2F797 /* SentryViewHierarchyIntegration.swift in Sources */,
D8BC28C82BFF5EBB0054DA4D /* SentryTouchTracker.swift in Sources */,
63FE711720DA4C1000CDBAE8 /* SentryCrashStackCursor_Backtrace.c in Sources */,
FA3A42722E1C5F9B00A08C39 /* SentryNSNotificationCenterWrapper.swift in Sources */,
Expand Down Expand Up @@ -6388,6 +6385,7 @@
8431EE5B29ADB8EA00D8DC56 /* SentryTimeTests.m in Sources */,
FA27EBF52EB82FAD00F2ECF7 /* FileIOTrackerTestHelpers.swift in Sources */,
7B0A54562523178700A71716 /* SentryScopeSwiftTests.swift in Sources */,
D48AFF462F15518900D2F797 /* SentryViewHierarchyIntegrationTestHelper.swift in Sources */,
7B5B94332657A816002E474B /* SentryAppStartTrackingIntegrationTests.swift in Sources */,
62278CA82E30B21A0022ABC6 /* SentryHttpTransportFlushIntegrationTests.swift in Sources */,
0A5370A128A3EC2400B2DCDE /* SentryViewHierarchyProviderTests.swift in Sources */,
Expand Down
3 changes: 1 addition & 2 deletions Sources/Sentry/SentrySDKInternal.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
# import "SentryAppStartTrackingIntegration.h"
# import "SentryPerformanceTrackingIntegration.h"
# import "SentryUIEventTrackingIntegration.h"
# import "SentryViewHierarchyIntegration.h"
#endif // SENTRY_HAS_UIKIT

#if TARGET_OS_OSX
Expand Down Expand Up @@ -511,7 +510,7 @@ + (void)endSession
[SentryCrashIntegration class],
#if SENTRY_HAS_UIKIT
[SentryAppStartTrackingIntegration class], [SentryPerformanceTrackingIntegration class],
[SentryUIEventTrackingIntegration class], [SentryViewHierarchyIntegration class],
[SentryUIEventTrackingIntegration class],
#endif // SENTRY_HAS_UIKIT
[SentryAutoBreadcrumbTrackingIntegration class], [SentryCoreDataTrackingIntegration class],
[SentryFileIOTrackingIntegration class], nil];
Expand Down
106 changes: 0 additions & 106 deletions Sources/Sentry/SentryViewHierarchyIntegration.m
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions Sources/Sentry/include/SentryViewHierarchyIntegration.h
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Sources/Swift/Core/Integrations/Integrations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ private struct AnyIntegration {

#if (os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)) && !SENTRY_NO_UIKIT
integrations.append(.init(SentryScreenshotIntegration.self))
integrations.append(.init(SentryViewHierarchyIntegration.self))
#endif

#if os(iOS) || os(macOS)
Expand Down
Loading
Loading