Skip to content

Commit 85be4ce

Browse files
committed
ref: Create file io tracker Swift interface
1 parent f9f21b2 commit 85be4ce

17 files changed

+278
-210
lines changed

Sentry.xcodeproj/project.pbxproj

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -924,10 +924,10 @@
924924
D8A65B5D2C98656800974B74 /* SentryReplayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8A65B5C2C98656000974B74 /* SentryReplayView.swift */; };
925925
D8AB40DB2806EC1900E5E9F7 /* SentryScreenshotIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = D8AB40DA2806EC1900E5E9F7 /* SentryScreenshotIntegration.h */; };
926926
D8ACE3C72762187200F5A213 /* SentryNSDataSwizzling.m in Sources */ = {isa = PBXBuildFile; fileRef = D8ACE3C42762187200F5A213 /* SentryNSDataSwizzling.m */; };
927-
D8ACE3C82762187200F5A213 /* SentryFileIOTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = D8ACE3C52762187200F5A213 /* SentryFileIOTracker.m */; };
927+
D8ACE3C82762187200F5A213 /* SentryFileIOTrackerHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = D8ACE3C52762187200F5A213 /* SentryFileIOTrackerHelper.m */; };
928928
D8ACE3C92762187200F5A213 /* SentryFileIOTrackingIntegration.m in Sources */ = {isa = PBXBuildFile; fileRef = D8ACE3C62762187200F5A213 /* SentryFileIOTrackingIntegration.m */; };
929929
D8ACE3CD2762187D00F5A213 /* SentryNSDataSwizzling.h in Headers */ = {isa = PBXBuildFile; fileRef = D8ACE3CA2762187D00F5A213 /* SentryNSDataSwizzling.h */; };
930-
D8ACE3CE2762187D00F5A213 /* SentryFileIOTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = D8ACE3CB2762187D00F5A213 /* SentryFileIOTracker.h */; };
930+
D8ACE3CE2762187D00F5A213 /* SentryFileIOTrackerHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = D8ACE3CB2762187D00F5A213 /* SentryFileIOTrackerHelper.h */; };
931931
D8ACE3CF2762187D00F5A213 /* SentryFileIOTrackingIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = D8ACE3CC2762187D00F5A213 /* SentryFileIOTrackingIntegration.h */; };
932932
D8AE48BF2C578D540092A2A6 /* SentrySDKLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AE48BE2C578D540092A2A6 /* SentrySDKLog.swift */; };
933933
D8AE48C12C57B1550092A2A6 /* SentryLevelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AE48C02C57B1550092A2A6 /* SentryLevelTests.swift */; };
@@ -1083,6 +1083,7 @@
10831083
FA7206E12E0B37C80072FDD4 /* SentryProfileCollector.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA7206E02E0B37C60072FDD4 /* SentryProfileCollector.mm */; };
10841084
FA8A36182DEAA1EB0058D883 /* SentryThread+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = FA8A36172DEAA1EB0058D883 /* SentryThread+Private.h */; };
10851085
FA8AFCED2E8434A8007A0E18 /* SentryThreadInspector.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8AFCE72E8434A0007A0E18 /* SentryThreadInspector.swift */; };
1086+
FA8AFCEF2E843903007A0E18 /* SentryFileIOTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8AFCEE2E8438FF007A0E18 /* SentryFileIOTracker.swift */; };
10861087
FA8AFCFA2E844AB6007A0E18 /* SentryThreadsafeApplicationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8AFCF42E844AB1007A0E18 /* SentryThreadsafeApplicationTests.swift */; };
10871088
FA8AFDAC2E84FAEE007A0E18 /* TestSentryUIApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA6614FB2E4B8E1500657755 /* TestSentryUIApplication.swift */; };
10881089
FA8E58F12E0AD4270049F69D /* SentryDispatchQueueWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8E58F02E0AD4220049F69D /* SentryDispatchQueueWrapper.swift */; };
@@ -2260,10 +2261,10 @@
22602261
D8A65B5C2C98656000974B74 /* SentryReplayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryReplayView.swift; sourceTree = "<group>"; };
22612262
D8AB40DA2806EC1900E5E9F7 /* SentryScreenshotIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryScreenshotIntegration.h; path = include/SentryScreenshotIntegration.h; sourceTree = "<group>"; };
22622263
D8ACE3C42762187200F5A213 /* SentryNSDataSwizzling.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryNSDataSwizzling.m; sourceTree = "<group>"; };
2263-
D8ACE3C52762187200F5A213 /* SentryFileIOTracker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryFileIOTracker.m; sourceTree = "<group>"; };
2264+
D8ACE3C52762187200F5A213 /* SentryFileIOTrackerHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryFileIOTrackerHelper.m; sourceTree = "<group>"; };
22642265
D8ACE3C62762187200F5A213 /* SentryFileIOTrackingIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryFileIOTrackingIntegration.m; sourceTree = "<group>"; };
22652266
D8ACE3CA2762187D00F5A213 /* SentryNSDataSwizzling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryNSDataSwizzling.h; path = include/SentryNSDataSwizzling.h; sourceTree = "<group>"; };
2266-
D8ACE3CB2762187D00F5A213 /* SentryFileIOTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryFileIOTracker.h; path = include/SentryFileIOTracker.h; sourceTree = "<group>"; };
2267+
D8ACE3CB2762187D00F5A213 /* SentryFileIOTrackerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryFileIOTrackerHelper.h; path = include/SentryFileIOTrackerHelper.h; sourceTree = "<group>"; };
22672268
D8ACE3CC2762187D00F5A213 /* SentryFileIOTrackingIntegration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryFileIOTrackingIntegration.h; path = include/SentryFileIOTrackingIntegration.h; sourceTree = "<group>"; };
22682269
D8AE48B12C5786AA0092A2A6 /* SentryLogC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryLogC.h; path = include/SentryLogC.h; sourceTree = "<group>"; };
22692270
D8AE48BE2C578D540092A2A6 /* SentrySDKLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySDKLog.swift; sourceTree = "<group>"; };
@@ -2427,6 +2428,7 @@
24272428
FA7206E02E0B37C60072FDD4 /* SentryProfileCollector.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryProfileCollector.mm; sourceTree = "<group>"; };
24282429
FA8A36172DEAA1EB0058D883 /* SentryThread+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryThread+Private.h"; path = "include/SentryThread+Private.h"; sourceTree = "<group>"; };
24292430
FA8AFCE72E8434A0007A0E18 /* SentryThreadInspector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryThreadInspector.swift; sourceTree = "<group>"; };
2431+
FA8AFCEE2E8438FF007A0E18 /* SentryFileIOTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFileIOTracker.swift; sourceTree = "<group>"; };
24302432
FA8AFCF42E844AB1007A0E18 /* SentryThreadsafeApplicationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryThreadsafeApplicationTests.swift; sourceTree = "<group>"; };
24312433
FA8E58F02E0AD4220049F69D /* SentryDispatchQueueWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDispatchQueueWrapper.swift; sourceTree = "<group>"; };
24322434
FA90FAA72E06614B008CAAE8 /* SentryExtraPackages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryExtraPackages.swift; sourceTree = "<group>"; };
@@ -4236,6 +4238,7 @@
42364238
D468C0602D36699700964230 /* IO */ = {
42374239
isa = PBXGroup;
42384240
children = (
4241+
FA8AFCEE2E8438FF007A0E18 /* SentryFileIOTracker.swift */,
42394242
D4EDF9832D0B2A1D0071E7B3 /* Data+SentryTracing.swift */,
42404243
D473ACD62D8090FC000F1CC6 /* FileManager+SentryTracing.swift */,
42414244
D468C0612D3669A200964230 /* SentryFileIOTracker+SwiftHelpers.swift */,
@@ -4616,8 +4619,8 @@
46164619
D8ACE3C32762185E00F5A213 /* IO */ = {
46174620
isa = PBXGroup;
46184621
children = (
4619-
D8ACE3CB2762187D00F5A213 /* SentryFileIOTracker.h */,
4620-
D8ACE3C52762187200F5A213 /* SentryFileIOTracker.m */,
4622+
D8ACE3CB2762187D00F5A213 /* SentryFileIOTrackerHelper.h */,
4623+
D8ACE3C52762187200F5A213 /* SentryFileIOTrackerHelper.m */,
46214624
D8ACE3CC2762187D00F5A213 /* SentryFileIOTrackingIntegration.h */,
46224625
D8ACE3C62762187200F5A213 /* SentryFileIOTrackingIntegration.m */,
46234626
D8ACE3CA2762187D00F5A213 /* SentryNSDataSwizzling.h */,
@@ -5030,7 +5033,7 @@
50305033
7BC3936825B1AB3E004F03D3 /* SentryLevelMapper.h in Headers */,
50315034
8E4E7C6E25DAAAFE006AB9E2 /* SentrySpan.h in Headers */,
50325035
84DEE8762B69AD6400A7BC17 /* SentryLaunchProfiling.h in Headers */,
5033-
D8ACE3CE2762187D00F5A213 /* SentryFileIOTracker.h in Headers */,
5036+
D8ACE3CE2762187D00F5A213 /* SentryFileIOTrackerHelper.h in Headers */,
50345037
03F84D2427DD414C008FE43F /* SentryCompiler.h in Headers */,
50355038
631E6D331EBC679C00712345 /* SentryQueueableRequestManager.h in Headers */,
50365039
33EB2A922C341300004FED3D /* Sentry.h in Headers */,
@@ -5615,7 +5618,7 @@
56155618
84CFA4CA2C9DF884008DA5F4 /* SentryUserFeedbackWidget.swift in Sources */,
56165619
FAF1201A2E70C0EE006E1DA3 /* SentryEnvelopeHeaderHelper.m in Sources */,
56175620
F49D419E2DEA3D0600D9244E /* SentryCrashExceptionApplicationHelper.m in Sources */,
5618-
D8ACE3C82762187200F5A213 /* SentryFileIOTracker.m in Sources */,
5621+
D8ACE3C82762187200F5A213 /* SentryFileIOTrackerHelper.m in Sources */,
56195622
D8B088B729C9E3FF00213258 /* SentryTracerConfiguration.m in Sources */,
56205623
FA7206E12E0B37C80072FDD4 /* SentryProfileCollector.mm in Sources */,
56215624
9264E1EB2E2E385E00B077CF /* SentryLogMessage.swift in Sources */,
@@ -5626,6 +5629,7 @@
56265629
03F84D3727DD4191008FE43F /* SentrySamplingProfiler.cpp in Sources */,
56275630
8453421628BE8A9500C22EEC /* SentrySpanStatus.m in Sources */,
56285631
6292585B2DAFA5F70049388F /* SentryCrashCxaThrowSwapper.c in Sources */,
5632+
FA8AFCEF2E843903007A0E18 /* SentryFileIOTracker.swift in Sources */,
56295633
92D957732E05A44600E20E66 /* SentryAsyncLog.m in Sources */,
56305634
7B08A3472924CF9C0059603A /* SentryMetricKitIntegration.m in Sources */,
56315635
623FD9022D3FA5E000803EDA /* SentryFrameCodable.swift in Sources */,

Sources/Sentry/SentryDependencyContainer.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#import "SentryDefaultThreadInspector.h"
44
#import "SentryExtraContextProvider.h"
5-
#import "SentryFileIOTracker.h"
65
#import "SentryInternalCDefines.h"
76
#import "SentryInternalDefines.h"
87
#import "SentryLogC.h"
@@ -223,17 +222,14 @@ - (nullable SentryFileManager *)fileManager SENTRY_THREAD_SANITIZER_DOUBLE_CHECK
223222
dispatchQueueWrapper:self.dispatchQueueWrapper
224223
notificationCenterWrapper:self.notificationCenterWrapper]);
225224
}
226-
227-
- (SentryThreadInspector *)threadInspector SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
225+
- (SentryThreadInspector *)threadInspector
228226
{
229227
return SentryDependencies.threadInspector;
230228
}
231229

232-
- (SentryFileIOTracker *)fileIOTracker SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
230+
- (SentryFileIOTracker *)fileIOTracker
233231
{
234-
SENTRY_LAZY_INIT(_fileIOTracker,
235-
[[SentryFileIOTracker alloc] initWithThreadInspector:[self threadInspector]
236-
processInfoWrapper:[self processInfoWrapper]]);
232+
return SentryDependencies.fileIOTracker;
237233
}
238234

239235
- (SentryCrash *)crashReporter SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK

0 commit comments

Comments
 (0)