Merge pull request #97 from getsentry/feature/too-many-requests

Add rate limiting for requests

Author: HazAT

SentrySwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SentrySwift"
-  s.version      = "1.3.1"
+  s.version      = "1.3.2"
   s.summary      = "Swift client for Sentry"
   s.homepage     = "https://github.com/getsentry/sentry-swift"
   s.license      = "mit"

SentrySwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.1</string>
+	<string>1.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

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/EventOffline.swift

@@ -36,10 +36,18 @@ extension SentryClient {
     public func savedEvents() -> [SavedEvent] {
         do {
             guard let path = directory() else { return [] }
+            let now = NSDate().timeIntervalSince1970
 
             #if swift(>=3.0)
                 return try FileManager.default
                     .contentsOfDirectory(atPath: path)
+                    .filter { fileName in
+                        let splitName = fileName.characters.split { $0 == "-" }.map(String.init)
+                        guard let storedTime = Double(splitName[0]) else {
+                            return true
+                        }
+                        return now > storedTime
+                    }
                     .flatMap { fileName in
                         let absolutePath: String = (path as NSString).appendingPathComponent(fileName)
                         guard let data = NSData(contentsOfFile: absolutePath) else { return nil }
@@ -56,10 +64,17 @@ extension SentryClient {
             #else
                 return try NSFileManager.defaultManager()
                     .contentsOfDirectoryAtPath(path)
+                    .filter { fileName in
+                        let splitName = fileName.characters.split { $0 == "-" }.map(String.init)
+                        guard let storedTime = Double(splitName[0]) else {
+                            return true
+                        }
+                        return now > storedTime
+                    }
                     .flatMap { fileName in
                         let absolutePath: String = (path as NSString).stringByAppendingPathComponent(fileName)
                         guard let data = NSData(contentsOfFile: absolutePath) else { return nil }
-                
+                        
                         return (data, {
                             do {
                                 try NSFileManager.defaultManager().removeItemAtPath(absolutePath)
@@ -110,13 +125,14 @@ extension SentryClient {
      */
     private func writePath(_ event: Event) throws -> String? {
         guard let sentryDir = directory() else { return nil }
+        let date = NSDate().timeIntervalSince1970 + 60 + Double(arc4random_uniform(10) + 1)
 
         #if swift(>=3.0)
             try FileManager.default.createDirectory(atPath: sentryDir, withIntermediateDirectories: true, attributes: nil)
-            return (sentryDir as NSString).appendingPathComponent(event.eventID)
+            return (sentryDir as NSString).appendingPathComponent("\(date)-\(event.eventID)")
         #else
             try NSFileManager.defaultManager().createDirectoryAtPath(sentryDir, withIntermediateDirectories: true, attributes: nil)
-            return (sentryDir as NSString).stringByAppendingPathComponent(event.eventID)
+            return (sentryDir as NSString).stringByAppendingPathComponent("\(date)-\(event.eventID)")
         #endif
     }
 
@@ -127,14 +143,15 @@ extension SentryClient {
      - Returns: Serialized string
      */
     private func serializedString(_ event: Event) throws -> String? {
+        let serializedEvent = event.serialized
         #if swift(>=3.0)
-            if JSONSerialization.isValidJSONObject(event.serialized) {
-                let data: NSData = try JSONSerialization.data(withJSONObject: event.serialized, options: []) as NSData
+            if JSONSerialization.isValidJSONObject(serializedEvent) {
+                let data: NSData = try JSONSerialization.data(withJSONObject: serializedEvent, options: []) as NSData
                 return String(data: data as Data, encoding: String.Encoding.utf8)
             }
         #else
-            if NSJSONSerialization.isValidJSONObject(event.serialized) {
-                let data: NSData = try NSJSONSerialization.dataWithJSONObject(event.serialized, options: [])
+            if NSJSONSerialization.isValidJSONObject(serializedEvent) {
+                let data: NSData = try NSJSONSerialization.dataWithJSONObject(serializedEvent, options: [])
                 return String(data: data, encoding: NSUTF8StringEncoding)
             }
         #endif

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 {
@@ -68,7 +69,7 @@ internal enum SentryError: Error {
     // MARK: - Enums
 
     internal struct Info {
-        static let version: String = "1.3.1"
+        static let version: String = "1.3.2"
         static let sentryVersion: Int = 7
     }
 
@@ -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,7 +20,7 @@ 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 {
@@ -134,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)
@@ -150,8 +150,6 @@ enum SentryEndpoint: Endpoint {
         configureRequest(dsn: dsn, request: request)
 
         #if swift(>=3.0)
-            let config = URLSessionConfiguration.default
-            let session = URLSession(configuration: config)
             session.dataTask(with: request as URLRequest) { data, response, error in
                 var success = false
 
@@ -171,8 +169,6 @@ enum SentryEndpoint: Endpoint {
                 finished?(success)
             }.resume()
         #else
-            let config = NSURLSessionConfiguration.defaultSessionConfiguration()
-            let session = NSURLSession(configuration: config)
             session.dataTaskWithRequest(request) { data, response, error in
                 var success = false
 

docs/sentry-doc-config.json

@@ -14,6 +14,6 @@
     }
   },
   "vars": {
-    "SENTRY_SWIFT_TAG": "1.3.1"
+    "SENTRY_SWIFT_TAG": "1.3.2"
   }
 }