ref: SentrySDKSettings to Swift (#5980)

noahsmartin · web-flow · commit 7eafbdefa124 · 2025-08-27T08:38:29.000-10:00
diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
@@ -1032,8 +1032,6 @@
 		F41362112E1C55AF00B84443 /* SentryScopePersistentStore+Tags.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41362102E1C55AF00B84443 /* SentryScopePersistentStore+Tags.swift */; };
 		F41362132E1C566100B84443 /* SentryScopePersistentStore+User.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41362122E1C566100B84443 /* SentryScopePersistentStore+User.swift */; };
 		F41362152E1C568400B84443 /* SentryScopePersistentStore+Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41362142E1C568400B84443 /* SentryScopePersistentStore+Context.swift */; };
-		F429DCBB2E4A59370054383F /* SentrySDKSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = F429DCBA2E4A59370054383F /* SentrySDKSettings.m */; };
-		F429DCBC2E4A59370054383F /* SentrySDKSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F429DCB92E4A59370054383F /* SentrySDKSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		F443DB272E09BE8C009A9045 /* LoadValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F443DB262E09BE8C009A9045 /* LoadValidatorTests.swift */; };
 		F44858132E03579D0013E63B /* SentryCrashDynamicLinker+Test.h in Headers */ = {isa = PBXBuildFile; fileRef = F44858122E0357940013E63B /* SentryCrashDynamicLinker+Test.h */; };
 		F451FAA62E0B304E0050ACF2 /* LoadValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F451FAA52E0B304E0050ACF2 /* LoadValidator.swift */; };
@@ -1125,6 +1123,7 @@
 		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 */; };
+		FAEFA12F2E4FAE1900C431D9 /* SentrySDKSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAEFA1292E4FAE1700C431D9 /* SentrySDKSettings.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -2380,8 +2379,6 @@
 		F41362102E1C55AF00B84443 /* SentryScopePersistentStore+Tags.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+Tags.swift"; sourceTree = "<group>"; };
 		F41362122E1C566100B84443 /* SentryScopePersistentStore+User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+User.swift"; sourceTree = "<group>"; };
 		F41362142E1C568400B84443 /* SentryScopePersistentStore+Context.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SentryScopePersistentStore+Context.swift"; sourceTree = "<group>"; };
-		F429DCB92E4A59370054383F /* SentrySDKSettings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentrySDKSettings.h; path = include/SentrySDKSettings.h; sourceTree = "<group>"; };
-		F429DCBA2E4A59370054383F /* SentrySDKSettings.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentrySDKSettings.m; sourceTree = "<group>"; };
 		F443DB262E09BE8C009A9045 /* LoadValidatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadValidatorTests.swift; sourceTree = "<group>"; };
 		F44858122E0357940013E63B /* SentryCrashDynamicLinker+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentryCrashDynamicLinker+Test.h"; sourceTree = "<group>"; };
 		F451FAA52E0B304E0050ACF2 /* LoadValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadValidator.swift; sourceTree = "<group>"; };
@@ -2475,6 +2472,7 @@
 		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>"; };
 		FAEC273E2DF393E000878871 /* NSData+Unzip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+Unzip.h"; sourceTree = "<group>"; };
+		FAEFA1292E4FAE1700C431D9 /* SentrySDKSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySDKSettings.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2742,8 +2740,6 @@
 				7BC9A20528F41781001E7C4C /* SentryMeasurementUnit.m */,
 				A8F17B2D2901765900990B25 /* SentryRequest.m */,
 				A8AFFCCE2906C03700967CD7 /* SentryRequest.h */,
-				F429DCB92E4A59370054383F /* SentrySDKSettings.h */,
-				F429DCBA2E4A59370054383F /* SentrySDKSettings.m */,
 			);
 			name = Protocol;
 			sourceTree = "<group>";
@@ -4706,6 +4702,7 @@
 		D8F016B12B9622B7007B9AFB /* Protocol */ = {
 			isa = PBXGroup;
 			children = (
+				FAEFA1292E4FAE1700C431D9 /* SentrySDKSettings.swift */,
 				620078752D38F1110022CB67 /* Codable */,
 				92ECD73B2E05ACDE0063EC10 /* SentryLog.swift */,
 				92ECD73F2E05AD500063EC10 /* SentryLogAttribute.swift */,
@@ -5125,7 +5122,6 @@
 				63BE85701ECEC6DE00DC44F5 /* SentryDateUtils.h in Headers */,
 				63FE709520DA4C1000CDBAE8 /* SentryCrashReportFilterBasic.h in Headers */,
 				844EDCE52947DC3100C86F34 /* SentryNSTimerFactory.h in Headers */,
-				F429DCBC2E4A59370054383F /* SentrySDKSettings.h in Headers */,
 				D8B088B629C9E3FF00213258 /* SentryTracerConfiguration.h in Headers */,
 				7B63459D280EBA6300CFA05A /* SentryUIEventTracker.h in Headers */,
 				7B7D873424864C6600D2ECFF /* SentryCrashDefaultMachineContextWrapper.h in Headers */,
@@ -5665,6 +5661,7 @@
 				F458D1172E186DF20028273E /* SentryScopePersistentStore+Fingerprint.swift in Sources */,
 				D8CB7417294724CC00A5F964 /* SentryEnvelopeAttachmentHeader.m in Sources */,
 				D84793262788737D00BE8E99 /* SentryByteCountFormatter.m in Sources */,
+				FAEFA12F2E4FAE1900C431D9 /* SentrySDKSettings.swift in Sources */,
 				63AA769E1EB9C57A00D153DE /* SentryError.mm in Sources */,
 				7B8713B026415B22006D6004 /* SentryAppStartTrackingIntegration.m in Sources */,
 				8E133FA225E72DEF00ABD0BF /* SentrySamplingContext.m in Sources */,
@@ -5885,7 +5882,6 @@
 				8E25C95325F836D000DC215B /* SentryRandom.m in Sources */,
 				03F84D3527DD4191008FE43F /* SentryThreadHandle.cpp in Sources */,
 				0A2D8DA9289BC905008720F6 /* SentryViewHierarchyProvider.m in Sources */,
-				F429DCBB2E4A59370054383F /* SentrySDKSettings.m in Sources */,
 				D84D2CDD2C2BF7370011AF8A /* SentryReplayEvent.swift in Sources */,
 				D8BC28CC2BFF78220054DA4D /* SentryRRWebTouchEvent.swift in Sources */,
 				D452FC592DDB4B1700AFF56F /* SentryWatchdogTerminationBreadcrumbProcessor.m in Sources */,
diff --git a/Sources/Resources/Sentry.modulemap b/Sources/Resources/Sentry.modulemap
@@ -27,7 +27,6 @@ framework module Sentry {
         header "SentrySessionReplayIntegration-Hybrid.h"
         
         header "SentrySdkInfo.h"
-        header "SentrySDKSettings.h"
         header "SentryInternalSerializable.h"
         
         export *
diff --git a/Sources/Sentry/SentrySDKSettings.m b/Sources/Sentry/SentrySDKSettings.m
diff --git a/Sources/Sentry/SentrySdkInfo.m b/Sources/Sentry/SentrySdkInfo.m
@@ -5,7 +5,6 @@
 #import "SentryMeta.h"
 #import "SentryOptions.h"
 #import "SentrySDK+Private.h"
-#import "SentrySDKSettings.h"
 #import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Sources/Sentry/include/SentrySDKSettings.h b/Sources/Sentry/include/SentrySDKSettings.h
diff --git a/Sources/Swift/Protocol/SentrySDKSettings.swift b/Sources/Swift/Protocol/SentrySDKSettings.swift
@@ -0,0 +1,30 @@
+/**
+ * Describes the settings for the Sentry SDK
+ * @see https://develop.sentry.dev/sdk/event-payloads/sdk/
+ */
+@_spi(Private) @objc public final class SentrySDKSettings: NSObject {
+    
+    @objc public override init() {
+        autoInferIP = false
+    }
+    
+    @objc public init(options: Options?) {
+        autoInferIP = options?.sendDefaultPii ?? false
+    }
+    
+    @objc public init(dict: NSDictionary) {
+        if let inferIp = dict["infer_ip"] as? String {
+            autoInferIP = inferIp == "auto"
+        } else {
+            autoInferIP = false
+        }
+    }
+    
+    @objc public var autoInferIP: Bool
+    
+    @objc public func serialize() -> NSDictionary {
+        [
+            "infer_ip": autoInferIP ? "auto" : "never"
+        ]
+    }
+}
diff --git a/Tests/SentryTests/Networking/SentryNSURLRequestBuilderTests.swift b/Tests/SentryTests/Networking/SentryNSURLRequestBuilderTests.swift
@@ -1,4 +1,4 @@
-@testable import Sentry
+@_spi(Private) @testable import Sentry
 import SentryTestUtils
 import XCTest
 
diff --git a/Tests/SentryTests/Protocol/SentrySDKSettings+Equality.h b/Tests/SentryTests/Protocol/SentrySDKSettings+Equality.h
@@ -1,4 +1,4 @@
-#import "SentrySDKSettings.h"
+#import <Sentry/Sentry-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Tests/SentryTests/Protocol/SentrySdkInfo+Equality.m b/Tests/SentryTests/Protocol/SentrySdkInfo+Equality.m
@@ -1,4 +1,5 @@
 #import "SentrySdkInfo+Equality.h"
+#import <Sentry/Sentry-Swift.h>
 
 @implementation SentrySdkInfo (Equality)
 
diff --git a/Tests/SentryTests/Protocol/SentrySdkInfoNilTests.m b/Tests/SentryTests/Protocol/SentrySdkInfoNilTests.m
@@ -1,5 +1,5 @@
-#import "SentrySDKSettings.h"
 #import "SentrySdkInfo.h"
+#import <Sentry/Sentry-Swift.h>
 #import <XCTest/XCTest.h>
 
 @interface SentrySdkInfoNilTests : XCTestCase

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@testable import Sentry`
	`1`	`+@_spi(Private) @testable import Sentry`
`2`	`2`	`import SentryTestUtils`
`3`	`3`	`import XCTest`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import "SentrySDKSettings.h"`
	`1`	`+#import <Sentry/Sentry-Swift.h>`
`2`	`2`
`3`	`3`	`NS_ASSUME_NONNULL_BEGIN`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#import "SentrySdkInfo+Equality.h"`
	`2`	`+#import <Sentry/Sentry-Swift.h>`
`2`	`3`
`3`	`4`	`@implementation SentrySdkInfo (Equality)`
`4`	`5`