Merge pull request #85 from backtrace-labs/release

Release branch for 1.7.4

Author: vlussenburg

.travis.yml

@@ -25,14 +25,14 @@ Pod::Spec.new do |s|
   s.osx.source_files = ["Sources/**/*.{swift}", "Backtrace-macOS/**/*.{h*,swift}"]
   s.tvos.source_files = ["Sources/**/*.{swift}", "Backtrace-tvOS/**/*.{h*,swift}"]
 
-  s.osx.exclude_files = ["Sources/Features/Breadcrumb/**/*.{swift}"]
   s.tvos.exclude_files = ["Sources/Features/Breadcrumb/**/*.{swift}"]
 
   s.ios.public_header_files = ["Backtrace-iOS/**/*.h*"]
   s.osx.public_header_files = ["Backtrace-macOS/**/*.h*"]
   s.tvos.public_header_files = ["Backtrace-tvOS/**/*.h*"]
 
-  s.ios.dependency "Cassette", "1.0.0-beta5"
+  s.ios.dependency "Cassette", '1.0.0-beta5'
+  s.osx.dependency "Cassette", '1.0.0-beta5'
   s.dependency "Backtrace-PLCrashReporter", '1.5.3'
 
   s.resources = 'Sources/**/*.xcdatamodeld'

Backtrace.podspec

@@ -4,11 +4,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface Keys : NSObject
 
-/// [Submission URL](https://help.backtrace.io/en/articles/1772855-what-is-a-submission-url)
+@property(class, nonatomic, assign, readonly) NSString *universeName;
+
+/// [Submission URL](https://support.backtrace.io/hc/en-us/articles/360040516451-What-is-a-submission-url-)
 @property(class, nonatomic, assign, readonly) NSString *backtraceUrl;
 @property(class, nonatomic, assign, readonly) NSString *backtraceSubmissionUrl;
 
-/// [Submission token](https://help.backtrace.io/en/articles/1772818-what-is-a-submission-token)
+/// [Submission token](https://support.backtrace.io/hc/en-us/articles/360040105172)
 @property(class, nonatomic, assign, readonly) NSString *backtraceToken;
 
 @end

Backtrace.xcodeproj/project.pbxproj

@@ -2,21 +2,27 @@
 
 @implementation Keys
 
++ (NSString const *) universeName {
+    // Set your universe name here - https://support.backtrace.io/hc/en-us/articles/360040516451-What-is-a-submission-url-
+    // e.g.: yourteam
+    return @"yourteam";
+}
+
 + (NSString const *) backtraceUrl {
-    // Set your submission URL - https://help.backtrace.io/en/articles/1772855-what-is-a-submission-url
+    // Set your submission URL - https://support.backtrace.io/hc/en-us/articles/360040516451-What-is-a-submission-url-
     // e.g.: https://yourteam.backtrace.io
-    return @"https://yourteam.backtrace.io";
+    return [NSString stringWithFormat: @"https://%@.sp.backtrace.io:6098", [Keys universeName]];
 }
 
 + (NSString const *) backtraceToken {
-    // Set your submission token - https://help.backtrace.io/en/articles/1772818-what-is-a-submission-token
+    // Set your submission token - https://support.backtrace.io/hc/en-us/articles/360040105172
     return @"token";
 }
 
 + (NSString const *) backtraceSubmissionUrl {
-    // Set your submission URL - https://help.backtrace.io/en/articles/1772855-what-is-a-submission-url
+    // Set your submission URL - https://support.backtrace.io/hc/en-us/articles/360040516451-What-is-a-submission-url-
     // e.g.: https://submit.backtrace.io/{universe}/{token}/plcrash
-    return @"https://submit.backtrace.io/{universe}/{token}/plcrash";
+    return [NSString stringWithFormat: @"https://submit.backtrace.io/%@/%@/plcrash", [Keys universeName], [Keys backtraceToken]];
 }
 
 @end

Examples/Common/Keys.h

@@ -10,49 +10,47 @@ @interface AppDelegate () <BacktraceClientDelegate>
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    NSArray *paths = @[[[NSBundle mainBundle] pathForResource: @"test" ofType: @"txt"]];
+    NSString *fileName = @"myCustomFile.txt";
+    NSURL *libraryUrl = [[[NSFileManager defaultManager] URLsForDirectory:NSLibraryDirectory
+             inDomains:NSUserDomainMask] lastObject];
+    NSURL *fileUrl = [libraryUrl URLByAppendingPathComponent:fileName];
+
     BacktraceCredentials *credentials = [[BacktraceCredentials alloc]
                                          initWithEndpoint: [NSURL URLWithString: Keys.backtraceUrl]
                                          token: [Keys backtraceToken]];
     BacktraceDatabaseSettings *backtraceDatabaseSettings = [[BacktraceDatabaseSettings alloc] init];
-    backtraceDatabaseSettings.maxRecordCount = 1000;
-    backtraceDatabaseSettings.maxDatabaseSize = 10;
-    backtraceDatabaseSettings.retryInterval = 5;
-    backtraceDatabaseSettings.retryLimit = 3;
-    backtraceDatabaseSettings.retryBehaviour = RetryBehaviourInterval;
-    backtraceDatabaseSettings.retryOrder = RetryOrderStack;
-    
+    backtraceDatabaseSettings.maxRecordCount = 10;
+
     BacktraceClientConfiguration *configuration = [[BacktraceClientConfiguration alloc]
                                                    initWithCredentials: credentials
                                                    dbSettings: backtraceDatabaseSettings
                                                    reportsPerMin: 3
                                                    allowsAttachingDebugger: TRUE
-                                                   detectOOM: FALSE];
-    [configuration enableBreadCrumbs:@[@(BacktraceBreadcrumbTypeManual), @(BacktraceBreadcrumbTypeLog)]];
+                                                   detectOOM: TRUE];
     BacktraceClient.shared = [[BacktraceClient alloc] initWithConfiguration: configuration error: nil];
-    BacktraceClient.shared.delegate = self;
+    BacktraceClient.shared.attributes = @{@"foo": @"bar", @"testing": @YES};
+    BacktraceClient.shared.attachments = [NSArray arrayWithObjects:fileUrl, nil];
 
     // sending NSException
     @try {
         NSArray *array = @[];
-        NSObject *object = array[1]; // will throw exception
+        array[1]; // will throw exception
     } @catch (NSException *exception) {
-        NSArray *paths = @[[[NSBundle mainBundle] pathForResource: @"test" ofType: @"txt"]];
-        [[BacktraceClient shared] sendWithAttachmentPaths: paths completion: ^(BacktraceResult * _Nonnull result) {
+        [[BacktraceClient shared] sendWithAttachmentPaths: [NSArray init]  completion: ^(BacktraceResult * _Nonnull result) {
             NSLog(@"%@", result);
         }];
     } @finally {
 
     }
 
     //sending NSError
-    NSError *error = [NSError errorWithDomain: @"backtrace.domain" code: 100 userInfo: @{}];
-    NSArray *paths = @[[[NSBundle mainBundle] pathForResource: @"test" ofType: @"txt"]];
     [[BacktraceClient shared] sendWithAttachmentPaths: paths completion: ^(BacktraceResult * _Nonnull result) {
         NSLog(@"%@", result);
     }];
 
-    
-    
+    BacktraceClient.shared.delegate = self;
+    [BacktraceClient.shared enableBreadcrumbs];
     NSDictionary *attributes = @{@"My Attribute":@"My Attribute Value"};
     [[BacktraceClient shared] addBreadcrumb:@"My Native Breadcrumb"
                                  attributes:attributes

Examples/Common/Keys.m

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,26 +17,36 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fhp-D4-2oC">
-                                <rect key="frame" x="10" y="30" width="355" height="507"/>
+                                <rect key="frame" x="10" y="10" width="355" height="527"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="tQm-Xk-agy">
                                 <rect key="frame" x="10" y="547" width="355" height="110"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wfh-no-STH">
-                                        <rect key="frame" x="0.0" y="0.0" width="355" height="50"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wfh-no-STH">
+                                        <rect key="frame" x="0.0" y="0.0" width="355" height="30"/>
+                                        <color key="backgroundColor" red="0.86495327950000001" green="0.49887192250000001" blue="0.45880818369999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <state key="normal" title="out of memory report">
+                                            <color key="titleColor" red="0.23527315260000001" green="0.23534822459999999" blue="0.2313722074" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="outOfMemoryReportAction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="j1d-Yg-4mQ"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5SP-Go-i82">
+                                        <rect key="frame" x="0.0" y="40" width="355" height="30"/>
                                         <color key="backgroundColor" red="0.86495327950000001" green="0.49887192250000001" blue="0.45880818369999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <state key="normal" title="live report">
                                             <color key="titleColor" red="0.23527315260000001" green="0.23534822459999999" blue="0.2313722074" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         </state>
                                         <connections>
-                                            <action selector="liveReportAction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="r8l-mx-oQk"/>
+                                            <action selector="liveReportAction:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Bqu-q0-7Zw"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4g4-3C-4oZ">
-                                        <rect key="frame" x="0.0" y="60" width="355" height="50"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4g4-3C-4oZ">
+                                        <rect key="frame" x="0.0" y="80" width="355" height="30"/>
                                         <color key="backgroundColor" red="0.86495327950000001" green="0.49887192250000001" blue="0.45880818369999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <state key="normal" title="crash">
                                             <color key="titleColor" red="0.23527315260000001" green="0.23534822459999999" blue="0.2313722074" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -53,6 +61,7 @@
                                 </constraints>
                             </stackView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="Wq8-QM-bIQ"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="Wq8-QM-bIQ" firstAttribute="bottom" secondItem="tQm-Xk-agy" secondAttribute="bottom" constant="10" id="6Uy-hB-fYL"/>
@@ -63,14 +72,14 @@
                             <constraint firstItem="tQm-Xk-agy" firstAttribute="leading" secondItem="Wq8-QM-bIQ" secondAttribute="leading" constant="10" id="eY6-cL-M6I"/>
                             <constraint firstItem="Fhp-D4-2oC" firstAttribute="top" secondItem="Wq8-QM-bIQ" secondAttribute="top" constant="10" id="vbK-EV-v8z"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Wq8-QM-bIQ"/>
                     </view>
                     <connections>
                         <outlet property="textView" destination="Fhp-D4-2oC" id="NVZ-d1-QD6"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="49" y="53"/>
         </scene>
     </scenes>
 </document>

Examples/Example-iOS-ObjC/AppDelegate.m

@@ -8,10 +8,22 @@ @interface ViewController ()
 
 @implementation ViewController
 
+static NSMutableData *wastedMemory = nil;
+
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    wastedMemory = [[NSMutableData alloc] init];
+}
+
+- (IBAction) outOfMemoryReportAction: (id) sender {
+    // The trick is: to aggressively take up memory but not allocate a block too large to cause a crash
+    // This is obviously device dependent, so the 500k may have to be tweaked
+    int size = 500000;
+    for (int i = 0; i < 10000 ; i++) {
+        [wastedMemory appendData:[NSMutableData dataWithLength:size]];
+    }
 }
+
 - (IBAction) liveReportAction: (id) sender {
     NSArray *paths = @[@"/home/test.txt"];
     [[BacktraceClient shared] sendWithAttachmentPaths:paths completion:^(BacktraceResult * _Nonnull result) {
@@ -21,7 +33,7 @@ - (IBAction) liveReportAction: (id) sender {
 
 - (IBAction) crashAction: (id) sender {
     NSArray *array = @[];
-    NSObject *o = array[1];
+    array[1];
 }