Merge pull request #117 from smartmobilefactory/update-sentry-appcenter

update Sentry to `6.1.3` and AppCenter to `4.1.0`

Author: kmeinh

AppCenter/AppCenterSDK+HiDrive.swift

@@ -41,7 +41,7 @@ class AppCenterSDK: NSObject {
 	// MARK: - Public properties
 
 	static var wasInitialized				: Bool {
-		return MSAppCenter.isConfigured()
+		return AppCenter.isConfigured
 	}
 
 	// MARK: - Methods
@@ -62,27 +62,27 @@ class AppCenterSDK: NSObject {
 
 		#if !os(macOS)
 		if (configuration.isDistributionEnabled == true) {
-			services.append(MSDistribute.self)
+			services.append(Distribute.self)
 		}
 		#endif
 
 		if (configuration.isCrashReportEnabled == true) {
-			services.append(MSCrashes.self)
+			services.append(Crashes.self)
 		}
 
 		guard (services.isEmpty == false) else {
 			return
 		}
 
-		MSAppCenter.start(configuration.appSecret, withServices: services)
-		MSCrashes.setEnabled(configuration.isCrashReportEnabled)
-		MSCrashes.setDelegate(self.delegate)
+		AppCenter.start(withAppSecret: configuration.appSecret, services: services)
+		Crashes.enabled = configuration.isCrashReportEnabled
+		Crashes.delegate = self.delegate
 	}
 
 	#if !os(macOS)
 	/// Returns True, if and only if the Service got started and is enabled.
 	static var isDistributionEnabled: Bool {
-		return MSDistribute.isEnabled()
+		return Distribute.enabled
 	}
 
 	/// Will enable or disable the Distribution Feature of AppCenter
@@ -96,13 +96,13 @@ class AppCenterSDK: NSObject {
 	///
 	/// - Parameter enabled: Enable or Disable Distribtion
 	static func enableDistribution(enabled: Bool = true) {
-		MSDistribute.setEnabled(enabled)
+		Distribute.enabled = enabled
 	}
 	#endif
 
 	/// Returns True, if and only if Crash Reporting is enabled.
 	static var isCrashReportingEnabled: Bool {
-		return MSCrashes.isEnabled()
+		return Crashes.enabled
 	}
 
 	/// Will enable or disable the sending od crash reports to AppCenter
@@ -116,13 +116,13 @@ class AppCenterSDK: NSObject {
 	///
 	/// - Parameter enabled: Enable or Disable Distribtion
 	static func enableCrashReporting(enabled: Bool = true) {
-		MSCrashes.setEnabled(enabled)
+		Crashes.enabled = enabled
 	}
 
 	/// This will create a `fatalError` to crash the app.
 	static func performTestCrash() {
 
-		MSCrashes.generateTestCrash()
+		Crashes.generateTestCrash()
 	}
 }
 
@@ -172,20 +172,20 @@ extension AppCenterSDK {
 	}
 }
 
-private class AppCenterSDKDelegate	: NSObject, MSCrashesDelegate {
+private class AppCenterSDKDelegate	: NSObject, CrashesDelegate {
 
 	private var isLogUploadEnabled	: Bool
 
 	init(isLogUploadEnabled	: Bool) {
 		self.isLogUploadEnabled = isLogUploadEnabled
 	}
 
-	func attachments(with crashes: MSCrashes!, for errorReport: MSErrorReport!) -> [MSErrorAttachmentLog]! {
+	func attachments(with crashes: Crashes, for errorReport: ErrorReport) -> [ErrorAttachmentLog]? {
 		guard (self.isLogUploadEnabled == true) else {
 			return []
 		}
 
-		return [MSErrorAttachmentLog.attachment(withText: self.applicationLog, filename: AppCenterConstants.crashLogFileName)]
+		return [ErrorAttachmentLog.attachment(withText: self.applicationLog, filename: AppCenterConstants.crashLogFileName)]
 	}
 
 	private var applicationLog: String {

AppCenter/AppCenterSDK+SMFLogger.swift

@@ -30,7 +30,7 @@ class AppCenterSDK: NSObject {
 	// MARK: - Public properties
 
 	static var wasInitialized				: Bool {
-		return MSAppCenter.isConfigured()
+		return AppCenter.isConfigured
 	}
 
 	// MARK: - Methods
@@ -45,14 +45,14 @@ class AppCenterSDK: NSObject {
 			return
 		}
 
-		let services = (configuration.isDistributionEnabled == true) ? [MSDistribute.self] : []
+		let services = (configuration.isDistributionEnabled == true) ? [Distribute.self] : []
 
-		MSAppCenter.start(configuration.appSecret, withServices: services)
+		AppCenter.start(withAppSecret: configuration.appSecret, services: services)
 	}
 
 	/// Returns True, if and only if the Service got started and is enabled.
 	static var isDistributionEnabled: Bool {
-		return MSDistribute.isEnabled()
+		return Distribute.enabled
 	}
 
 	/// Will enable or disable the Distribution Feature of AppCenter
@@ -66,7 +66,7 @@ class AppCenterSDK: NSObject {
 	///
 	/// - Parameter enabled: Enable or Disable Distribtion
 	static func enableDistribution(enabled: Bool = true) {
-		MSDistribute.setEnabled(enabled)
+		Distribute.enabled = enabled
 	}
 }
 

Sentry/SentrySDK+SMFLogger.swift

@@ -14,11 +14,11 @@ fileprivate struct SentryConstants {
 	static let smfLogUploadMaxSizeDefault	= 5000
 }
 
-class SentrySDK: NSObject {
+class SMFSentrySDK: NSObject {
 
 	// MARK: - Private static properties
 
-	fileprivate static var shared			: SentrySDK?
+	fileprivate static var shared			: SMFSentrySDK?
 
 	fileprivate static let isDebugBuild		: Bool = {
 		#if DEBUG
@@ -36,15 +36,15 @@ class SentrySDK: NSObject {
 	// MARK: - Public properties
 
 	static var wasInitialized				: Bool {
-		return (SentrySDK.shared?.isInitialized ?? false)
+		return (SMFSentrySDK.shared?.isInitialized ?? false)
 	}
 
 	// MARK: - Initialization
 
 	override init() {
 		super.init()
 
-		SentrySDK.shared = self
+		SMFSentrySDK.shared = self
 	}
 
 	// MARK: - Methods
@@ -53,38 +53,30 @@ class SentrySDK: NSObject {
 	///
 	/// - Parameters:
 	///   - configuration: Configuration object
-	static func setup(configuration: SentrySDK.Configuration) {
+	static func setup(configuration: SMFSentrySDK.Configuration) {
 		guard (self.isDebugBuild == false || configuration.enableDebug == true) else {
 			return
 		}
 
-		let instance = (self.shared ?? SentrySDK())
-
-		do {
-			Client.shared = try Client(dsn: configuration.sentryDSN)
-			Client.shared?.beforeSerializeEvent = { (event: Event) in
-				event.environment = SentrySDK.Configuration.environment
+		let instance = (self.shared ?? SMFSentrySDK())
 
+		SentrySDK.start { (options: Options) in
+			options.dsn = configuration.sentryDSN
+			options.debug = configuration.enableDebug
+			options.beforeBreadcrumb = { (event: Breadcrumb?) in
 				if
-					(event.level != .debug),
+					(event?.level != .debug),
 					(configuration.enableSMFLogUpload == true),
 					let loggerContents = Logger.logFilesContent(maxSize: configuration.smfLogUploadMaxSize) {
-					event.message = loggerContents
+					event?.message = loggerContents
 				}
-			}
 
-			if (configuration.enableBreadcrumbs == true) {
-				Client.shared?.enableAutomaticBreadcrumbTracking()
+				return event
 			}
-
-			try Client.shared?.startCrashHandler()
-
-			instance.configuration = configuration
-
-			instance.isInitialized = true
-		} catch let error {
-			Log.Channel.Manager.sentry.error("Error initialising sentry: \(error.localizedDescription)")
 		}
+
+		instance.configuration = configuration
+		instance.isInitialized = true
 	}
 
 	/// This will create a `fatalError` to crash the app.
@@ -95,7 +87,7 @@ class SentrySDK: NSObject {
 			return
 		}
 
-		Client.shared?.reportUserException("TestCrash", reason: "Only testing crashes", language: "swift", lineOfCode: "23", stackTrace: [], logAllThreads: false, terminateProgram: true)
+		SentrySDK.crash()
 		fatalError("This is a test crash to trigger a crash report in Sentry Dashboard")
 	}
 
@@ -107,7 +99,7 @@ class SentrySDK: NSObject {
 	///		- additionalData		: dictionary of key/value pairs that will apear under Additional Data in Sentry
 	///		- includeLoggerData		: if the event should also include the last part of SMFLogger
 	///		- smfLogUploadMaxSize	: The max count of characters which should be uploaded
-	static func sendEvent(title: String, message: String, additionalData: [String: Any]? = nil, includeLoggerData: Bool = true, smfLogUploadMaxSize: Int = (SentrySDK.shared?.configuration?.smfLogUploadMaxSize ?? SentryConstants.smfLogUploadMaxSizeDefault)) {
+	static func sendEvent(title: String, message: String, additionalData: [String: Any]? = nil, includeLoggerData: Bool = true, smfLogUploadMaxSize: Int = (SMFSentrySDK.shared?.configuration?.smfLogUploadMaxSize ?? SentryConstants.smfLogUploadMaxSizeDefault)) {
 		let event = Event(level: .debug)
 
 		if (additionalData != nil) {
@@ -123,13 +115,13 @@ class SentrySDK: NSObject {
 			fullMessage.append(loggerContents)
 		}
 
-		event.message = fullMessage
+		event.message = SentryMessage(formatted: fullMessage)
 
-		Client.shared?.send(event: event, completion: nil)
+		SentrySDK.capture(event: event)
 	}
 }
 
-extension SentrySDK {
+extension SMFSentrySDK {
 
 	struct Configuration {
 
@@ -177,7 +169,7 @@ extension SentrySDK {
 			self.smfLogUploadMaxSize	= smfLogUploadMaxSize
 		}
 
-		static var `default`: SentrySDK.Configuration {
+		static var `default`: SMFSentrySDK.Configuration {
 			return Configuration()
 		}
 	}