ref: Convert SentryId to Swift (#3708)

I can see this being the beginning of a project refactoring to Swift.
Also, I want to try converting something to see how much effort it is.

Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj

@@ -172,13 +172,6 @@
  remoteGlobalIDString = D8199DAA29376E9B0074249E;
  remoteInfo = SentrySwiftUI;
  };
- D81A3499291D0B2C005A27A9 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = D81A3488291D0AC0005A27A9;
- remoteInfo = SentryPrivate;
- };
  D83A30CA279F075800372D0A /* PBXContainerItemProxy */ = {
  isa = PBXContainerItemProxy;
  containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */;
@@ -420,7 +413,6 @@
  children = (
  630853322440C44F00DDE4CE /* Sentry.framework */,
  630853342440C44F00DDE4CE /* SentryTests.xctest */,
- D81A349A291D0B2C005A27A9 /* SentryPrivate.framework */,
  D8105B5C297E792200299F03 /* SentrySwiftUI.framework */,
  84B7FA5B29B2A86500AD93B1 /* SentryProfilerTests.xctest */,
  84B7FA5D29B2A86500AD93B1 /* libSentryTestUtils.a */,
@@ -844,13 +836,6 @@
  remoteRef = D8105B5B297E792200299F03 /* PBXContainerItemProxy */;
  sourceTree = BUILT_PRODUCTS_DIR;
  };
- D81A349A291D0B2C005A27A9 /* SentryPrivate.framework */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.framework;
- path = SentryPrivate.framework;
- remoteRef = D81A3499291D0B2C005A27A9 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
  D84DAD712B177DB2003CF120 /* SentryTestUtilsDynamic.framework */ = {
  isa = PBXReferenceProxy;
  fileType = wrapper.framework;

Sentry.xcodeproj/project.pbxproj

@@ -409,8 +409,6 @@
  7B7D873624864C9D00D2ECFF /* SentryCrashDefaultMachineContextWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B7D873524864C9D00D2ECFF /* SentryCrashDefaultMachineContextWrapper.m */; };
  7B82722927A319E900F4BFF4 /* SentryAutoSessionTrackingIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B82722827A319E900F4BFF4 /* SentryAutoSessionTrackingIntegrationTests.swift */; };
  7B82722B27A3220A00F4BFF4 /* SentryFileIoTrackingUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B82722A27A3220A00F4BFF4 /* SentryFileIoTrackingUnitTests.swift */; };
- 7B82D54524E2A05500EE670F /* SentryId.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B82D54424E2A05500EE670F /* SentryId.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 7B82D54724E2A1AB00EE670F /* SentryId.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B82D54624E2A1AB00EE670F /* SentryId.m */; };
  7B82D54924E2A2D400EE670F /* SentryIdTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B82D54824E2A2D400EE670F /* SentryIdTests.swift */; };
  7B85BD8E24C5C3A6000A4225 /* SentryFileManagerTestExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B85BD8D24C5C3A6000A4225 /* SentryFileManagerTestExtension.swift */; };
  7B85DC1E24EFAFCD007D01D2 /* SentryClient+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B85DC1C24EFAFCD007D01D2 /* SentryClient+Private.h */; };
@@ -814,10 +812,12 @@
  D8B0542E2A7D2C720056BAF6 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D8B0542D2A7D2C720056BAF6 /* PrivacyInfo.xcprivacy */; };
  D8B088B629C9E3FF00213258 /* SentryTracerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B088B429C9E3FF00213258 /* SentryTracerConfiguration.h */; };
  D8B088B729C9E3FF00213258 /* SentryTracerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = D8B088B529C9E3FF00213258 /* SentryTracerConfiguration.m */; };
+ D8B425122B9A0FD6000BFDF3 /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8B425112B9A0FD6000BFDF3 /* StringExtensionTests.swift */; };
+ D8B665BC2B95F73200BD0E7B /* SentryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B665BA2B95F54200BD0E7B /* SentryInternal.h */; };
  D8B665BC2B95F73200BD0E7B /* SentryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = D8B665BA2B95F54200BD0E7B /* SentryPrivate.h */; };
  D8B76B062808066D000A58C4 /* SentryScreenshotIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8B76B042808060E000A58C4 /* SentryScreenshotIntegrationTests.swift */; };
  D8B76B0828081461000A58C4 /* TestSentryScreenShot.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8B76B0728081461000A58C4 /* TestSentryScreenShot.swift */; };
- D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */ = {isa = PBXBuildFile; fileRef = D8BBD32628FD9FBF0011F850 /* SentrySwift.h */; };
+ D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */ = {isa = PBXBuildFile; fileRef = D8BBD32628FD9FBF0011F850 /* SentrySwift.h */; settings = {ATTRIBUTES = (Private, ); }; };
  D8BD2E6829361A0F00D96C6A /* PrivatesHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = D8BD2E67293619F600D96C6A /* PrivatesHeader.h */; settings = {ATTRIBUTES = (Private, ); }; };
  D8BFE37229A3782F002E73F3 /* SentryTimeToDisplayTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = D8BFE37029A3782F002E73F3 /* SentryTimeToDisplayTracker.h */; };
  D8BFE37329A3782F002E73F3 /* SentryTimeToDisplayTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = D8BFE37129A3782F002E73F3 /* SentryTimeToDisplayTracker.m */; };
@@ -834,6 +834,8 @@
  D8CB742E294B294B00A5F964 /* MockUIScene.m in Sources */ = {isa = PBXBuildFile; fileRef = D8CB742D294B294B00A5F964 /* MockUIScene.m */; };
  D8CCFC632A1520C900DE232E /* SentryBinaryImageCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D8CCFC622A1520C900DE232E /* SentryBinaryImageCacheTests.m */; };
  D8CE69BC277E39C700C6EC5C /* SentryFileIOTrackingIntegrationObjCTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D8CE69BB277E39C700C6EC5C /* SentryFileIOTrackingIntegrationObjCTests.m */; };
+ D8F016B32B9622D6007B9AFB /* SentryId.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F016B22B9622D6007B9AFB /* SentryId.swift */; };
+ D8F016B62B962548007B9AFB /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F016B52B962548007B9AFB /* StringExtensions.swift */; };
  D8F6A2472885512100320515 /* SentryPredicateDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = D8F6A2452885512100320515 /* SentryPredicateDescriptor.m */; };
  D8F6A24B2885515C00320515 /* SentryPredicateDescriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = D8F6A24A2885515B00320515 /* SentryPredicateDescriptor.h */; };
  D8F6A24E288553A800320515 /* SentryPredicateDescriptorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F6A24C2885534E00320515 /* SentryPredicateDescriptorTests.swift */; };
@@ -1325,8 +1327,6 @@
  7B7D873524864C9D00D2ECFF /* SentryCrashDefaultMachineContextWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryCrashDefaultMachineContextWrapper.m; sourceTree = "<group>"; };
  7B82722827A319E900F4BFF4 /* SentryAutoSessionTrackingIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryAutoSessionTrackingIntegrationTests.swift; sourceTree = "<group>"; };
  7B82722A27A3220A00F4BFF4 /* SentryFileIoTrackingUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFileIoTrackingUnitTests.swift; sourceTree = "<group>"; };
- 7B82D54424E2A05500EE670F /* SentryId.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryId.h; path = Public/SentryId.h; sourceTree = "<group>"; };
- 7B82D54624E2A1AB00EE670F /* SentryId.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryId.m; sourceTree = "<group>"; };
  7B82D54824E2A2D400EE670F /* SentryIdTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryIdTests.swift; sourceTree = "<group>"; };
  7B85BD8D24C5C3A6000A4225 /* SentryFileManagerTestExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryFileManagerTestExtension.swift; sourceTree = "<group>"; };
  7B85DC1C24EFAFCD007D01D2 /* SentryClient+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryClient+Private.h"; path = "include/SentryClient+Private.h"; sourceTree = "<group>"; };
@@ -1780,6 +1780,8 @@
  D8B0542D2A7D2C720056BAF6 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
  D8B088B429C9E3FF00213258 /* SentryTracerConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryTracerConfiguration.h; path = include/SentryTracerConfiguration.h; sourceTree = "<group>"; };
  D8B088B529C9E3FF00213258 /* SentryTracerConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryTracerConfiguration.m; sourceTree = "<group>"; };
+ D8B425112B9A0FD6000BFDF3 /* StringExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensionTests.swift; sourceTree = "<group>"; };
+ D8B665BA2B95F54200BD0E7B /* SentryInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryInternal.h; path = include/SentryInternal.h; sourceTree = "<group>"; };
  D8B665BA2B95F54200BD0E7B /* SentryPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryPrivate.h; path = include/SentryPrivate.h; sourceTree = "<group>"; };
  D8B665BB2B95F5A100BD0E7B /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = Sources/Sentry/include/module.modulemap; sourceTree = SOURCE_ROOT; };
  D8B76B042808060E000A58C4 /* SentryScreenshotIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryScreenshotIntegrationTests.swift; sourceTree = "<group>"; };
@@ -1804,6 +1806,8 @@
  D8CB742D294B294B00A5F964 /* MockUIScene.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockUIScene.m; sourceTree = "<group>"; };
  D8CCFC622A1520C900DE232E /* SentryBinaryImageCacheTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryBinaryImageCacheTests.m; sourceTree = "<group>"; };
  D8CE69BB277E39C700C6EC5C /* SentryFileIOTrackingIntegrationObjCTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryFileIOTrackingIntegrationObjCTests.m; sourceTree = "<group>"; };
+ D8F016B22B9622D6007B9AFB /* SentryId.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryId.swift; sourceTree = "<group>"; };
+ D8F016B52B962548007B9AFB /* StringExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringExtensions.swift; sourceTree = "<group>"; };
  D8F01DE42A126B62008F4996 /* HybridPod.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = HybridPod.podspec; sourceTree = "<group>"; };
  D8F01DE52A126BF5008F4996 /* HybridTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HybridTest.swift; sourceTree = "<group>"; };
  D8F6A2452885512100320515 /* SentryPredicateDescriptor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryPredicateDescriptor.m; sourceTree = "<group>"; };
@@ -1979,8 +1983,6 @@
  7BE1E32624F7AE08009D3AD0 /* SentrySession+Private.h */,
  7B88F2FD24BC5A4C00ADF90A /* SentrySdkInfo.h */,
  7B88F2FF24BC5A7D00ADF90A /* SentrySdkInfo.m */,
- 7B82D54424E2A05500EE670F /* SentryId.h */,
- 7B82D54624E2A1AB00EE670F /* SentryId.m */,
  7BFC169A2524995700FF6266 /* SentryMessage.h */,
  7BFC16A025249A9D00FF6266 /* SentryMessage.m */,
  7BB654FA253DC14A00887E87 /* SentryUserFeedback.h */,
@@ -3327,8 +3329,10 @@
  D800942328F82E8D005D3943 /* Swift */ = {
  isa = PBXGroup;
  children = (
- D856272A2A374A6800FB8062 /* Tools */,
+ D8F016B42B962533007B9AFB /* Extensions */,
  7BF65060292B8EFE00BBA5A8 /* MetricKit */,
+ D8F016B12B9622B7007B9AFB /* Protocol */,
+ D856272A2A374A6800FB8062 /* Tools */,
  D800942628F82F3A005D3943 /* SwiftDescriptor.swift */,
  D8B665BB2B95F5A100BD0E7B /* module.modulemap */,
  );
@@ -3383,6 +3387,7 @@
  D84541172A2DC2CD00E2B11C /* SentryBinaryImageCacheTests.swift */,
  D84541192A2DC55100E2B11C /* SentryBinaryImageCache+Private.h */,
  D8292D7C2A39A027009872F7 /* UrlSanitizedTests.swift */,
+ D8B425112B9A0FD6000BFDF3 /* StringExtensionTests.swift */,
  );
  name = Tools;
  sourceTree = "<group>";
@@ -3481,6 +3486,22 @@
  path = Resources;
  sourceTree = "<group>";
  };
+ D8F016B12B9622B7007B9AFB /* Protocol */ = {
+ isa = PBXGroup;
+ children = (
+ D8F016B22B9622D6007B9AFB /* SentryId.swift */,
+ );
+ path = Protocol;
+ sourceTree = "<group>";
+ };
+ D8F016B42B962533007B9AFB /* Extensions */ = {
+ isa = PBXGroup;
+ children = (
+ D8F016B52B962548007B9AFB /* StringExtensions.swift */,
+ );
+ path = Extensions;
+ sourceTree = "<group>";
+ };
  D8F01DE32A125D7B008F4996 /* HybridSDKTest */ = {
  isa = PBXGroup;
  children = (
@@ -3540,7 +3561,6 @@
  639FCFAC1EBC811400778193 /* SentryUser.h in Headers */,
  D8CB74192947285A00A5F964 /* SentryEnvelopeItemHeader.h in Headers */,
  7D7F0A5F23DF3D2C00A4629C /* SentryGlobalEventProcessor.h in Headers */,
- 7B82D54524E2A05500EE670F /* SentryId.h in Headers */,
  D867063D27C3BC2400048851 /* SentryCoreDataTrackingIntegration.h in Headers */,
  0A2D8D5D289815EB008720F6 /* SentryBaseIntegration.h in Headers */,
  84AC61D629F75A98009EEF61 /* SentryDispatchFactory.h in Headers */,
@@ -4177,7 +4197,6 @@
  63295AF71EF3C7DB002D4490 /* NSDictionary+SentrySanitize.m in Sources */,
  7B8ECBFC26498958005FE2EF /* SentryAppStateManager.m in Sources */,
  7B2A70DD27D6083D008B0D15 /* SentryThreadWrapper.m in Sources */,
- 7B82D54724E2A1AB00EE670F /* SentryId.m in Sources */,
  D8ACE3C72762187200F5A213 /* SentryNSDataSwizzling.m in Sources */,
  638DC9A11EBC6B6400A66E41 /* SentryRequestOperation.m in Sources */,
  63AA767A1EB8D20500D153DE /* SentryLog.m in Sources */,
@@ -4238,6 +4257,7 @@
  8EA1ED0B2668F8C400E62B98 /* SentryUIViewControllerSwizzling.m in Sources */,
  7B98D7CF25FB650F00C5A389 /* SentryWatchdogTerminationTrackingIntegration.m in Sources */,
  8E5D38DD261D4A3E000D363D /* SentryPerformanceTrackingIntegration.m in Sources */,
+ D8F016B62B962548007B9AFB /* StringExtensions.swift in Sources */,
  7B4E23C2251A2C2B00060D68 /* SentrySessionCrashedHandler.m in Sources */,
  9286059729A5098900F96038 /* SentryGeo.m in Sources */,
  7B42C48227E08F4B009B58C2 /* SentryDependencyContainer.m in Sources */,
@@ -4257,6 +4277,7 @@
  D88817D826D7149100BF2251 /* SentryTraceContext.m in Sources */,
  8EBF870926140D37001A6853 /* SentryPerformanceTracker.m in Sources */,
  D80CD8D02B75143F002F710B /* UrlSanitized.swift in Sources */,
+ D8F016B32B9622D6007B9AFB /* SentryId.swift in Sources */,
  D865893029D6ECA7000BE151 /* SentryCrashBinaryImageCache.c in Sources */,
  7BC9A20428F4166D001E7C4C /* SentryMeasurementValue.m in Sources */,
  D859696B27BECD8F0036A46E /* SentryCoreDataTrackingIntegration.m in Sources */,
@@ -4484,6 +4505,7 @@
  8F73BC312B02B87E00C3CEF4 /* SentryInstallationTests.swift in Sources */,
  7B569E002590EEF600B653FC /* SentryScope+Equality.m in Sources */,
  D8BFE37929A76666002E73F3 /* SentryTimeToDisplayTrackerTest.swift in Sources */,
+ D8B425122B9A0FD6000BFDF3 /* StringExtensionTests.swift in Sources */,
  D84541182A2DC2CD00E2B11C /* SentryBinaryImageCacheTests.swift in Sources */,
  7BF536D424BEF255004FA6A2 /* SentryAssertions.swift in Sources */,
  7BC6EC14255C415E0059822A /* SentryExceptionTests.swift in Sources */,

Sources/Sentry/Profiling/SentryLaunchProfiling.m

@@ -6,7 +6,6 @@
 # import "SentryDependencyContainer.h"
 # import "SentryDispatchQueueWrapper.h"
 # import "SentryFileManager.h"
-# import "SentryId.h"
 # import "SentryInternalDefines.h"
 # import "SentryLog.h"
 # import "SentryOptions.h"
@@ -15,6 +14,7 @@
 # import "SentrySamplerDecision.h"
 # import "SentrySampling.h"
 # import "SentrySamplingContext.h"
+# import "SentrySwift.h"
 # import "SentryTraceOrigins.h"
 # import "SentryTracer+Private.h"
 # import "SentryTracerConfiguration.h"

Sources/Sentry/Profiling/SentryProfiledTracerConcurrency.mm

@@ -2,10 +2,10 @@
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
 
-# import "SentryId.h"
 # import "SentryInternalDefines.h"
 # import "SentryLog.h"
 # import "SentryProfiler+Private.h"
+# import "SentrySwift.h"
 # include <mutex>
 
 # if SENTRY_HAS_UIKIT

Sources/Sentry/Public/Sentry.h

@@ -22,7 +22,6 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #import "SentryGeo.h"
 #import "SentryHttpStatusCodeRange.h"
 #import "SentryHub.h"
-#import "SentryId.h"
 #import "SentryIntegrationProtocol.h"
 #import "SentryMeasurementUnit.h"
 #import "SentryMechanism.h"

Sources/Sentry/SentryClient.m

@@ -22,7 +22,6 @@
 #import "SentryGlobalEventProcessor.h"
 #import "SentryHub+Private.h"
 #import "SentryHub.h"
-#import "SentryId.h"
 #import "SentryInAppLogic.h"
 #import "SentryInstallation.h"
 #import "SentryLog.h"

Sources/Sentry/SentryEvent.m

@@ -8,13 +8,13 @@
 #import "SentryDependencyContainer.h"
 #import "SentryEvent+Private.h"
 #import "SentryException.h"
-#import "SentryId.h"
 #import "SentryInternalDefines.h"
 #import "SentryLevelMapper.h"
 #import "SentryMessage.h"
 #import "SentryMeta.h"
 #import "SentryRequest.h"
 #import "SentryStacktrace.h"
+#import "SentrySwift.h"
 #import "SentryThread.h"
 #import "SentryUser.h"
 

Sources/Sentry/SentryHub.m

@@ -8,7 +8,6 @@
 #import "SentryEvent+Private.h"
 #import "SentryFileManager.h"
 #import "SentryHub+Private.h"
-#import "SentryId.h"
 #import "SentryInstallation.h"
 #import "SentryLevelMapper.h"
 #import "SentryLog.h"
@@ -22,6 +21,7 @@
 #import "SentryScope+Private.h"
 #import "SentrySerialization.h"
 #import "SentrySession+Private.h"
+#import "SentrySwift.h"
 #import "SentryTraceOrigins.h"
 #import "SentryTracer.h"
 #import "SentryTransaction.h"