libhoney 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709e34b6d6a1f0c9c1cd4e14898d4921405fa924
-  data.tar.gz: c8f47ea904509f3b4ba25e54eaeb3bcf530415f3
+  metadata.gz: 3090756dce154f139d8a4c5598ba7a64be9c95e6
+  data.tar.gz: 6ad36413896edd22a0175026cd5519d27c4389a6
 SHA512:
-  metadata.gz: 676446ff6c3daaf0520957b091939e5ab4c8bb174653fa00f4b22f7147795b0cd25f99639672485a68c6356998ac89f41f7864298062dc23cbe926c4a14c0e68
-  data.tar.gz: 789b3e21e993a2fa70750f6c7eb056af092068069fbd740ce0e0f466298a41bcd18de9cb390cff5f1b0b656f819efd71db1a6bb6a15ff32d6129b977d194b638
+  metadata.gz: c76eb3a559bb39e98f86e99369314a649012e651d2e0b576726089ce16646107a24b56504823c62948dfe2b60d6792aad24ab784a966b8a4d65f109c52ae4571
+  data.tar.gz: 23940a295a83f270a249d9a7d6278fbccd71f9998dd59abf1151f33956794fe3fe4c417ce24cbef7c450930c9bda4e24364664cb3a6205e2bf892369de591a64

data/lib/libhoney/transmission.rb

@@ -50,30 +50,21 @@ module Libhoney
 
         before = Time.now
 
-        conn = Faraday.new(:url => e.api_host) do |faraday|
-          faraday.request  :json
-          faraday.adapter  :net_http_persistent
-        end
-
-        resp = conn.post do |req|
-          req.url '/1/events/' + e.dataset
-          req.headers = {
-            'User-Agent' => "libhoney-rb/#{VERSION}",
-            'Content-Type' => 'application/json',
-            'X-Honeycomb-Team' => e.writekey,
-            'X-Honeycomb-SampleRate' => e.sample_rate.to_s,
-            'X-Event-Time' => e.timestamp.iso8601
-          }
-          req.body = e.data
+        begin
+          resp = do_send(e)
+
+          response = Response.new(:status_code => resp.status)
+        rescue Exception => error
+          # catch a broader swath of exceptions than is usually good practice,
+          # because this is effectively the top-level exception handler for the
+          # sender threads, and we don't want those threads to die (leaving
+          # nothing consuming the queue).
+          response = Response.new(:error => error)
+        ensure
+          response.duration = Time.now - before
+          response.metadata = e.metadata
         end
 
-        # TODO handle faraday errors
-
-        after = Time.now
-
-        response = Response.new(:duration => after - before,
-                                :status_code => resp.status,
-                                :metadata => e.metadata)
         begin
           @responses.enq(response, !@block_on_responses)
         rescue ThreadError
@@ -98,5 +89,29 @@ module Libhoney
 
       0
     end
+
+    private
+    def do_send(event)
+      conn = Faraday.new(:url => event.api_host) do |faraday|
+        faraday.request  :json
+        faraday.adapter  :net_http_persistent
+      end
+
+      resp = conn.post do |req|
+        req.url '/1/events/' + event.dataset
+        req.headers = {
+          'User-Agent' => "libhoney-rb/#{VERSION}",
+          'Content-Type' => 'application/json',
+          'X-Honeycomb-Team' => event.writekey,
+          'X-Honeycomb-SampleRate' => event.sample_rate.to_s,
+          'X-Event-Time' => event.timestamp.iso8601
+        }
+        req.body = event.data
+      end
+
+      # TODO handle faraday errors
+
+      resp
+    end
   end
 end

data/lib/libhoney/version.rb

@@ -1,3 +1,3 @@
 module Libhoney
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libhoney
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - The Honeycomb.io Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler