skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Sentry SDK update to v5

Browse Source
This commit is contained in:
Maarten Billemont
2020-04-04 19:50:37 -04:00
parent 0405c1776c
commit b118bc4e9b
6 changed files with 83 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
platform-darwin/Source/iOS/MPiOSAppDelegate.m
View File

@@ -83,42 +83,45 @@ void mpw_log_sink_pearl(const MPLogEvent *record) {
@try {
// Sentry
SentryClient.sharedClient = [[SentryClient alloc] initWithDsn:decrypt( sentryDSN ) didFailWithError:nil];
[SentrySDK initWithOptions:@{
@"dsn" : decrypt( sentryDSN ),
#ifdef DEBUG
SentryClient.sharedClient.environment = @"Development";
@"debug" : @(YES),
@"environment": @"Development",
#elif PUBLIC
SentryClient.sharedClient.environment = @"Public";
@"debug" : @(NO),
@"environment": @"Public",
#else
SentryClient.sharedClient.environment = @"Private";
@"debug" : @(NO),
@"environment": @"Private",
#endif
SentryClient.sharedClient.enabled = [MPiOSConfig get].sendInfo;
[SentryClient.sharedClient enableAutomaticBreadcrumbTracking];
[SentryClient.sharedClient startCrashHandlerWithError:nil];
@"enabled" : [MPiOSConfig get].sendInfo,
}];
[[PearlLogger get] registerListener:^BOOL(PearlLogMessage *message) {
PearlLogLevel level = PearlLogLevelWarn;
if ([[MPConfig get].sendInfo boolValue])
level = PearlLogLevelDebug;
if (message.level >= level) {
SentrySeverity sentryLevel = kSentrySeverityInfo;
SentryLevel sentryLevel = kSentryLevelInfo;
switch (message.level) {
case PearlLogLevelTrace:
sentryLevel = kSentrySeverityDebug;
sentryLevel = kSentryLevelNone;
break;
case PearlLogLevelDebug:
sentryLevel = kSentrySeverityDebug;
sentryLevel = kSentryLevelDebug;
break;
case PearlLogLevelInfo:
sentryLevel = kSentrySeverityInfo;
sentryLevel = kSentryLevelInfo;
break;
case PearlLogLevelWarn:
sentryLevel = kSentrySeverityWarning;
sentryLevel = kSentryLevelWarning;
break;
case PearlLogLevelError:
sentryLevel = kSentrySeverityError;
sentryLevel = kSentryLevelError;
break;
case PearlLogLevelFatal:
sentryLevel = kSentrySeverityFatal;
sentryLevel = kSentryLevelFatal;
break;
}
SentryBreadcrumb *breadcrumb = [[SentryBreadcrumb alloc] initWithLevel:sentryLevel category:@"Pearl"];
@@ -126,7 +129,7 @@ void mpw_log_sink_pearl(const MPLogEvent *record) {
breadcrumb.message = message.message;
breadcrumb.timestamp = message.occurrence;
breadcrumb.data = @{ @"file": message.fileName, @"line": @(message.lineNumber), @"function": message.function };
[SentryClient.sharedClient.breadcrumbs addBreadcrumb:breadcrumb];
[SentrySDK addBreadcrumb:breadcrumb];
}
return YES;
@@ -716,13 +719,11 @@ void mpw_log_sink_pearl(const MPLogEvent *record) {
#else
prefs[@"reviewedVersion"] = @(YES);
#endif
PearlMainQueueOperation( ^{
if (![[SentryClient.sharedClient.extra dictionaryWithValuesForKeys:prefs.allKeys] isEqualToDictionary:prefs]) {
NSMutableDictionary *extra = [SentryClient.sharedClient.extra mutableCopy]?: [NSMutableDictionary dictionary];
[extra addEntriesFromDictionary:prefs];
SentryClient.sharedClient.extra = extra;
}
} );
[SentrySDK configureScope:^(SentryScope *scope) {
for (NSString *pref in prefs.allKeys)
[scope setExtraValue:prefs[pref] forKey:pref];
}];
}
else {
[Countly.sharedInstance cancelConsentForAllFeatures];