Sentry SDK objc version

noahsmartin · noahsmartin · commit b80a09bd371d · 2025-09-22T11:38:50.000-04:00
diff --git a/Samples/SentrySampleShared/SentrySampleShared/SpanObserver.swift b/Samples/SentrySampleShared/SentrySampleShared/SpanObserver.swift
@@ -10,7 +10,7 @@ public class SpanObserver: NSObject {
     }
 
     convenience init?(callback: @escaping (Span) -> Void) {
-        guard let span = SentrySDK.span else { return nil }
+        guard let span = SentrySDKSwift.span else { return nil }
         self.init(span: span)
         self.performOnFinish(callback: callback)
     }
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -1119,6 +1119,8 @@
 		FAE2DAB82E1F317900262307 /* SentryProfilingSwiftHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */; };
 		FAE2DABA2E1F318900262307 /* SentryProfilingSwiftHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */; };
 		FAE5798D2E7D9D4C00B710F9 /* SentrySysctl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */; };
+		FAE57A252E819A8300B710F9 /* SentrySDK.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE57A1F2E819A8000B710F9 /* SentrySDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		FAE57A272E819ADC00B710F9 /* SentrySDK.m in Sources */ = {isa = PBXBuildFile; fileRef = FAE57A262E819ADA00B710F9 /* SentrySDK.m */; };
 		FAE80C242E4695B40010A595 /* SentryEvent+Serialize.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */; };
 		FAEC270E2DF3526000878871 /* SentryUserFeedback.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */; };
 		FAEC273D2DF3933A00878871 /* NSData+Unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = FAEC273C2DF3933200878871 /* NSData+Unzip.m */; };
@@ -2466,6 +2468,8 @@
 		FAE2DAB72E1F317900262307 /* SentryProfilingSwiftHelpers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryProfilingSwiftHelpers.m; sourceTree = "<group>"; };
 		FAE2DAB92E1F318900262307 /* SentryProfilingSwiftHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryProfilingSwiftHelpers.h; path = Sources/Sentry/include/SentryProfilingSwiftHelpers.h; sourceTree = SOURCE_ROOT; };
 		FAE579872E7D9D4900B710F9 /* SentrySysctl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySysctl.swift; sourceTree = "<group>"; };
+		FAE57A1F2E819A8000B710F9 /* SentrySDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySDK.h; path = Public/SentrySDK.h; sourceTree = "<group>"; };
+		FAE57A262E819ADA00B710F9 /* SentrySDK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySDK.m; sourceTree = "<group>"; };
 		FAE80C232E4695AE0010A595 /* SentryEvent+Serialize.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "SentryEvent+Serialize.h"; path = "include/SentryEvent+Serialize.h"; sourceTree = "<group>"; };
 		FAEC270D2DF3526000878871 /* SentryUserFeedback.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedback.swift; sourceTree = "<group>"; };
 		FAEC273C2DF3933200878871 /* NSData+Unzip.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Unzip.m"; sourceTree = "<group>"; };
@@ -2900,6 +2904,8 @@
 		639889D51EDF10BE00EA7442 /* Helper */ = {
 			isa = PBXGroup;
 			children = (
+				FAE57A1F2E819A8000B710F9 /* SentrySDK.h */,
+				FAE57A262E819ADA00B710F9 /* SentrySDK.m */,
 				63AA76951EB9C1C200D153DE /* SentryDefines.h */,
 				627E7588299F6FE40085504D /* SentryInternalDefines.h */,
 				0A9E917028DC7E7000FB4182 /* SentryInternalCDefines.h */,
@@ -4919,6 +4925,7 @@
 				8E133FA625E72EB400ABD0BF /* SentrySamplingContext.h in Headers */,
 				0A9BF4E428A114B50068D266 /* SentryViewHierarchyIntegration.h in Headers */,
 				D8BBD32728FD9FC00011F850 /* SentrySwift.h in Headers */,
+				FAE57A252E819A8300B710F9 /* SentrySDK.h in Headers */,
 				84CFA4CE2C9E0CA3008DA5F4 /* SentryUserFeedbackIntegration.h in Headers */,
 				8482FA9B2DD7C397000E9283 /* SentryFeedbackAPI.h in Headers */,
 				8E4E7C7425DAAB49006AB9E2 /* SentrySpanProtocol.h in Headers */,
@@ -5959,6 +5966,7 @@
 				63FE710B20DA4C1000CDBAE8 /* SentryCrashMach.c in Sources */,
 				63FE707720DA4C1000CDBAE8 /* SentryDictionaryDeepSearch.m in Sources */,
 				FACEED132E3179A10007B4AC /* SentyOptionsInternal.m in Sources */,
+				FAE57A272E819ADC00B710F9 /* SentrySDK.m in Sources */,
 				8482FA9C2DD7C397000E9283 /* SentryFeedbackAPI.m in Sources */,
 				7BC9A20628F41781001E7C4C /* SentryMeasurementUnit.m in Sources */,
 				63FE71A020DA4C1100CDBAE8 /* SentryCrashInstallation.m in Sources */,
diff --git a/Sources/Sentry/PrivateSentrySDKOnly.m b/Sources/Sentry/PrivateSentrySDKOnly.m
@@ -363,7 +363,7 @@ + (NSString *__nullable)getReplayId
 {
     __block NSString *__nullable replayId;
 
-    [SentrySDK configureScope:^(SentryScope *_Nonnull scope) { replayId = scope.replayId; }];
+    [SentrySDKSwift configureScope:^(SentryScope *_Nonnull scope) { replayId = scope.replayId; }];
 
     return replayId;
 }
diff --git a/Sources/Sentry/Public/Sentry.h b/Sources/Sentry/Public/Sentry.h
@@ -34,6 +34,7 @@ FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 #    import <Sentry/SentryOptions.h>
 #    import <Sentry/SentryReplayApi.h>
 #    import <Sentry/SentryRequest.h>
+#    import <Sentry/SentrySDK.h>
 #    import <Sentry/SentrySampleDecision.h>
 #    import <Sentry/SentrySamplingContext.h>
 #    import <Sentry/SentryScope.h>
diff --git a/Sources/Sentry/Public/SentryWithoutUIKit.h b/Sources/Sentry/Public/SentryWithoutUIKit.h
@@ -7,6 +7,7 @@ FOUNDATION_EXPORT double SentryVersionNumber;
 //! Project version string for Sentry.
 FOUNDATION_EXPORT const unsigned char SentryVersionString[];
 
+#    import <Sentry/SentrySDK.h>
 #    import <SentryWithoutUIKit/Sentry.h>
 #    import <SentryWithoutUIKit/SentryAttachment.h>
 #    import <SentryWithoutUIKit/SentryBaggage.h>
diff --git a/Sources/Sentry/SentryANRTrackingIntegration.m b/Sources/Sentry/SentryANRTrackingIntegration.m
@@ -185,7 +185,7 @@ - (void)anrDetectedWithType:(enum SentryANRType)type
         [self.fileManager storeAppHangEvent:event];
     } else {
 #endif // SENTRY_HAS_UIKIT
-        [SentrySDK captureEvent:event];
+        [SentrySDKSwift captureEvent:event];
 #if SENTRY_HAS_UIKIT
     }
 #endif // SENTRY_UIKIT_AVAILABLE
@@ -233,7 +233,7 @@ - (void)anrStoppedWithResult:(SentryANRStoppedResult *_Nullable)result
 
     // We already applied the scope. We use an empty scope to avoid overwriting exising fields on
     // the event.
-    [SentrySDK captureEvent:event withScope:[[SentryScope alloc] init]];
+    [SentrySDKSwift captureEvent:event withScope:[[SentryScope alloc] init]];
 #endif // SENTRY_HAS_UIKIT
 }
 
@@ -257,7 +257,7 @@ - (void)captureStoredAppHangEvent
             // The app crashed during an ongoing app hang. Capture the stored app hang as it is.
             // We already applied the scope. We use an empty scope to avoid overwriting exising
             // fields on the event.
-            [SentrySDK captureEvent:event withScope:[[SentryScope alloc] init]];
+            [SentrySDKSwift captureEvent:event withScope:[[SentryScope alloc] init]];
         } else {
             // Fatal App Hang
             // We can't differ if the watchdog or the user terminated the app, because when the main
diff --git a/Sources/Sentry/SentryFileIOTracker.m b/Sources/Sentry/SentryFileIOTracker.m
@@ -38,7 +38,7 @@ + (instancetype _Nullable)sharedInstance
     // It is necessary to check if the SDK is enabled because accessing the tracker will otherwise
     // initialize the depency container without any configured SDK options. This is a known issue
     // and needs to be fixed in general.
-    if (!SentrySDK.isEnabled) {
+    if (!SentrySDKSwift.isEnabled) {
         return nil;
     }
     return SentryDependencyContainer.sharedInstance.fileIOTracker;
diff --git a/Sources/Sentry/SentryMetricKitIntegration.m b/Sources/Sentry/SentryMetricKitIntegration.m
@@ -408,15 +408,15 @@ - (SentryEvent *)createEvent:(SentryMXExceptionParams *)params
 - (void)captureEvent:(SentryEvent *)event withDiagnosticJSON:(NSData *)diagnosticJSON
 {
     if (self.attachDiagnosticAsAttachment) {
-        [SentrySDK captureEvent:event
-                 withScopeBlock:^(SentryScope *_Nonnull scope) {
-                     SentryAttachment *attachment =
-                         [[SentryAttachment alloc] initWithData:diagnosticJSON
-                                                       filename:@"MXDiagnosticPayload.json"];
-                     [scope addAttachment:attachment];
-                 }];
+        [SentrySDKSwift captureEvent:event
+                      withScopeBlock:^(SentryScope *_Nonnull scope) {
+                          SentryAttachment *attachment =
+                              [[SentryAttachment alloc] initWithData:diagnosticJSON
+                                                            filename:@"MXDiagnosticPayload.json"];
+                          [scope addAttachment:attachment];
+                      }];
     } else {
-        [SentrySDK captureEvent:event];
+        [SentrySDKSwift captureEvent:event];
     }
 }
 
diff --git a/Sources/Sentry/SentryNetworkTracker.m b/Sources/Sentry/SentryNetworkTracker.m
@@ -475,7 +475,7 @@ - (void)captureFailedRequests:(NSURLSessionTask *)sessionTask
 
     event.context = context;
 
-    [SentrySDK captureEvent:event];
+    [SentrySDKSwift captureEvent:event];
 }
 
 - (BOOL)containsStatusCode:(NSInteger)statusCode
@@ -544,7 +544,7 @@ - (void)addBreadcrumbForSessionTask:(NSURLSessionTask *)sessionTask
     }
 
     breadcrumb.data = breadcrumbData;
-    [SentrySDK addBreadcrumb:breadcrumb];
+    [SentrySDKSwift addBreadcrumb:breadcrumb];
 
     objc_setAssociatedObject(sessionTask, &SENTRY_NETWORK_REQUEST_TRACKER_BREADCRUMB,
         [NSNumber numberWithBool:YES], OBJC_ASSOCIATION_RETAIN_NONATOMIC);
diff --git a/Sources/Sentry/SentrySDK.m b/Sources/Sentry/SentrySDK.m
diff --git a/Sources/Sentry/SentrySDKInternal.m b/Sources/Sentry/SentrySDKInternal.m
diff --git a/Sources/Sentry/SentryUserFeedbackIntegration.m b/Sources/Sentry/SentryUserFeedbackIntegration.m
diff --git a/Sources/Swift/Helper/SentrySDK.swift b/Sources/Swift/Helper/SentrySDK.swift

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class SpanObserver: NSObject {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`convenience init?(callback: @escaping (Span) -> Void) {`
`13`		`- guard let span = SentrySDK.span else { return nil }`
	`13`	`+ guard let span = SentrySDKSwift.span else { return nil }`
`14`	`14`	`self.init(span: span)`
`15`	`15`	`self.performOnFinish(callback: callback)`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ + (NSString *__nullable)getReplayId`
`363`	`363`	`{`
`364`	`364`	`__block NSString *__nullable replayId;`
`365`	`365`
`366`		`- [SentrySDK configureScope:^(SentryScope *_Nonnull scope) { replayId = scope.replayId; }];`
	`366`	`+ [SentrySDKSwift configureScope:^(SentryScope *_Nonnull scope) { replayId = scope.replayId; }];`
`367`	`367`
`368`	`368`	`return replayId;`
`369`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ + (instancetype _Nullable)sharedInstance`
`38`	`38`	`// It is necessary to check if the SDK is enabled because accessing the tracker will otherwise`
`39`	`39`	`// initialize the depency container without any configured SDK options. This is a known issue`
`40`	`40`	`// and needs to be fixed in general.`
`41`		`- if (!SentrySDK.isEnabled) {`
	`41`	`+ if (!SentrySDKSwift.isEnabled) {`
`42`	`42`	`return nil;`
`43`	`43`	`}`
`44`	`44`	`return SentryDependencyContainer.sharedInstance.fileIOTracker;`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ - (void)captureFailedRequests:(NSURLSessionTask *)sessionTask`
`475`	`475`
`476`	`476`	`event.context = context;`
`477`	`477`
`478`		`- [SentrySDK captureEvent:event];`
	`478`	`+ [SentrySDKSwift captureEvent:event];`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`- (BOOL)containsStatusCode:(NSInteger)statusCode`
`@@ -544,7 +544,7 @@ - (void)addBreadcrumbForSessionTask:(NSURLSessionTask *)sessionTask`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`breadcrumb.data = breadcrumbData;`
`547`		`- [SentrySDK addBreadcrumb:breadcrumb];`
	`547`	`+ [SentrySDKSwift addBreadcrumb:breadcrumb];`
`548`	`548`
`549`	`549`	`objc_setAssociatedObject(sessionTask, &SENTRY_NETWORK_REQUEST_TRACKER_BREADCRUMB,`
`550`	`550`	`[NSNumber numberWithBool:YES], OBJC_ASSOCIATION_RETAIN_NONATOMIC);`