Skip to content

Commit aff3b66

Browse files
authored
ref: Convert SentryThreadWrapper to Swift (#6223)
1 parent a7e7bab commit aff3b66

12 files changed

+18
-58
lines changed

Sentry.xcodeproj/project.pbxproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,6 @@
364364
7B18DE4028D9F748004845C6 /* SentryNotificationNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B18DE3F28D9F748004845C6 /* SentryNotificationNames.h */; };
365365
7B26BBFB24C0A66D00A79CCC /* SentrySdkInfoNilTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */; };
366366
7B2A70D827D5F080008B0D15 /* SentryANRTrackerV1Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70D727D5F07F008B0D15 /* SentryANRTrackerV1Tests.swift */; };
367-
7B2A70DB27D607CF008B0D15 /* SentryThreadWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2A70DA27D607CF008B0D15 /* SentryThreadWrapper.h */; };
368-
7B2A70DD27D6083D008B0D15 /* SentryThreadWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70DC27D6083D008B0D15 /* SentryThreadWrapper.m */; };
369367
7B2A70DF27D60904008B0D15 /* SentryTestThreadWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */; };
370368
7B2BB0032966F55900A1E102 /* SentryOptionsInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */; settings = {ATTRIBUTES = (Private, ); }; };
371369
7B30B67C26527886006B2752 /* SentryDisplayLinkWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B30B67B26527886006B2752 /* SentryDisplayLinkWrapper.h */; };
@@ -1119,6 +1117,7 @@
11191117
FAE2DAB82E1F317900262307 /* SentryProfilingSwiftHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */; };
11201118
FAE2DABA2E1F318900262307 /* SentryProfilingSwiftHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */; };
11211119
FAE5798D2E7D9D4C00B710F9 /* SentrySysctl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */; };
1120+
FAE579C22E7DDDE700B710F9 /* SentryThreadWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE579BC2E7DDDE400B710F9 /* SentryThreadWrapper.swift */; };
11221121
FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */; };
11231122
FAEC270E2DF3526000878871 /* SentryUserFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */; };
11241123
FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
@@ -1617,8 +1616,6 @@
16171616
7B18DE4328D9F8F6004845C6 /* TestNSNotificationCenterWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestNSNotificationCenterWrapper.swift; sourceTree = "<group>"; };
16181617
7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySdkInfoNilTests.m; sourceTree = "<group>"; };
16191618
7B2A70D727D5F07F008B0D15 /* SentryANRTrackerV1Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryANRTrackerV1Tests.swift; sourceTree = "<group>"; };
1620-
7B2A70DA27D607CF008B0D15 /* SentryThreadWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryThreadWrapper.h; path = include/SentryThreadWrapper.h; sourceTree = "<group>"; };
1621-
7B2A70DC27D6083D008B0D15 /* SentryThreadWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryThreadWrapper.m; sourceTree = "<group>"; };
16221619
7B2A70DE27D60904008B0D15 /* SentryTestThreadWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryTestThreadWrapper.swift; sourceTree = "<group>"; };
16231620
7B2BB0012966F55900A1E102 /* SentryOptionsInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryOptionsInternal.h; path = include/HybridPublic/SentryOptionsInternal.h; sourceTree = "<group>"; };
16241621
7B30B67B26527886006B2752 /* SentryDisplayLinkWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDisplayLinkWrapper.h; path = include/SentryDisplayLinkWrapper.h; sourceTree = "<group>"; };
@@ -2466,6 +2463,7 @@
24662463
FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpers.m; sourceTree = "<group>"; };
24672464
FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilingSwiftHelpers.h; path = Sources/Sentry/include/SentryProfilingSwiftHelpers.h; sourceTree = SOURCE_ROOT; };
24682465
FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySysctl.swift; sourceTree = "<group>"; };
2466+
FAE579BC2E7DDDE400B710F9 /* SentryThreadWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryThreadWrapper.swift; sourceTree = "<group>"; };
24692467
FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryEvent+Serialize.h"; path = "include/SentryEvent+Serialize.h"; sourceTree = "<group>"; };
24702468
FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedback.swift; sourceTree = "<group>"; };
24712469
FAEC273C2DF3933200878871 /* NSData+Unzip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Unzip.m"; sourceTree = "<group>"; };
@@ -2606,6 +2604,7 @@
26062604
isa = PBXGroup;
26072605
children = (
26082606
FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */,
2607+
FAE579BC2E7DDDE400B710F9 /* SentryThreadWrapper.swift */,
26092608
62CB19242E77F8FD00AF5DA2 /* SentryDispatchSourceWrapper.swift */,
26102609
FAEEC04C2E75E55A00E79CA9 /* SentrySerializationSwift.swift */,
26112610
FA94E7232E6F32FA00576666 /* SentryEnvelopeItemType.swift */,
@@ -2937,8 +2936,6 @@
29372936
7BD86EC6264A641D005439DB /* SentrySysctlObjC.m */,
29382937
D8479327278873A100BE8E99 /* SentryByteCountFormatter.h */,
29392938
D84793242788737D00BE8E99 /* SentryByteCountFormatter.m */,
2940-
7B2A70DA27D607CF008B0D15 /* SentryThreadWrapper.h */,
2941-
7B2A70DC27D6083D008B0D15 /* SentryThreadWrapper.m */,
29422939
7B18DE3F28D9F748004845C6 /* SentryNotificationNames.h */,
29432940
84A8891A28DBD28900C51DFD /* SentryDevice.h */,
29442941
84A8891B28DBD28900C51DFD /* SentryDevice.m */,
@@ -5007,7 +5004,6 @@
50075004
63AA76991EB9C1C200D153DE /* SentryDefines.h in Headers */,
50085005
D86B6835294348A400B8B1FC /* SentryAttachment+Private.h in Headers */,
50095006
84AF45A629A7FFA500FBB177 /* SentryProfiledTracerConcurrency.h in Headers */,
5010-
7B2A70DB27D607CF008B0D15 /* SentryThreadWrapper.h in Headers */,
50115007
8EAE980B261E9F530073B6B3 /* SentryPerformanceTracker.h in Headers */,
50125008
F48F75732E5FA649009D4E7D /* SentryBinaryImageCacheCallbacks.h in Headers */,
50135009
63FE718520DA4C1100CDBAE8 /* SentryCrashC.h in Headers */,
@@ -5732,6 +5728,7 @@
57325728
7BBD188B244841FB00427C76 /* SentryHttpDateParser.m in Sources */,
57335729
D8AFC03D2BDA79BF00118BE1 /* SentryReplayVideoMaker.swift in Sources */,
57345730
840A11122B61E27500650D02 /* SentrySamplerDecision.m in Sources */,
5731+
FAE579C22E7DDDE700B710F9 /* SentryThreadWrapper.swift in Sources */,
57355732
F458D1132E180BB00028273E /* SentryFileManagerProtocol.swift in Sources */,
57365733
8E4E7C8225DAB2A5006AB9E2 /* SentryTracer.m in Sources */,
57375734
848A45192BBF8D33006AAAEC /* SentryContinuousProfiler.mm in Sources */,
@@ -5809,7 +5806,6 @@
58095806
F48F75712E5FA630009D4E7D /* SentryBinaryImageCacheCallbacks.m in Sources */,
58105807
FA67DD182DDBD4EA00896B02 /* UIImageHelper.swift in Sources */,
58115808
FA67DD192DDBD4EA00896B02 /* SwizzleClassNameExclude.swift in Sources */,
5812-
7B2A70DD27D6083D008B0D15 /* SentryThreadWrapper.m in Sources */,
58135809
D8ACE3C72762187200F5A213 /* SentryNSDataSwizzling.m in Sources */,
58145810
F48F767C2E60B555009D4E7D /* SentryNSTimerFactory.swift in Sources */,
58155811
638DC9A11EBC6B6400A66E41 /* SentryRequestOperation.m in Sources */,

Sources/Sentry/SentryANRTrackerV1.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#import "SentryDependencyContainer.h"
33
#import "SentryLogC.h"
44
#import "SentrySwift.h"
5-
#import "SentryThreadWrapper.h"
65
#import <stdatomic.h>
76

87
NS_ASSUME_NONNULL_BEGIN

Sources/Sentry/SentryANRTrackerV2.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# import "SentryFramesTracker.h"
77
# import "SentryLogC.h"
88
# import "SentrySwift.h"
9-
# import "SentryThreadWrapper.h"
109
# import "SentryTime.h"
1110
# import <stdatomic.h>
1211

Sources/Sentry/SentryANRTrackingIntegration.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import "SentrySwift.h"
1515
#import "SentryThread.h"
1616
#import "SentryThreadInspector.h"
17-
#import "SentryThreadWrapper.h"
1817
#import <SentryOptions+Private.h>
1918

2019
#if SENTRY_HAS_UIKIT

Sources/Sentry/SentryDependencyContainer.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#import <SentrySDK+Private.h>
2828
#import <SentrySwift.h>
2929
#import <SentrySwizzleWrapper.h>
30-
#import <SentryThreadWrapper.h>
3130
#import <SentryTracer.h>
3231
#import <SentryUIViewControllerPerformanceTracker.h>
3332
#import <SentryWatchdogTerminationScopeObserver.h>

Sources/Sentry/SentryThreadWrapper.m

Lines changed: 0 additions & 25 deletions
This file was deleted.

Sources/Sentry/SentryTracer.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#import "SentrySpanId.h"
2222
#import "SentrySpanOperation.h"
2323
#import "SentrySwift.h"
24-
#import "SentryThreadWrapper.h"
2524
#import "SentryTime.h"
2625
#import "SentryTraceContext.h"
2726
#import "SentryTracer+Private.h"

Sources/Sentry/_SentryDispatchQueueWrapperInternal.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#import "_SentryDispatchQueueWrapperInternal.h"
2-
#import "SentryThreadWrapper.h"
32

43
NS_ASSUME_NONNULL_BEGIN
54

Sources/Sentry/include/SentryThreadWrapper.h

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@_spi(Private) @objc public class SentryThreadWrapper: NSObject {
2+
@objc public func sleep(forTimeInterval timeInterval: TimeInterval) {
3+
Thread.sleep(forTimeInterval: timeInterval)
4+
}
5+
6+
@objc public func threadStarted(_ threadID: UUID) {
7+
// No op. Only needed for testing.
8+
}
9+
10+
@objc public func threadFinished(_ threadID: UUID) {
11+
// No op. Only needed for testing.
12+
}
13+
}

0 commit comments

Comments
 (0)