From f9e8c4280caea4cab82548259193a44641fb8ca2 Mon Sep 17 00:00:00 2001 From: Andrey Kornich Date: Wed, 2 Dec 2020 16:37:51 -0800 Subject: [PATCH] fix: resolve #14 --- .../xcschemes/iosAppObjC.xcscheme | 78 +++++++++++++++++++ RollbarCommon.podspec | 2 +- .../xcschemes/RollbarCommon.xcscheme | 77 ++++++++++++++++++ RollbarDeploys.podspec | 2 +- RollbarKSCrash.podspec | 2 +- RollbarNotifier.podspec | 2 +- .../RollbarNotifier/DTOs/RollbarConfig.m | 2 +- .../Sources/RollbarNotifier/Rollbar.m | 8 ++ .../RollbarNotifierTests-ObjC/RollbarTests.m | 25 +++--- RollbarSDK.podspec | 2 +- 10 files changed, 183 insertions(+), 17 deletions(-) create mode 100644 Demos/iosAppObjC/iosAppObjC.xcodeproj/xcshareddata/xcschemes/iosAppObjC.xcscheme create mode 100644 RollbarCommon/.swiftpm/xcode/xcshareddata/xcschemes/RollbarCommon.xcscheme diff --git a/Demos/iosAppObjC/iosAppObjC.xcodeproj/xcshareddata/xcschemes/iosAppObjC.xcscheme b/Demos/iosAppObjC/iosAppObjC.xcodeproj/xcshareddata/xcschemes/iosAppObjC.xcscheme new file mode 100644 index 00000000..ee8fa7ea --- /dev/null +++ b/Demos/iosAppObjC/iosAppObjC.xcodeproj/xcshareddata/xcschemes/iosAppObjC.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RollbarCommon.podspec b/RollbarCommon.podspec index b714f07f..1fb518a8 100644 --- a/RollbarCommon.podspec +++ b/RollbarCommon.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha26" + s.version = "2.0.0-alpha27" s.name = "RollbarCommon" s.summary = "Application or client side SDK for accessing the Rollbar API Server." s.description = <<-DESC diff --git a/RollbarCommon/.swiftpm/xcode/xcshareddata/xcschemes/RollbarCommon.xcscheme b/RollbarCommon/.swiftpm/xcode/xcshareddata/xcschemes/RollbarCommon.xcscheme new file mode 100644 index 00000000..9bc0e5e1 --- /dev/null +++ b/RollbarCommon/.swiftpm/xcode/xcshareddata/xcschemes/RollbarCommon.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RollbarDeploys.podspec b/RollbarDeploys.podspec index 82d94c56..d581da67 100644 --- a/RollbarDeploys.podspec +++ b/RollbarDeploys.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha26" + s.version = "2.0.0-alpha27" s.name = "RollbarDeploys" s.summary = "Application or client side SDK for accessing the Rollbar API Server." s.description = <<-DESC diff --git a/RollbarKSCrash.podspec b/RollbarKSCrash.podspec index 7a301a77..3944bfce 100644 --- a/RollbarKSCrash.podspec +++ b/RollbarKSCrash.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha26" + s.version = "2.0.0-alpha27" s.name = "RollbarKSCrash" s.summary = "Application or client side SDK for accessing the Rollbar API Server." s.description = <<-DESC diff --git a/RollbarNotifier.podspec b/RollbarNotifier.podspec index 47a5d19b..bfc4c26d 100644 --- a/RollbarNotifier.podspec +++ b/RollbarNotifier.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| - s.version = "2.0.0-alpha26" + s.version = "2.0.0-alpha27" s.name = "RollbarNotifier" s.summary = "Application or client side SDK for accessing the Rollbar API Server." s.description = <<-DESC diff --git a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m index 7b9c3f54..d55ba80b 100644 --- a/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m +++ b/RollbarNotifier/Sources/RollbarNotifier/DTOs/RollbarConfig.m @@ -22,7 +22,7 @@ #pragma mark - constants -static NSString * const NOTIFIER_VERSION = @"2.0.0-alpha26"; +static NSString * const NOTIFIER_VERSION = @"2.0.0-alpha27"; static NSString * const NOTIFIER_NAME = @"rollbar-apple"; diff --git a/RollbarNotifier/Sources/RollbarNotifier/Rollbar.m b/RollbarNotifier/Sources/RollbarNotifier/Rollbar.m index ddf728b7..5fa18056 100644 --- a/RollbarNotifier/Sources/RollbarNotifier/Rollbar.m +++ b/RollbarNotifier/Sources/RollbarNotifier/Rollbar.m @@ -6,6 +6,7 @@ #import "RollbarLogger.h" #import "RollbarConfig.h" #import "RollbarDestination.h" +#import "RollbarLoggingOptions.h" #import "RollbarTelemetryOptions.h" #import "RollbarTelemetryOptionsObserver.h" #import "RollbarScrubbingOptions.h" @@ -92,13 +93,20 @@ + (void)updateConfiguration:(RollbarConfig *)configuration { // [telemetryOptionsObserver unregisterAsObserverForTelemetryOptions:logger.configuration.telemetry]; // } + NSUInteger oldReportingRate = 0; + if (logger) { + oldReportingRate = logger.configuration.loggingOptions.maximumReportsPerMinute; [logger updateConfiguration:configuration]; } else { logger = [[RollbarLogger alloc] initWithConfiguration:configuration]; } + if (oldReportingRate != configuration.loggingOptions.maximumReportsPerMinute) { + [logger updateReportingRate:configuration.loggingOptions.maximumReportsPerMinute]; + } + // if (logger && logger.configuration && logger.configuration.telemetry) { // [telemetryOptionsObserver registerAsObserverForTelemetryOptions:logger.configuration.telemetry]; // } diff --git a/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/RollbarTests.m b/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/RollbarTests.m index 6e98d937..fd1fe03b 100644 --- a/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/RollbarTests.m +++ b/RollbarNotifier/Tests/RollbarNotifierTests-ObjC/RollbarTests.m @@ -15,22 +15,25 @@ @interface RollbarTests : XCTestCase @implementation RollbarTests - (void)setUp { + [super setUp]; + RollbarClearLogFile(); + if (!Rollbar.currentConfiguration) { - //[Rollbar initWithAccessToken:@""]; - [Rollbar initWithAccessToken:@"2ffc7997ed864dda94f63e7b7daae0f3"]; - Rollbar.currentConfiguration.destination.accessToken = @"2ffc7997ed864dda94f63e7b7daae0f3"; - Rollbar.currentConfiguration.destination.environment = @"unit-tests"; - Rollbar.currentConfiguration.developerOptions.transmit = YES; - Rollbar.currentConfiguration.developerOptions.logPayload = YES; - Rollbar.currentConfiguration.loggingOptions.maximumReportsPerMinute = 5000; + + RollbarConfig *config = [[RollbarConfig alloc] init]; + config.destination.accessToken = @"2ffc7997ed864dda94f63e7b7daae0f3"; + config.destination.environment = @"unit-tests"; + config.developerOptions.transmit = YES; + config.developerOptions.logPayload = YES; + config.loggingOptions.maximumReportsPerMinute = 5000; // for the stress test specifically: - Rollbar.currentConfiguration.telemetry.enabled = YES; - Rollbar.currentConfiguration.loggingOptions.captureIp = RollbarCaptureIpType_Full; - - id config = Rollbar.currentConfiguration; + config.telemetry.enabled = YES; + config.loggingOptions.captureIp = RollbarCaptureIpType_Full; NSLog(@"%@", config) + + [Rollbar initWithConfiguration:config]; } } diff --git a/RollbarSDK.podspec b/RollbarSDK.podspec index 335316ca..3619c45a 100644 --- a/RollbarSDK.podspec +++ b/RollbarSDK.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |sdk| # Rollbar SDK: # ============ - sdk.version = "2.0.0-alpha26" + sdk.version = "2.0.0-alpha27" sdk.name = "RollbarSDK" sdk.summary = "Application or client side SDK for accessing the Rollbar API Server." sdk.description = <<-DESC