Skip to content

Commit 1a4afd3

Browse files
authored
ref: Convert SentryDefaultLimits to Swift (#6285)
* ref: Convert `SentryDefaultLimits` to Swift * Add new swift files to project * Fix method renamed * Code cleanup * Add missing `@_spi(Private)` to `RateLimits` * Fix tests
1 parent ab5ba5e commit 1a4afd3

17 files changed

+147
-199
lines changed

Sentry.xcodeproj/project.pbxproj

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,6 @@
492492
7BBC827925DFD7D7005F1ED8 /* SentryInAppLogicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBC827825DFD7D7005F1ED8 /* SentryInAppLogicTests.swift */; };
493493
7BBD188D2448453600427C76 /* SentryHttpDateParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD188C2448453600427C76 /* SentryHttpDateParserTests.swift */; };
494494
7BBD188F2448469A00427C76 /* HttpDateFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD188E2448469A00427C76 /* HttpDateFormatter.swift */; };
495-
7BBD18912449BE9000427C76 /* SentryDefaultRateLimits.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBD18902449BE9000427C76 /* SentryDefaultRateLimits.h */; };
496-
7BBD18932449BEDD00427C76 /* SentryDefaultRateLimits.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD18922449BEDD00427C76 /* SentryDefaultRateLimits.m */; };
497-
7BBD18972449DC1D00427C76 /* SentryRateLimits.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BBD18962449DC1D00427C76 /* SentryRateLimits.h */; };
498495
7BBD18992449DE9D00427C76 /* TestRateLimits.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD18982449DE9D00427C76 /* TestRateLimits.swift */; };
499496
7BBD18A2244EE2FD00427C76 /* TestResponseFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD18A1244EE2FD00427C76 /* TestResponseFactory.swift */; };
500497
7BBD18B22451804C00427C76 /* SentryRetryAfterHeaderParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BBD189F244ED1A200427C76 /* SentryRetryAfterHeaderParserTests.swift */; };
@@ -994,6 +991,8 @@
994991
F458D1152E1869AD0028273E /* SentryScopePersistentStore+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = F458D1142E1869AD0028273E /* SentryScopePersistentStore+String.swift */; };
995992
F458D1172E186DF20028273E /* SentryScopePersistentStore+Fingerprint.swift in Sources */ = {isa = PBXBuildFile; fileRef = F458D1162E186DF20028273E /* SentryScopePersistentStore+Fingerprint.swift */; };
996993
F458D1192E186E000028273E /* SentryScopePersistentStore+Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = F458D1182E186E000028273E /* SentryScopePersistentStore+Extras.swift */; };
994+
F465D2132E87E36F00FE2DD9 /* RateLimits.swift in Sources */ = {isa = PBXBuildFile; fileRef = F465D2122E87E36F00FE2DD9 /* RateLimits.swift */; };
995+
F465D2142E87E36F00FE2DD9 /* DefaultRateLimits.swift in Sources */ = {isa = PBXBuildFile; fileRef = F465D2112E87E36F00FE2DD9 /* DefaultRateLimits.swift */; };
997996
F46DA6C32E1DBCA000DF6E3B /* SentryScopePersistentStore+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F46DA6C22E1DBCA000DF6E3B /* SentryScopePersistentStore+Helper.swift */; };
998997
F46E0BA82E6A19F900DAA75C /* SentryCrashWrapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F46E0BA72E6A19F900DAA75C /* SentryCrashWrapperTests.swift */; };
999998
F48E2E0A2E6637840073CB22 /* TestSentryCrashWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F48E2E092E6637840073CB22 /* TestSentryCrashWrapper.swift */; };
@@ -1763,10 +1762,7 @@
17631762
7BBC827825DFD7D7005F1ED8 /* SentryInAppLogicTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryInAppLogicTests.swift; sourceTree = "<group>"; };
17641763
7BBD188C2448453600427C76 /* SentryHttpDateParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryHttpDateParserTests.swift; sourceTree = "<group>"; };
17651764
7BBD188E2448469A00427C76 /* HttpDateFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HttpDateFormatter.swift; sourceTree = "<group>"; };
1766-
7BBD18902449BE9000427C76 /* SentryDefaultRateLimits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDefaultRateLimits.h; path = include/SentryDefaultRateLimits.h; sourceTree = "<group>"; };
1767-
7BBD18922449BEDD00427C76 /* SentryDefaultRateLimits.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDefaultRateLimits.m; sourceTree = "<group>"; };
17681765
7BBD18942449D3E200427C76 /* SentryDefaultRateLimitsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryDefaultRateLimitsTests.swift; sourceTree = "<group>"; };
1769-
7BBD18962449DC1D00427C76 /* SentryRateLimits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryRateLimits.h; path = include/SentryRateLimits.h; sourceTree = "<group>"; };
17701766
7BBD18982449DE9D00427C76 /* TestRateLimits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestRateLimits.swift; sourceTree = "<group>"; };
17711767
7BBD189F244ED1A200427C76 /* SentryRetryAfterHeaderParserTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryRetryAfterHeaderParserTests.swift; sourceTree = "<group>"; };
17721768
7BBD18A1244EE2FD00427C76 /* TestResponseFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestResponseFactory.swift; sourceTree = "<group>"; };
@@ -2336,6 +2332,8 @@
23362332
F458D1142E1869AD0028273E /* SentryScopePersistentStore+String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+String.swift"; sourceTree = "<group>"; };
23372333
F458D1162E186DF20028273E /* SentryScopePersistentStore+Fingerprint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+Fingerprint.swift"; sourceTree = "<group>"; };
23382334
F458D1182E186E000028273E /* SentryScopePersistentStore+Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+Extras.swift"; sourceTree = "<group>"; };
2335+
F465D2112E87E36F00FE2DD9 /* DefaultRateLimits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultRateLimits.swift; sourceTree = "<group>"; };
2336+
F465D2122E87E36F00FE2DD9 /* RateLimits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RateLimits.swift; sourceTree = "<group>"; };
23392337
F46DA6C22E1DBCA000DF6E3B /* SentryScopePersistentStore+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+Helper.swift"; sourceTree = "<group>"; };
23402338
F46E0BA72E6A19F900DAA75C /* SentryCrashWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCrashWrapperTests.swift; sourceTree = "<group>"; };
23412339
F48E2E092E6637840073CB22 /* TestSentryCrashWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestSentryCrashWrapper.swift; sourceTree = "<group>"; };
@@ -3489,9 +3487,6 @@
34893487
7BBD18AE24517DF600427C76 /* RateLimits */ = {
34903488
isa = PBXGroup;
34913489
children = (
3492-
7BBD18962449DC1D00427C76 /* SentryRateLimits.h */,
3493-
7BBD18902449BE9000427C76 /* SentryDefaultRateLimits.h */,
3494-
7BBD18922449BEDD00427C76 /* SentryDefaultRateLimits.m */,
34953490
7B56D73024616CCD00B842DA /* SentryConcurrentRateLimitsDictionary.h */,
34963491
7B56D73224616D9500B842DA /* SentryConcurrentRateLimitsDictionary.m */,
34973492
7B3398622459C14000BD9C96 /* SentryEnvelopeRateLimit.h */,
@@ -4711,6 +4706,8 @@
47114706
F429D37E2E8532A300DBF387 /* Networking */ = {
47124707
isa = PBXGroup;
47134708
children = (
4709+
F465D2112E87E36F00FE2DD9 /* DefaultRateLimits.swift */,
4710+
F465D2122E87E36F00FE2DD9 /* RateLimits.swift */,
47144711
F429D3992E85360F00DBF387 /* RetryAfterHeaderParser.swift */,
47154712
F429D37D2E8532A300DBF387 /* HttpDateParser.swift */,
47164713
F429D3A82E8562EF00DBF387 /* RateLimitParser.swift */,
@@ -5009,7 +5006,6 @@
50095006
15E0A8EA240F2C9000F044E3 /* SentrySerialization.h in Headers */,
50105007
63FE70EF20DA4C1000CDBAE8 /* SentryCrashMonitor_AppState.h in Headers */,
50115008
635B3F381EBC6E2500A6176D /* SentryAsynchronousOperation.h in Headers */,
5012-
7BBD18972449DC1D00427C76 /* SentryRateLimits.h in Headers */,
50135009
844EDC76294144DB00C86F34 /* SentrySystemWrapper.h in Headers */,
50145010
7B3B473025D6CBFC00D01640 /* SentryNSError.h in Headers */,
50155011
630436101EC0600A00C4D3FA /* SentrySerializable.h in Headers */,
@@ -5036,7 +5032,6 @@
50365032
62C316812B1F2E93000D7031 /* SentryDelayedFramesTracker.h in Headers */,
50375033
92D957772E05A4F300E20E66 /* SentryAsyncLog.h in Headers */,
50385034
92EC54CE2E1EB54B00A10AC2 /* SentryClient+Logs.h in Headers */,
5039-
7BBD18912449BE9000427C76 /* SentryDefaultRateLimits.h in Headers */,
50405035
7B8713AE26415ADF006D6004 /* SentryAppStartTrackingIntegration.h in Headers */,
50415036
7B7D873224864BB900D2ECFF /* SentryCrashMachineContextWrapper.h in Headers */,
50425037
861265F92404EC1500C4AFDE /* SentryArray.h in Headers */,
@@ -5734,6 +5729,8 @@
57345729
F429D39A2E85360F00DBF387 /* RetryAfterHeaderParser.swift in Sources */,
57355730
63FE715F20DA4C1100CDBAE8 /* SentryCrashID.c in Sources */,
57365731
84B0E0072CD963FD007FB332 /* SentryIconography.swift in Sources */,
5732+
F465D2132E87E36F00FE2DD9 /* RateLimits.swift in Sources */,
5733+
F465D2142E87E36F00FE2DD9 /* DefaultRateLimits.swift in Sources */,
57375734
7DB3A687238EA75E00A2D442 /* SentryHttpTransport.m in Sources */,
57385735
63FE70D520DA4C1000CDBAE8 /* SentryCrashMonitor_NSException.m in Sources */,
57395736
62F70E952D423BCD00634054 /* SentryMechanismCodable.swift in Sources */,
@@ -5868,7 +5865,6 @@
58685865
62A456E52B0370E0003F19A1 /* SentryUIEventTrackerTransactionMode.m in Sources */,
58695866
D43A2A122DD47FCE00114724 /* SentryWeakMap.m in Sources */,
58705867
63FE712D20DA4C1100CDBAE8 /* SentryCrashJSONCodecObjC.m in Sources */,
5871-
7BBD18932449BEDD00427C76 /* SentryDefaultRateLimits.m in Sources */,
58725868
639FCF9D1EBC7F9500778193 /* SentryThread.mm in Sources */,
58735869
D88B30A92D48D8C3008DE513 /* SentryMaskingPreviewView.swift in Sources */,
58745870
849B8F992C6E906900148E1F /* SentryUserFeedbackFormConfiguration.swift in Sources */,

Sources/Sentry/SentryDefaultRateLimits.m

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

Sources/Sentry/SentryDependencyContainer.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#import <SentryAppStateManager.h>
1515
#import <SentryCrash.h>
1616
#import <SentryDebugImageProvider+HybridSDKs.h>
17-
#import <SentryDefaultRateLimits.h>
1817
#import <SentryDependencyContainer.h>
1918
#import <SentryPerformanceTracker.h>
2019
#import <SentrySDK+Private.h>

Sources/Sentry/SentryEnvelopeRateLimit.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#import "SentryEnvelopeRateLimit.h"
22
#import "SentryDataCategoryMapper.h"
33
#import "SentryEnvelopeItemHeader.h"
4-
#import "SentryRateLimits.h"
54
#import "SentrySwift.h"
65

76
NS_ASSUME_NONNULL_BEGIN

Sources/Sentry/SentrySessionReplayIntegration.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# import "SentryHub+Private.h"
99
# import "SentryLogC.h"
1010
# import "SentryOptions.h"
11-
# import "SentryRateLimits.h"
1211
# import "SentryReachability.h"
1312
# import "SentrySDK+Private.h"
1413
# import "SentryScope+Private.h"

Sources/Sentry/SentryTransportFactory.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
#import "SentryTransportFactory.h"
2-
#import "SentryDefaultRateLimits.h"
32
#import "SentryEnvelopeRateLimit.h"
43
#import "SentryHttpTransport.h"
54
#import "SentryInternalDefines.h"
65
#import "SentryLogC.h"
76
#import "SentryNSURLRequestBuilder.h"
87
#import "SentryOptions.h"
98
#import "SentryQueueableRequestManager.h"
10-
#import "SentryRateLimits.h"
119
#import "SentrySpotlightTransport.h"
1210
#import "SentrySwift.h"
1311
#import "SentryTransport.h"

Sources/Sentry/include/SentryDefaultRateLimits.h

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

Sources/Sentry/include/SentryEnvelopeRateLimit.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
#import "SentryRateLimits.h"
1+
#import "SentryDataCategory.h"
22

33
@protocol SentryEnvelopeRateLimitDelegate;
44

55
@class SentryEnvelope;
66
@class SentryEnvelopeItem;
7+
@protocol SentryRateLimits;
78

89
NS_ASSUME_NONNULL_BEGIN
910

Sources/Sentry/include/SentryHttpTransport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#import "SentryDefines.h"
22
#import "SentryEnvelopeRateLimit.h"
3-
#import "SentryRateLimits.h"
43
#import "SentryRequestManager.h"
54
#import "SentryTransport.h"
65

@@ -10,6 +9,7 @@
109
@class SentryDsn;
1110
@class SentryFileManager;
1211
@protocol SentryCurrentDateProvider;
12+
@protocol SentryRateLimits;
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

Sources/Sentry/include/SentryPrivate.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// public interfaces here
33
#import "NSLocale+Sentry.h"
44
#import "SentryBinaryImageCacheCallbacks.h"
5+
#import "SentryConcurrentRateLimitsDictionary.h"
56
#import "SentryCrashBinaryImageCache.h"
67
#import "SentryCrashDynamicLinker.h"
78
#import "SentryCrashExceptionApplicationHelper.h"

0 commit comments

Comments
 (0)