feat: Replace user.ipAddress = {{auto}} with a new settings.infer_ip property in the sdk metadata (#5877)

* feat: Replace `user.ipAddress = {{auto}}` with a new settings.infer_ip property in the sdk metadata

* Use `SENTRY_UNWRAP_NULLABLE` to cast var

Author: itaybre

Sentry.xcodeproj/project.pbxproj

@@ -1032,6 +1032,8 @@
 		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 */; };
@@ -1051,6 +1053,8 @@
 		F4AACD612E01ACE800DDDD1E /* SentryCrashDynamicLinkerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AACD602E01ACE800DDDD1E /* SentryCrashDynamicLinkerTests.m */; };
 		F4DC35562E1FFD620077CE89 /* SentryVideoFrameProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DC35552E1FFD610077CE89 /* SentryVideoFrameProcessor.swift */; };
 		F4DC35582E1FFE1F0077CE89 /* SentryVideoFrameProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DC35572E1FFE1B0077CE89 /* SentryVideoFrameProcessorTests.swift */; };
+		F4DCC9DD2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4DCC9DC2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift */; };
+		F4DCC9E52E4AACE0008ECE45 /* SentrySDKSettings+Equality.m in Sources */ = {isa = PBXBuildFile; fileRef = F4DCC9E42E4AACE0008ECE45 /* SentrySDKSettings+Equality.m */; };
 		F4E3DCCB2E1579240093CB80 /* SentryScopePersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E3DCCA2E1579240093CB80 /* SentryScopePersistentStore.swift */; };
 		FA034AC82DD3DB4900FE3107 /* SentryIntegrationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FA21F0B42E4A2A80008B4E5A /* SentryAppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA4C32972DF7513F001D7B01 /* SentryAppState.swift */; };
@@ -2376,6 +2380,8 @@
 		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>"; };
@@ -2395,6 +2401,9 @@
 		F4AACD602E01ACE800DDDD1E /* SentryCrashDynamicLinkerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryCrashDynamicLinkerTests.m; sourceTree = "<group>"; };
 		F4DC35552E1FFD610077CE89 /* SentryVideoFrameProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryVideoFrameProcessor.swift; sourceTree = "<group>"; };
 		F4DC35572E1FFE1B0077CE89 /* SentryVideoFrameProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryVideoFrameProcessorTests.swift; sourceTree = "<group>"; };
+		F4DCC9DC2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentrySDKSettingsTests.swift; sourceTree = "<group>"; };
+		F4DCC9E32E4AACE0008ECE45 /* SentrySDKSettings+Equality.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SentrySDKSettings+Equality.h"; sourceTree = "<group>"; };
+		F4DCC9E42E4AACE0008ECE45 /* SentrySDKSettings+Equality.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SentrySDKSettings+Equality.m"; sourceTree = "<group>"; };
 		F4E3DCCA2E1579240093CB80 /* SentryScopePersistentStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryScopePersistentStore.swift; sourceTree = "<group>"; };
 		FA034AC72DD3DB4900FE3107 /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = Public/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
 		FA3734812E0EEA670091EF24 /* SentryScreenshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryScreenshot.swift; sourceTree = "<group>"; };
@@ -2733,6 +2742,8 @@
 				7BC9A20528F41781001E7C4C /* SentryMeasurementUnit.m */,
 				A8F17B2D2901765900990B25 /* SentryRequest.m */,
 				A8AFFCCE2906C03700967CD7 /* SentryRequest.h */,
+				F429DCB92E4A59370054383F /* SentrySDKSettings.h */,
+				F429DCBA2E4A59370054383F /* SentrySDKSettings.m */,
 			);
 			name = Protocol;
 			sourceTree = "<group>";
@@ -3380,6 +3391,7 @@
 		7B3D0474249A3D5800E106B6 /* Protocol */ = {
 			isa = PBXGroup;
 			children = (
+				F4DCC9DC2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift */,
 				9264E1EC2E2E397400B077CF /* SentryLogMessageTests.swift */,
 				92B6BDAC2E05B9F700D538B3 /* SentryLogTests.swift */,
 				92ECD7472E05B5760063EC10 /* SentryLogAttributeTests.swift */,
@@ -3396,6 +3408,8 @@
 				7B26BBFA24C0A66D00A79CCC /* SentrySdkInfoNilTests.m */,
 				7B6D98E724C6D336005502FA /* SentrySdkInfo+Equality.h */,
 				7B6D98E824C6D336005502FA /* SentrySdkInfo+Equality.m */,
+				F4DCC9E32E4AACE0008ECE45 /* SentrySDKSettings+Equality.h */,
+				F4DCC9E42E4AACE0008ECE45 /* SentrySDKSettings+Equality.m */,
 				7B82D54824E2A2D400EE670F /* SentryIdTests.swift */,
 				7B04A9AA24EA5F8D00E710B1 /* SentryUserTests.swift */,
 				9286059829A50BAA00F96038 /* SentryGeoTests.swift */,
@@ -5111,6 +5125,7 @@
 				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 */,
@@ -5870,6 +5885,7 @@
 				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 */,
@@ -6061,6 +6077,7 @@
 				62E081AB29ED4322000F69FC /* SentryBreadcrumbTestDelegate.swift in Sources */,
 				D8751FA5274743710032F4DE /* SentryNSURLSessionTaskSearchTests.swift in Sources */,
 				D86F419827C8FEFA00490520 /* SentryCoreDataTrackerExtension.swift in Sources */,
+				F4DCC9E52E4AACE0008ECE45 /* SentrySDKSettings+Equality.m in Sources */,
 				7BF536D124BDF3E7004FA6A2 /* SentryEnvelopeTests.swift in Sources */,
 				7B98D7E025FB73B900C5A389 /* SentryWatchdogTerminationTrackerTests.swift in Sources */,
 				63FE721620DA66EC00CDBAE8 /* SentryCrashReportFixer_Tests.m in Sources */,
@@ -6247,6 +6264,7 @@
 				7BFA69F627E0840400233199 /* SentryANRTrackingIntegrationTests.swift in Sources */,
 				7BBD18B62451807600427C76 /* SentryDefaultRateLimitsTests.swift in Sources */,
 				63FE720620DA66EC00CDBAE8 /* SentryCrashMonitor_AppState_Tests.m in Sources */,
+				F4DCC9DD2E4AA9D0008ECE45 /* SentrySDKSettingsTests.swift in Sources */,
 				7B4E375B2582313100059C93 /* SentryAttachmentTests.swift in Sources */,
 				63FE721320DA66EC00CDBAE8 /* SentryCrashMonitor_Signal_Tests.m in Sources */,
 				7BBD18B32451805500427C76 /* SentryRateLimitsParserTests.swift in Sources */,

Sources/Resources/Sentry.modulemap

@@ -27,6 +27,7 @@ framework module Sentry {
         header "SentrySessionReplayIntegration-Hybrid.h"
 
         header "SentrySdkInfo.h"
+        header "SentrySDKSettings.h"
         header "SentryInternalSerializable.h"
 
         export *

Sources/Sentry/Public/SentryOptions.h

@@ -270,9 +270,9 @@ NS_SWIFT_NAME(Options)
  * When enabled, the SDK sends personal identifiable along with events.
  * @note The default is @c NO .
  * @discussion When the user of an event doesn't contain an IP address, and this flag is
- * @c YES, the SDK sets it to @c {{auto}} to instruct the server to use the
- * connection IP address as the user address. Due to backward compatibility concerns, Sentry set the
- * IP address to @c {{auto}} out of the box for Cocoa. If you want to stop Sentry from
+ * @c YES, the SDK sets sdk.settings.infer_ip to @c auto to instruct the server to use the
+ * connection IP address as the user address. Due to backward compatibility concerns, Sentry sets
+ * sdk.settings.infer_ip  to @c auto out of the box for Cocoa. If you want to stop Sentry from
  * using the connections IP address, you have to enable Prevent Storing of IP Addresses in your
  * project settings in Sentry.
  */

Sources/Sentry/SentryClient.m

@@ -811,15 +811,6 @@ - (SentryEvent *_Nullable)prepareEvent:(SentryEvent *)event
     // Need to do this after the scope is applied cause this sets the user if there is any
     [self setUserIdIfNoUserSet:event];
 
-    // User can't be nil as setUserIdIfNoUserSet sets it.
-    if (self.options.sendDefaultPii && nil == event.user.ipAddress) {
-        // Let Sentry infer the IP address from the connection.
-        // Due to backward compatibility concerns, Sentry servers set the IP address to {{auto}} out
-        // of the box for only Cocoa and JavaScript, which makes this toggle currently somewhat
-        // useless. Still, we keep it for future compatibility reasons.
-        event.user.ipAddress = @"{{auto}}";
-    }
-
     BOOL eventIsATransaction
         = event.type != nil && [event.type isEqualToString:SentryEnvelopeItemTypeTransaction];
     BOOL eventIsATransactionClass

Sources/Sentry/SentrySDKSettings.m

@@ -0,0 +1,31 @@
+#import "SentrySDKSettings.h"
+#import "SentryOptions.h"
+#import "SentrySDKInternal.h"
+
+@implementation SentrySDKSettings
+
+- (instancetype)initWithOptions:(SentryOptions *_Nullable)options
+{
+    if (self = [super init]) {
+        _autoInferIP = options.sendDefaultPii;
+    }
+
+    return self;
+}
+
+- (instancetype)initWithDict:(NSDictionary *)dict
+{
+    if (self = [super init]) {
+        if ([dict[@"infer_ip"] isKindOfClass:[NSString class]]) {
+            _autoInferIP = [dict[@"infer_ip"] isEqualToString:@"auto"];
+        }
+    }
+    return self;
+}
+
+- (nonnull NSDictionary<NSString *, id> *)serialize
+{
+    return @{ @"infer_ip" : _autoInferIP ? @"auto" : @"never" };
+}
+
+@end

Sources/Sentry/SentrySdkInfo.m

@@ -1,9 +1,11 @@
 #import "SentrySdkInfo.h"
 #import "SentryClient+Private.h"
 #import "SentryHub+Private.h"
+#import "SentryInternalDefines.h"
 #import "SentryMeta.h"
 #import "SentryOptions.h"
 #import "SentrySDK+Private.h"
+#import "SentrySDKSettings.h"
 #import "SentrySwift.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -43,26 +45,30 @@ - (instancetype)initWithOptions:(SentryOptions *_Nullable)options
     if (sdkPackage != nil) {
         [packages addObject:sdkPackage];
     }
+    SentrySDKSettings *settings = [[SentrySDKSettings alloc] initWithOptions:options];
 
     return [self initWithName:SentryMeta.sdkName
                       version:SentryMeta.versionString
                  integrations:integrations
                      features:features
-                     packages:[packages allObjects]];
+                     packages:[packages allObjects]
+                     settings:settings];
 }
 
 - (instancetype)initWithName:(NSString *)name
                      version:(NSString *)version
                 integrations:(NSArray<NSString *> *)integrations
                     features:(NSArray<NSString *> *)features
                     packages:(NSArray<NSDictionary<NSString *, NSString *> *> *)packages
+                    settings:(SentrySDKSettings *)settings
 {
     if (self = [super init]) {
         _name = name ?: @"";
         _version = version ?: @"";
         _integrations = integrations ?: @[];
         _features = features ?: @[];
         _packages = packages ?: @[];
+        _settings = settings;
     }
 
     return self;
@@ -75,6 +81,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict
     NSMutableSet<NSString *> *integrations = [[NSMutableSet alloc] init];
     NSMutableSet<NSString *> *features = [[NSMutableSet alloc] init];
     NSMutableSet<NSDictionary<NSString *, NSString *> *> *packages = [[NSMutableSet alloc] init];
+    SentrySDKSettings *settings = [[SentrySDKSettings alloc] initWithDict:@{}];
 
     if ([dict[@"name"] isKindOfClass:[NSString class]]) {
         name = dict[@"name"];
@@ -110,11 +117,17 @@ - (instancetype)initWithDict:(NSDictionary *)dict
         }
     }
 
+    if (dict[@"settings"] && [dict[@"settings"] isKindOfClass:[NSDictionary class]]) {
+        settings = [[SentrySDKSettings alloc]
+            initWithDict:SENTRY_UNWRAP_NULLABLE(NSDictionary, dict[@"settings"])];
+    }
+
     return [self initWithName:name
                       version:version
                  integrations:[integrations allObjects]
                      features:[features allObjects]
-                     packages:[packages allObjects]];
+                     packages:[packages allObjects]
+                     settings:settings];
 }
 
 - (NSDictionary<NSString *, id> *)serialize
@@ -125,6 +138,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict
         @"integrations" : self.integrations,
         @"features" : self.features,
         @"packages" : self.packages,
+        @"settings" : [self.settings serialize]
     };
 }
 

Sources/Sentry/include/SentrySDKSettings.h

@@ -0,0 +1,27 @@
+#if __has_include(<Sentry/SentryInternalSerializable.h>)
+#    import <Sentry/SentryInternalSerializable.h>
+#else
+#    import "SentryInternalSerializable.h"
+#endif
+
+#import <Foundation/Foundation.h>
+
+@class SentryOptions;
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Describes the settings for the Sentry SDK
+ * @see https://develop.sentry.dev/sdk/event-payloads/sdk/
+ */
+@interface SentrySDKSettings : NSObject <SentryInternalSerializable>
+
+- (instancetype)initWithOptions:(SentryOptions *_Nullable)options;
+
+- (instancetype)initWithDict:(NSDictionary *)dict;
+
+@property (nonatomic, assign) BOOL autoInferIP;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/Sentry/include/SentrySdkInfo.h

@@ -13,6 +13,7 @@
 #import <Foundation/Foundation.h>
 
 @class SentryOptions;
+@class SentrySDKSettings;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -61,14 +62,19 @@ SENTRY_NO_INIT
  */
 @property (nonatomic, readonly, copy) NSArray<NSDictionary<NSString *, NSString *> *> *packages;
 
+/**
+ * A set of settings as part of this SDK.
+ */
+@property (nonatomic, readonly, copy) SentrySDKSettings *settings;
+
 - (instancetype)initWithOptions:(SentryOptions *_Nullable)options;
 
 - (instancetype)initWithName:(NSString *)name
                      version:(NSString *)version
                 integrations:(NSArray<NSString *> *)integrations
                     features:(NSArray<NSString *> *)features
                     packages:(NSArray<NSDictionary<NSString *, NSString *> *> *)packages
-    NS_DESIGNATED_INITIALIZER;
+                    settings:(SentrySDKSettings *)settings NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithDict:(NSDictionary *)dict;
 

Tests/SentryTests/Helper/SentryFileManagerTests.swift

@@ -158,7 +158,7 @@ class SentryFileManagerTests: XCTestCase {
     }
 
     func testStoreInvalidEnvelope_ReturnsNil() {
-        let sdkInfoWithInvalidJSON = SentrySdkInfo(name: SentryInvalidJSONString() as String, version: "8.0.0", integrations: [], features: [], packages: [])
+        let sdkInfoWithInvalidJSON = SentrySdkInfo(name: SentryInvalidJSONString() as String, version: "8.0.0", integrations: [], features: [], packages: [], settings: SentrySDKSettings(dict: [:]))
         let headerWithInvalidJSON = SentryEnvelopeHeader(id: nil, sdkInfo: sdkInfoWithInvalidJSON, traceContext: nil)
 
         let envelope = SentryEnvelope(header: headerWithInvalidJSON, items: [])

Tests/SentryTests/Helper/SentrySerializationTests.swift

@@ -46,7 +46,7 @@ class SentrySerializationTests: XCTestCase {
     }
 
     func testEnvelopeWithData_InvalidEnvelopeHeaderJSON_ReturnsNil() {
-        let sdkInfoWithInvalidJSON = SentrySdkInfo(name: SentryInvalidJSONString() as String, version: "8.0.0", integrations: [], features: [], packages: [])
+        let sdkInfoWithInvalidJSON = SentrySdkInfo(name: SentryInvalidJSONString() as String, version: "8.0.0", integrations: [], features: [], packages: [], settings: SentrySDKSettings(dict: [:]))
         let headerWithInvalidJSON = SentryEnvelopeHeader(id: nil, sdkInfo: sdkInfoWithInvalidJSON, traceContext: nil)
 
         let envelope = SentryEnvelope(header: headerWithInvalidJSON, items: [])
@@ -147,7 +147,7 @@ class SentrySerializationTests: XCTestCase {
     }
 
     func testEnvelopeWithData_WithSdkInfo_ReturnsSDKInfo() throws {
-        let sdkInfo = SentrySdkInfo(name: "sentry.cocoa", version: "5.0.1", integrations: [], features: [], packages: [])
+        let sdkInfo = SentrySdkInfo(name: "sentry.cocoa", version: "5.0.1", integrations: [], features: [], packages: [], settings: SentrySDKSettings(dict: [:]))
         let envelopeHeader = SentryEnvelopeHeader(id: nil, sdkInfo: sdkInfo, traceContext: nil)
         let envelope = SentryEnvelope(header: envelopeHeader, singleItem: createItemWithEmptyAttachment())
 
@@ -647,7 +647,7 @@ class SentrySerializationTests: XCTestCase {
     }
 
     private func assertDefaultSdkInfoSet(deserializedEnvelope: SentryEnvelope, file: StaticString = #file, line: UInt = #line) {
-        let sdkInfo = SentrySdkInfo(name: SentryMeta.sdkName, version: SentryMeta.versionString, integrations: [], features: [], packages: [])
+        let sdkInfo = SentrySdkInfo(name: SentryMeta.sdkName, version: SentryMeta.versionString, integrations: [], features: [], packages: [], settings: SentrySDKSettings(dict: [:]))
         XCTAssertEqual(sdkInfo, deserializedEnvelope.header.sdkInfo, file: file, line: line)
     }