Merge branch 'master' into fix/2282-uidevice-main-thread

* master: chore: Add match_local to Fastfile Revert "feat: Track usage of the enableCaptureFailedRequests option (#2368)" (#2371)
getsentry · Nov 9, 2022 · 366c349 · 366c349
2 parents 9044351 + f444dc4
commit 366c349
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,6 @@
 
 ## Unreleased
 
-### Features
-
-- Report usage of enableCaptureFailedRequests (#2368)
-
 ### Fixes
 
 - Fix issue with invalid profiles uploading (#2358 and #2359)

diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h
@@ -416,7 +416,7 @@ NS_SWIFT_NAME(Options)
 
 /**
  * When enabled, the SDK captures HTTP Client errors. Default value is NO.
- * This feature requires enableSwizzling enabled as well, default value is YES.
+ * This feature requires enableSwizzling enabled as well, Default value is YES.
  */
 @property (nonatomic, assign) BOOL enableCaptureFailedRequests;
 

diff --git a/Sources/Sentry/SentryClient.m b/Sources/Sentry/SentryClient.m
@@ -654,10 +654,6 @@ - (void)setSdk:(SentryEvent *)event
         if (self.options.stitchAsyncCode) {
             [integrations addObject:@"StitchAsyncCode"];
         }
-
-        if (self.options.enableCaptureFailedRequests) {
-            [integrations addObject:@"CaptureFailedRequests"];
-        }
     }
 
     event.sdk = @{

diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
@@ -1047,22 +1047,6 @@ class SentryClientTest: XCTestCase {
             )
         }
     }
-
-    func testTrackEnableCaptureFailedRequests() {
-        SentrySDK.start(options: Options())
-
-        let eventId = fixture.getSut(configureOptions: { options in
-            options.enableCaptureFailedRequests = true
-        }).capture(message: fixture.messageAsString)
-
-        eventId.assertIsNotEmpty()
-        assertLastSentEvent { actual in
-            assertArrayEquals(
-                expected: ["AutoBreadcrumbTracking", "AutoSessionTracking", "Crash", "NetworkTracking", "CaptureFailedRequests"],
-                actual: actual.sdk?["integrations"] as? [String]
-            )
-        }
-    }
 
     func testSetSDKIntegrations_NoIntegrations() {
         let expected: [String] = []

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -45,6 +45,34 @@ platform :ios do
     )
   end
 
+  desc "Run match for local development"
+    lane :match_local do
+     match(
+       type: "development",
+       app_identifier: ["io.sentry.sample.iOS-Swift",
+         "io.sentry.sample.iOS-Swift.Clip",
+         "io.sentry.iOS-SwiftUITests.xctrunner",
+         "io.sentry.sample.movies.ProfileDataGeneratorUITest",
+         "io.sentry.sample.TrendingMovies",
+         "io.sentry.cocoa.perf-test-app-plain",
+         "io.sentry.*",
+         "io.sentry.iOS-Benchmarking.xctrunner",
+         "io.sentry.cocoa.perf-test-app-sentry"]
+     )
+     match(
+       type: "appstore",
+       app_identifier: ["io.sentry.sample.iOS-Swift",
+         "io.sentry.sample.iOS-Swift.Clip",
+         "io.sentry.iOS-SwiftUITests.xctrunner",
+         "io.sentry.sample.movies.ProfileDataGeneratorUITest",
+         "io.sentry.sample.TrendingMovies",
+         "io.sentry.cocoa.perf-test-app-plain",
+         "io.sentry.*",
+         "io.sentry.iOS-Benchmarking.xctrunner",
+         "io.sentry.cocoa.perf-test-app-sentry"]
+     )
+  end
+
   desc "Build iOS-Swift with Release"
   lane :build_ios_swift do