Only clear store if breadcrumbs exsist, Inject session in SentryEndpoint

Author: HazAT

Sources/BreadcrumbStore.swift

@@ -38,8 +38,9 @@ public final class BreadcrumbStore: NSObject {
         storeUpdated?(self)
     }
 
-    /// Clears the store for given type or all if none specified
+    /// Clears the store if crumbs exist
     public func clear() {
+        guard crumbs.count > 0 else { return }
         crumbs.removeAll()
         storeUpdated?(self)
     }

Sources/Request.swift

@@ -17,9 +17,9 @@ extension SentryClient {
      */
     internal func sendEvent(_ event: Event, finished: SentryEndpointRequestFinished? = nil) {
         #if swift(>=3.0)
-            SentryEndpoint.store(event: event).send(dsn: dsn, finished: finished)
+            SentryEndpoint.store(event: event).send(session: session, dsn: dsn, finished: finished)
         #else
-            SentryEndpoint.store(event: event).send(dsn, finished: finished)
+            SentryEndpoint.store(event: event).send(session, dsn: dsn, finished: finished)
         #endif
     }
 
@@ -30,9 +30,9 @@ extension SentryClient {
      */
     internal func sendEvent(_ event: SavedEvent, finished: SentryEndpointRequestFinished? = nil) {
         #if swift(>=3.0)
-            SentryEndpoint.storeSavedEvent(event: event).send(dsn: dsn, finished: finished)
+            SentryEndpoint.storeSavedEvent(event: event).send(session: session, dsn: dsn, finished: finished)
         #else
-            SentryEndpoint.storeSavedEvent(event: event).send(dsn, finished: finished)
+            SentryEndpoint.storeSavedEvent(event: event).send(session, dsn: dsn, finished: finished)
         #endif
     }
 
@@ -46,12 +46,12 @@ extension SentryClient {
             userFeedback.event = lastSuccessfullySentEvent
         }
         #if swift(>=3.0)
-            SentryEndpoint.userFeedback(userFeedback: userFeedback).send(dsn: dsn) { [weak self] success in
+            SentryEndpoint.userFeedback(userFeedback: userFeedback).send(session: session, dsn: dsn) { [weak self] success in
                 self?.sentUserFeedback()
                 finished?(success)
             }
         #else
-            SentryEndpoint.userFeedback(userFeedback: userFeedback).send(dsn) { [weak self] success in
+            SentryEndpoint.userFeedback(userFeedback: userFeedback).send(session, dsn: dsn) { [weak self] success in
                 self?.sentUserFeedback()
                 finished?(success)
             }

Sources/Sentry.swift

@@ -39,6 +39,7 @@ import KSCrash
     internal typealias JSONSerialization = NSJSONSerialization
     internal typealias Bundle = NSBundle
     internal typealias URLQueryItem = NSURLQueryItem
+    internal typealias URLSession = NSURLSession
 #endif
 
 internal enum SentryError: Error {
@@ -79,6 +80,7 @@ internal enum SentryError: Error {
     // MARK: - Attributes
 
     internal let dsn: DSN
+    internal let session: URLSession
     internal(set) var crashHandler: CrashHandler? {
         didSet {
             crashHandler?.startCrashReporting()
@@ -117,7 +119,7 @@ internal enum SentryError: Error {
                 }
             #else
                 dispatch_async(dispatch_get_main_queue(), {
-                self.delegate?.userFeedbackReady()
+                    self.delegate?.userFeedbackReady()
                 })
             #endif
         }
@@ -149,8 +151,10 @@ internal enum SentryError: Error {
 
         #if swift(>=3.0)
             self.releaseVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+            self.session = URLSession(configuration: URLSessionConfiguration.ephemeral)
         #else
             self.releaseVersion = NSBundle.mainBundle().infoDictionary?["CFBundleShortVersionString"] as? String
+            self.session = NSURLSession(configuration: NSURLSessionConfiguration.ephemeralSessionConfiguration())
         #endif
 
         super.init()
@@ -208,11 +212,11 @@ internal enum SentryError: Error {
     /// Reports given event to Sentry
     @objc public func captureEvent(_ event: Event) {
         #if swift(>=3.0)
-            DispatchQueue(label: SentryClient.queueName).sync {
+            DispatchQueue(label: SentryClient.queueName).async {
                 self.captureEvent(event, useClientProperties: true)
             }
         #else
-            dispatch_sync(dispatch_queue_create(SentryClient.queueName, nil), {
+            dispatch_async(dispatch_queue_create(SentryClient.queueName, nil), {
                 self.captureEvent(event, useClientProperties: true)
             })
         #endif
@@ -309,7 +313,7 @@ internal enum SentryError: Error {
                 event.extra.unionInPlace(extra)
             }
         }
-        
+
         if nil == event.breadcrumbsSerialized { // we only want to set the breadcrumbs if there are non in the event
             event.breadcrumbsSerialized = breadcrumbs.serialized
         }

Sources/SentryEndpoint.swift

@@ -20,15 +20,10 @@ protocol Endpoint {
     var httpMethod: HttpMethod { get }
     func route(dsn dsn: DSN) -> NSURL?
     var payload: NSData { get }
-    func send(dsn: DSN, finished: SentryEndpointRequestFinished?)
+    func send(session: URLSession, dsn: DSN, finished: SentryEndpointRequestFinished?)
 }
 
 enum SentryEndpoint: Endpoint {
-    #if swift(>=3.0)
-        static let session = URLSession(configuration: URLSessionConfiguration.ephemeral)
-    #else
-        static let session = NSURLSession(configuration: NSURLSessionConfiguration.ephemeralSessionConfiguration())
-    #endif
 
     case store(event: Event)
     case storeSavedEvent(event: SavedEvent)
@@ -139,7 +134,7 @@ enum SentryEndpoint: Endpoint {
         }
     }
 
-    func send(dsn: DSN, finished: SentryEndpointRequestFinished? = nil) {
+    func send(session: URLSession, dsn: DSN, finished: SentryEndpointRequestFinished? = nil) {
         guard let url = route(dsn: dsn) else {
             SentryLog.Error.log("Cannot find route for \(self)")
             finished?(false)
@@ -155,7 +150,7 @@ enum SentryEndpoint: Endpoint {
         configureRequest(dsn: dsn, request: request)
 
         #if swift(>=3.0)
-            SentryEndpoint.session.dataTask(with: request as URLRequest) { data, response, error in
+            session.dataTask(with: request as URLRequest) { data, response, error in
                 var success = false
 
                 // Returns success if we have data and 200 response code
@@ -174,7 +169,7 @@ enum SentryEndpoint: Endpoint {
                 finished?(success)
             }.resume()
         #else
-            SentryEndpoint.session.dataTaskWithRequest(request) { data, response, error in
+            session.dataTaskWithRequest(request) { data, response, error in
                 var success = false
 
                 // Returns success if we have data and 200 response code