Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify reporting #247

Merged
merged 2 commits into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Demos/iosAppObjC/iosAppObjC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
55684F7E2553B4C700F82F34 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 55684F7C2553B4C700F82F34 /* LaunchScreen.storyboard */; };
55684F812553B4C700F82F34 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 55684F802553B4C700F82F34 /* main.m */; };
55684F8D2553B7E100F82F34 /* RollbarDeploys in Frameworks */ = {isa = PBXBuildFile; productRef = 55684F8C2553B7E100F82F34 /* RollbarDeploys */; };
55684F8F2553B7E800F82F34 /* RollbarKSCrash in Frameworks */ = {isa = PBXBuildFile; productRef = 55684F8E2553B7E800F82F34 /* RollbarKSCrash */; };
55684F912553B7EE00F82F34 /* RollbarNotifier in Frameworks */ = {isa = PBXBuildFile; productRef = 55684F902553B7EE00F82F34 /* RollbarNotifier */; };
55684F9D2553BD1C00F82F34 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55684F9C2553BD1C00F82F34 /* NetworkExtension.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -45,7 +44,6 @@
55684F912553B7EE00F82F34 /* RollbarNotifier in Frameworks */,
55684F9D2553BD1C00F82F34 /* NetworkExtension.framework in Frameworks */,
55684F8D2553B7E100F82F34 /* RollbarDeploys in Frameworks */,
55684F8F2553B7E800F82F34 /* RollbarKSCrash in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -114,7 +112,6 @@
name = iosAppObjC;
packageProductDependencies = (
55684F8C2553B7E100F82F34 /* RollbarDeploys */,
55684F8E2553B7E800F82F34 /* RollbarKSCrash */,
55684F902553B7EE00F82F34 /* RollbarNotifier */,
);
productName = iosAppObjC;
Expand Down Expand Up @@ -401,10 +398,6 @@
isa = XCSwiftPackageProductDependency;
productName = RollbarDeploys;
};
55684F8E2553B7E800F82F34 /* RollbarKSCrash */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarKSCrash;
};
55684F902553B7EE00F82F34 /* RollbarNotifier */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarNotifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
LastUpgradeVersion = "1420"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
13 changes: 3 additions & 10 deletions Demos/iosAppObjC/iosAppObjC/AppDelegate.m
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
#import "AppDelegate.h"

@import RollbarNotifier;
@import RollbarKSCrash;
@import RollbarPLCrashReporter;

@implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
// Override point for customization after application launch.

// Rollbar Configuration object.
RollbarMutableConfig *config = [
// Rollbar post_client_item access token
RollbarConfig mutableConfigWithAccessToken:@"YOUR-ROLLBAR-ACCESSTOKEN"
environment:@"staging"];
environment:@"staging"];

config.loggingOptions.codeVersion = @"main";
config.developerOptions.suppressSdkInfoLogging = NO;
config.telemetry.memoryStatsAutocollectionInterval = 0.5;
config.telemetry.enabled = YES;

id<RollbarCrashCollector> crashCollector = [[RollbarKSCrashCollector alloc] init];
//id<RollbarCrashCollector> crashCollector = [[RollbarPLCrashCollector alloc] init];

[Rollbar initWithConfiguration:config
crashCollector:crashCollector];
[Rollbar initWithConfiguration:config];

[Rollbar infoMessage:@"Rollbar is up and running! Enjoy your remote error and log monitoring..."];

Expand Down
21 changes: 0 additions & 21 deletions Demos/iosAppSwift/iosAppSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
3B3C439029704BDD0026266C /* RollbarKSCrash in Frameworks */ = {isa = PBXBuildFile; productRef = 3B3C438F29704BDD0026266C /* RollbarKSCrash */; };
3BDB8240292D2DCE0093AC9D /* iosAppSwiftApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BDB823F292D2DCE0093AC9D /* iosAppSwiftApp.swift */; };
3BDB8242292D2DCE0093AC9D /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BDB8241292D2DCE0093AC9D /* ContentView.swift */; };
3BDB8244292D2DCF0093AC9D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3BDB8243292D2DCF0093AC9D /* Assets.xcassets */; };
3BDB8247292D2DCF0093AC9D /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3BDB8246292D2DCF0093AC9D /* Preview Assets.xcassets */; };
3BDB824F292D2E4B0093AC9D /* RollbarAUL in Frameworks */ = {isa = PBXBuildFile; productRef = 3BDB824E292D2E4B0093AC9D /* RollbarAUL */; };
3BDB8251292D2E4B0093AC9D /* RollbarCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 3BDB8250292D2E4B0093AC9D /* RollbarCommon */; };
3BDB8253292D2E4B0093AC9D /* RollbarNotifier in Frameworks */ = {isa = PBXBuildFile; productRef = 3BDB8252292D2E4B0093AC9D /* RollbarNotifier */; };
3BDB8257292D2E4B0093AC9D /* RollbarSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 3BDB8256292D2E4B0093AC9D /* RollbarSwift */; };
/* End PBXBuildFile section */
Expand All @@ -33,9 +30,6 @@
files = (
3BDB8253292D2E4B0093AC9D /* RollbarNotifier in Frameworks */,
3BDB8257292D2E4B0093AC9D /* RollbarSwift in Frameworks */,
3B3C439029704BDD0026266C /* RollbarKSCrash in Frameworks */,
3BDB8251292D2E4B0093AC9D /* RollbarCommon in Frameworks */,
3BDB824F292D2E4B0093AC9D /* RollbarAUL in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -102,11 +96,8 @@
);
name = iosAppSwift;
packageProductDependencies = (
3BDB824E292D2E4B0093AC9D /* RollbarAUL */,
3BDB8250292D2E4B0093AC9D /* RollbarCommon */,
3BDB8252292D2E4B0093AC9D /* RollbarNotifier */,
3BDB8256292D2E4B0093AC9D /* RollbarSwift */,
3B3C438F29704BDD0026266C /* RollbarKSCrash */,
);
productName = iosAppSwift;
productReference = 3BDB823C292D2DCE0093AC9D /* iosAppSwift.app */;
Expand Down Expand Up @@ -370,18 +361,6 @@
/* End XCConfigurationList section */

/* Begin XCSwiftPackageProductDependency section */
3B3C438F29704BDD0026266C /* RollbarKSCrash */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarKSCrash;
};
3BDB824E292D2E4B0093AC9D /* RollbarAUL */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarAUL;
};
3BDB8250292D2E4B0093AC9D /* RollbarCommon */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarCommon;
};
3BDB8252292D2E4B0093AC9D /* RollbarNotifier */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarNotifier;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1410"
LastUpgradeVersion = "1420"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
5 changes: 1 addition & 4 deletions Demos/iosAppSwift/iosAppSwift/iosAppSwiftApp.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import SwiftUI
import RollbarSwift
import RollbarNotifier
import RollbarKSCrash

@main
struct iosAppSwiftApp: App {
Expand Down Expand Up @@ -61,9 +60,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
config.customData = ["customer_type": "enterprise"]

// Initialize a Rollbar shared instance with a crash collector
Rollbar.initWithConfiguration(
config,
crashCollector: RollbarKSCrashCollector())
Rollbar.initWithConfiguration(config)

// Note the ability to add aditional key/value pairs to the occurrence data for extra context
Rollbar.infoMessage(
Expand Down
20 changes: 5 additions & 15 deletions Demos/macosAppObjC/macosAppObjC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

/* Begin PBXBuildFile section */
5547273924903EB7005018BD /* RollbarNotifier in Frameworks */ = {isa = PBXBuildFile; productRef = 5547273824903EB7005018BD /* RollbarNotifier */; };
55684F5A2553981600F82F34 /* RollbarKSCrash in Frameworks */ = {isa = PBXBuildFile; productRef = 55684F592553981600F82F34 /* RollbarKSCrash */; };
55759A6E2477560D00ED3F04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55759A6D2477560D00ED3F04 /* AppDelegate.m */; };
55759A712477560D00ED3F04 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55759A702477560D00ED3F04 /* ViewController.m */; };
55759A732477561100ED3F04 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 55759A722477561100ED3F04 /* Assets.xcassets */; };
55759A762477561100ED3F04 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 55759A742477561100ED3F04 /* Main.storyboard */; };
55759A792477561100ED3F04 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 55759A782477561100ED3F04 /* main.m */; };
55847E682655C2990062C242 /* RollbarAUL in Frameworks */ = {isa = PBXBuildFile; productRef = 55847E672655C2990062C242 /* RollbarAUL */; };
55A02A60259AAAE40071D60D /* RollbarPLCrashReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 55A02A5F259AAAE40071D60D /* RollbarPLCrashReporter */; };
55FD0711247860F1000BBC22 /* RollbarDeploys in Frameworks */ = {isa = PBXBuildFile; productRef = 55FD0710247860F1000BBC22 /* RollbarDeploys */; };
55FD07142478614B000BBC22 /* RollbarDeploysDemoClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 55FD07132478614B000BBC22 /* RollbarDeploysDemoClient.m */; };
/* End PBXBuildFile section */
Expand All @@ -40,8 +38,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
55A02A60259AAAE40071D60D /* RollbarPLCrashReporter in Frameworks */,
55684F5A2553981600F82F34 /* RollbarKSCrash in Frameworks */,
55FD0711247860F1000BBC22 /* RollbarDeploys in Frameworks */,
5547273924903EB7005018BD /* RollbarNotifier in Frameworks */,
55847E682655C2990062C242 /* RollbarAUL in Frameworks */,
Expand Down Expand Up @@ -112,8 +108,6 @@
packageProductDependencies = (
55FD0710247860F1000BBC22 /* RollbarDeploys */,
5547273824903EB7005018BD /* RollbarNotifier */,
55684F592553981600F82F34 /* RollbarKSCrash */,
55A02A5F259AAAE40071D60D /* RollbarPLCrashReporter */,
55847E672655C2990062C242 /* RollbarAUL */,
);
productName = macosAppObjC;
Expand All @@ -126,7 +120,7 @@
55759A612477560D00ED3F04 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1200;
LastUpgradeCheck = 1420;
ORGANIZATIONNAME = "Andrey Kornich (Wide Spectrum Computing LLC)";
TargetAttributes = {
55759A682477560D00ED3F04 = {
Expand Down Expand Up @@ -224,6 +218,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -283,6 +278,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -309,6 +305,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = LDX6L68VZJ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = macosAppObjC/Info.plist;
Expand All @@ -329,6 +326,7 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = LDX6L68VZJ;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = macosAppObjC/Info.plist;
Expand Down Expand Up @@ -369,18 +367,10 @@
isa = XCSwiftPackageProductDependency;
productName = RollbarNotifier;
};
55684F592553981600F82F34 /* RollbarKSCrash */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarKSCrash;
};
55847E672655C2990062C242 /* RollbarAUL */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarAUL;
};
55A02A5F259AAAE40071D60D /* RollbarPLCrashReporter */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarPLCrashReporter;
};
55FD0710247860F1000BBC22 /* RollbarDeploys */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarDeploys;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1310"
LastUpgradeVersion = "1420"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
10 changes: 1 addition & 9 deletions Demos/macosAppObjC/macosAppObjC/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

@import RollbarNotifier;
@import RollbarAUL;
@import RollbarKSCrash;
@import RollbarPLCrashReporter;

static NSString * const ROLLBAR_DEMO_PAYLOADS_ACCESS_TOKEN = @"09da180aba21479e9ed3d91e0b8d58d6";
static NSString * const ROLLBAR_DEMO_DEPLOYS_WRITE_ACCESS_TOKEN = @"efdc4b85d66045f293a7f9e99c732f61";
Expand Down Expand Up @@ -91,14 +89,8 @@ - (void)initRollbar {
//[RollbarAulStoreMonitor.sharedInstance configureRollbarLogger:Rollbar.currentLogger];
[RollbarAulStoreMonitor.sharedInstance start];

// optional crash reporter:
id<RollbarCrashCollector> crashCollector =
//nil;
//[[RollbarKSCrashCollector alloc] init];
[[RollbarPLCrashCollector alloc] init];

// init Rollbar shared instance:
[Rollbar initWithConfiguration:config crashCollector:crashCollector];
[Rollbar initWithConfiguration:config];

[Rollbar infoMessage:@"Rollbar is up and running! Enjoy your remote error and log monitoring..."];
}
Expand Down
24 changes: 7 additions & 17 deletions Demos/macosAppSwift/macosAppSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
55098C6925FA93110045C180 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 55098C6825FA93110045C180 /* Assets.xcassets */; };
55098C6C25FA93110045C180 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 55098C6B25FA93110045C180 /* Preview Assets.xcassets */; };
552689F12657381B004D6036 /* RollbarAUL in Frameworks */ = {isa = PBXBuildFile; productRef = 552689F02657381B004D6036 /* RollbarAUL */; };
552689F326573831004D6036 /* RollbarPLCrashReporter in Frameworks */ = {isa = PBXBuildFile; productRef = 552689F226573831004D6036 /* RollbarPLCrashReporter */; };
5544A01F25FB074300C710A1 /* RollbarCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 5544A01E25FB074300C710A1 /* RollbarCommon */; };
5544A02125FB074300C710A1 /* RollbarNotifier in Frameworks */ = {isa = PBXBuildFile; productRef = 5544A02025FB074300C710A1 /* RollbarNotifier */; };
5544A02325FB074300C710A1 /* RollbarSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 5544A02225FB074300C710A1 /* RollbarSwift */; };
/* End PBXBuildFile section */
Expand All @@ -33,9 +31,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5544A01F25FB074300C710A1 /* RollbarCommon in Frameworks */,
5544A02125FB074300C710A1 /* RollbarNotifier in Frameworks */,
552689F326573831004D6036 /* RollbarPLCrashReporter in Frameworks */,
552689F12657381B004D6036 /* RollbarAUL in Frameworks */,
5544A02325FB074300C710A1 /* RollbarSwift in Frameworks */,
);
Expand Down Expand Up @@ -106,11 +102,9 @@
);
name = macosAppSwift;
packageProductDependencies = (
5544A01E25FB074300C710A1 /* RollbarCommon */,
5544A02025FB074300C710A1 /* RollbarNotifier */,
5544A02225FB074300C710A1 /* RollbarSwift */,
552689F02657381B004D6036 /* RollbarAUL */,
552689F226573831004D6036 /* RollbarPLCrashReporter */,
);
productName = macosAppSwift;
productReference = 55098C6125FA930D0045C180 /* macosAppSwift.app */;
Expand All @@ -123,7 +117,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1240;
LastUpgradeCheck = 1240;
LastUpgradeCheck = 1420;
TargetAttributes = {
55098C6025FA930D0045C180 = {
CreatedOnToolsVersion = 12.4;
Expand Down Expand Up @@ -207,6 +201,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand Down Expand Up @@ -268,6 +263,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -297,14 +293,15 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"macosAppSwift/Preview Content\"";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = macosAppSwift/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.macosAppSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -320,14 +317,15 @@
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"macosAppSwift/Preview Content\"";
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = macosAppSwift/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = com.rollbar.macosAppSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -362,14 +360,6 @@
isa = XCSwiftPackageProductDependency;
productName = RollbarAUL;
};
552689F226573831004D6036 /* RollbarPLCrashReporter */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarPLCrashReporter;
};
5544A01E25FB074300C710A1 /* RollbarCommon */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarCommon;
};
5544A02025FB074300C710A1 /* RollbarNotifier */ = {
isa = XCSwiftPackageProductDependency;
productName = RollbarNotifier;
Expand Down
Loading