Merge branch 'master' into ref/sentry-mechanism-meta

getsentry · Mar 31, 2021 · 0e4d967 · 0e4d967
2 parents 3d0ac16 + 25c76d6
commit 0e4d967
Show file tree

Hide file tree

Showing 20 changed files with 915 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 ### Features and Fixes
 
+- feat: Async callstacks are being tracked by wrapping the `dispatch_async` and related APIs. #998
 - perf: Avoid allocating dict in BreadcrumbTracker #1027
 - feat: Add start and endSession to SentrySDK #1021
 - fix: Crash when passing garbage to maxBreadcrumbs #1018

diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/Base.lproj/Main.storyboard b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/Base.lproj/Main.storyboard
@@ -83,6 +83,13 @@
                                             <action selector="oomCrash:" destination="BYZ-38-t0r" eventType="touchUpInside" id="6Eb-uS-ljp"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lr8-6E-lN6">
+                                        <rect key="frame" x="0.0" y="180" width="398" height="30"/>
+                                        <state key="normal" title="async crash"/>
+                                        <connections>
+                                            <action selector="asyncCrash:" destination="BYZ-38-t0r" eventType="touchUpInside" id="c9v-X0-ZOl"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                             </stackView>
                         </subviews>

diff --git a/Samples/iOS-ObjectiveC/iOS-ObjectiveC/ViewController.m b/Samples/iOS-ObjectiveC/iOS-ObjectiveC/ViewController.m
@@ -115,6 +115,21 @@ - (IBAction)crash:(id)sender
     [SentrySDK crash];
 }
 
+- (IBAction)asyncCrash:(id)sender
+{
+    dispatch_async(dispatch_get_main_queue(), ^{ [self asyncCrash1]; });
+}
+
+- (void)asyncCrash1
+{
+    dispatch_async(dispatch_get_main_queue(), ^{ [self asyncCrash2]; });
+}
+
+- (void)asyncCrash2
+{
+    dispatch_async(dispatch_get_main_queue(), ^{ [SentrySDK crash]; });
+}
+
 - (IBAction)oomCrash:(id)sender
 {
     dispatch_async(dispatch_get_main_queue(), ^{

diff --git a/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift/Base.lproj/Main.storyboard
@@ -96,6 +96,13 @@
                                             <action selector="oomCrash:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Oju-om-O6e"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xur-X2-ih4">
+                                        <rect key="frame" x="0.0" y="210" width="398" height="30"/>
+                                        <state key="normal" title="async crash"/>
+                                        <connections>
+                                            <action selector="asyncCrash:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Mqi-sE-R7d"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                             </stackView>
                         </subviews>

diff --git a/Samples/iOS-Swift/iOS-Swift/ViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
@@ -91,12 +91,30 @@ class ViewController: UIViewController {
         SentrySDK.crash()
     }
 
+    @IBAction func asyncCrash(_ sender: Any) {
+        DispatchQueue.main.async {
+            self.asyncCrash1()
+        }
+    }
+
+    func asyncCrash1() {
+        DispatchQueue.main.async {
+            self.asyncCrash2()
+        }
+    }
+
+    func asyncCrash2() {
+        DispatchQueue.main.async {
+            SentrySDK.crash()
+        }
+    }
+
     @IBAction func oomCrash(_ sender: Any) {
         DispatchQueue.main.async {
             let megaByte = 1_024 * 1_024
             let memoryPageSize = NSPageSize()
             let memoryPages = megaByte / memoryPageSize
-            
+
             while true {
                 // Allocate one MB and set one element of each memory page to something.
                 let ptr = UnsafeMutablePointer<Int8>.allocate(capacity: megaByte)

diff --git a/Samples/macOS-Swift/macOS-Swift/Base.lproj/Main.storyboard b/Samples/macOS-Swift/macOS-Swift/Base.lproj/Main.storyboard
@@ -776,6 +776,17 @@
                                     <action selector="sentryCrash:" target="XfG-lQ-9wD" id="8gG-2n-QOP"/>
                                 </connections>
                             </button>
+                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="onh-qf-HCq" userLabel="asyncCrash">
+                                <rect key="frame" x="180" y="25" width="126" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <buttonCell key="cell" type="push" title="async crash" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3ec-oQ-wXv">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="asyncCrash:" target="XfG-lQ-9wD" id="8L4-eE-eEw"/>
+                                </connections>
+                            </button>
                         </subviews>
                     </view>
                 </viewController>

diff --git a/Samples/macOS-Swift/macOS-Swift/ViewController.swift b/Samples/macOS-Swift/macOS-Swift/ViewController.swift
@@ -59,4 +59,22 @@ class ViewController: NSViewController {
     @IBAction func sentryCrash(_ sender: Any) {
         SentrySDK.crash()
     }
+
+    @IBAction func asyncCrash(_ sender: Any) {
+        DispatchQueue.main.async {
+            self.asyncCrash1()
+        }
+    }
+
+    func asyncCrash1() {
+        DispatchQueue.main.async {
+            self.asyncCrash2()
+        }
+    }
+
+    func asyncCrash2() {
+        DispatchQueue.main.async {
+            SentrySDK.crash()
+        }
+    }
 }
diff --git a/Samples/tvOS-Swift/tvOS-Swift/ContentView.swift b/Samples/tvOS-Swift/tvOS-Swift/ContentView.swift
@@ -47,13 +47,25 @@ struct ContentView: View {
             transaction.finish()
         })
     }
-
+
+    func asyncCrash1() {
+        DispatchQueue.main.async {
+            self.asyncCrash2()
+        }
+    }
+
+    func asyncCrash2() {
+        DispatchQueue.main.async {
+            SentrySDK.crash()
+        }
+    }
+
     var oomCrashAction: () -> Void = {
         DispatchQueue.main.async {
             let megaByte = 1_024 * 1_024
             let memoryPageSize = NSPageSize()
             let memoryPages = megaByte / memoryPageSize
-            
+
             while true {
                 // Allocate one MB and set one element of each memory page to something.
                 let ptr = UnsafeMutablePointer<Int8>.allocate(capacity: megaByte)
@@ -63,7 +75,7 @@ struct ContentView: View {
             }
         }
     }
-    
+
     var body: some View {
         VStack {
             Button(action: addBreadcrumbAction) {
@@ -89,13 +101,21 @@ struct ContentView: View {
             Button(action: captureTransactionAction) {
                 Text("Capture Transaction")
             }
-            
+
             Button(action: {
                 SentrySDK.crash()
             }) {
                 Text("Crash")
             }
 
+            Button(action: {
+                DispatchQueue.main.async {
+                    self.asyncCrash1()
+                }
+            }) {
+                Text("Async Crash")
+            }
+
             Button(action: oomCrashAction) {
                 Text("OOM Crash")
             }