test: Use initialScope in sample apps (#3001)

Author: philipphofmann

Samples/iOS-ObjectiveC/iOS-ObjectiveC/AppDelegate.m

@@ -26,6 +26,11 @@ - (BOOL)application:(UIApplication *)application
         SentryHttpStatusCodeRange *httpStatusCodeRange =
             [[SentryHttpStatusCodeRange alloc] initWithMin:400 max:599];
         options.failedRequestStatusCodes = @[ httpStatusCodeRange ];
+
+        options.initialScope = ^(SentryScope *scope) {
+            [scope setTagValue:@"" forKey:@""];
+            return scope;
+        };
     }];
 
     return YES;

Samples/iOS-Swift/iOS-Swift/AppDelegate.swift

@@ -50,21 +50,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 NotificationCenter.default.post(name: .init("io.sentry.newbreadcrumb"), object: breadcrumb)
                 return breadcrumb
             }
-        }
-
-        SentrySDK.configureScope { (scope) in
-            scope.setEnvironment("debug")
-            scope.setTag(value: "swift", key: "language")
-           
-            let user = User(userId: "1")
-            user.email = "[email protected]"
-            scope.setUser(user)
+            
+            options.initialScope = { scope in
+                scope.setEnvironment("debug")
+                scope.setTag(value: "swift", key: "language")
+               
+                let user = User(userId: "1")
+                user.email = "[email protected]"
+                scope.setUser(user)
 
-            if let path = Bundle.main.path(forResource: "Tongariro", ofType: "jpg") {
-                scope.addAttachment(Attachment(path: path, filename: "Tongariro.jpg", contentType: "image/jpeg"))
-            }
-            if let data = "hello".data(using: .utf8) {
-                scope.addAttachment(Attachment(data: data, filename: "log.txt"))
+                if let path = Bundle.main.path(forResource: "Tongariro", ofType: "jpg") {
+                    scope.addAttachment(Attachment(path: path, filename: "Tongariro.jpg", contentType: "image/jpeg"))
+                }
+                if let data = "hello".data(using: .utf8) {
+                    scope.addAttachment(Attachment(data: data, filename: "log.txt"))
+                }
+                return scope
             }
         }
     }

Samples/macOS-Swift/macOS-Swift/AppDelegate.swift

@@ -13,15 +13,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             if ProcessInfo.processInfo.arguments.contains("--io.sentry.profiling.enable") {
                 options.profilesSampleRate = 1
             }
-        }
-        
-        SentrySDK.configureScope { scope in
-            if let path = Bundle.main.path(forResource: "Tongariro", ofType: "jpg") {
-                scope.addAttachment(Attachment(path: path, filename: "Tongariro.jpg", contentType: "image/jpeg"))
-            }
 
-            if let data = "hello".data(using: .utf8) {
-                scope.addAttachment(Attachment(data: data, filename: "log.txt"))
+            options.initialScope = { scope in
+                if let path = Bundle.main.path(forResource: "Tongariro", ofType: "jpg") {
+                    scope.addAttachment(Attachment(path: path, filename: "Tongariro.jpg", contentType: "image/jpeg"))
+                }
+                
+                if let data = "hello".data(using: .utf8) {
+                    scope.addAttachment(Attachment(data: data, filename: "log.txt"))
+                }
+                
+                return scope
             }
         }
     }

Samples/tvOS-Swift/tvOS-Swift/AppDelegate.swift

@@ -16,15 +16,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             // Sampling 100% - In Production you probably want to adjust this
             options.tracesSampleRate = 1.0
             options.enableAppHangTracking = true
-        }
-        
-        SentrySDK.configureScope { scope in
-            if let path = Bundle.main.path(forResource: "Tongariro", ofType: "jpg") {
-                scope.addAttachment(Attachment(path: path, filename: "Tongariro.jpg", contentType: "image/jpeg"))
-            }
 
-            if let data = "hello".data(using: .utf8) {
-                scope.addAttachment(Attachment(data: data, filename: "log.txt"))
+            options.initialScope = { scope in
+                if let path = Bundle.main.path(forResource: "Tongariro", ofType: "jpg") {
+                    scope.addAttachment(Attachment(path: path, filename: "Tongariro.jpg", contentType: "image/jpeg"))
+                }
+                
+                if let data = "hello".data(using: .utf8) {
+                    scope.addAttachment(Attachment(data: data, filename: "log.txt"))
+                }
+                return scope
             }
         }
 

Sources/Sentry/Public/SentryOptions.h

@@ -197,7 +197,7 @@ NS_SWIFT_NAME(Options)
  * configure and return this, or create your own scope instead.
  * @note The default simply returns the passed in scope.
  */
-@property (nonatomic) SentryScope *(^initialScope)(SentryScope *);
+@property (nonatomic) SentryScope * (^initialScope)(SentryScope *);
 
 #if SENTRY_HAS_UIKIT
 /**

Sources/Sentry/SentrySDK.m

@@ -139,7 +139,8 @@ + (void)startWithOptions:(SentryOptions *)options
     [newClient.fileManager moveAppStateToPreviousAppState];
     [newClient.fileManager moveBreadcrumbsToPreviousBreadcrumbs];
 
-    SentryScope *scope = options.initialScope([[SentryScope alloc] initWithMaxBreadcrumbs:options.maxBreadcrumbs]);
+    SentryScope *scope
+        = options.initialScope([[SentryScope alloc] initWithMaxBreadcrumbs:options.maxBreadcrumbs]);
     // The Hub needs to be initialized with a client so that closing a session
     // can happen.
     [SentrySDK setCurrentHub:[[SentryHub alloc] initWithClient:newClient andScope:scope]];

Tests/SentryTests/SentryOptionsTest.m

@@ -1144,15 +1144,20 @@ - (void)testDefaultInAppExcludes
     XCTAssertEqualObjects(@[], options.inAppExcludes);
 }
 
-- (void)testDefaultInitialScope {
+- (void)testDefaultInitialScope
+{
     SentryOptions *options = [self getValidOptions:@{}];
     SentryScope *scope = [[SentryScope alloc] init];
     XCTAssertIdentical(scope, options.initialScope(scope));
 }
 
-- (void)testInitialScope {
-    SentryScope *(^initialScope)(SentryScope *) = ^SentryScope * (SentryScope *scope) { return scope; };
-    SentryOptions *options = [self getValidOptions:@{ @"initialScope": initialScope }];
+- (void)testInitialScope
+{
+    SentryScope * (^initialScope)(SentryScope *) = ^SentryScope *(SentryScope *scope)
+    {
+        return scope;
+    };
+    SentryOptions *options = [self getValidOptions:@{ @"initialScope" : initialScope }];
     XCTAssertIdentical(initialScope, options.initialScope);
 }