hoss-agent 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb17fe11c7d97d41c4cb2c5a701286233ea53255092a89a3924793e5d2a6a3c4
-  data.tar.gz: babeee044660be9fcb0f6c4d8a26f6204abfb2f539fa83497bac97d1b461a54b
+  metadata.gz: 1f6e25b94d999ae0da999fb7de8ca429445a27a7d87a72be82da4bfc4a367ab8
+  data.tar.gz: 6e3b46812e39dde84acd627649f2557da0019b9a406791d35c61da77ecb781b7
 SHA512:
-  metadata.gz: 70b395a9f4e36e3677bbe82148ff0a3ad13844c1a281184148ed22b5f8204414a6e22e0d27f98addeb723e68da4bcf89f97ab3da0248c6bc967baae48691b65e
-  data.tar.gz: d05143b093eab36c8f034fe9e05eae9b863b4fca370f1b7c8e04d28d3eba8a69c770f4c0ef137fedde869761401c7617a74f998caa2e91fc559ae707c44550ac
+  metadata.gz: 9a9e8e511a25e1580b32bfd63aed336be1c2a804a70d580bb36e612d72cf79f25cdeb76a16fd2d5ba6b1f60cfb2e51e15a6dd14fa83387205eb3234c3d4952e9
+  data.tar.gz: cd7c026248bd252cb8a8dfc53e72234281bc7cc1a3ea9c58e5f446ea78cc3341664e760000728c78ce2f6a7ba252b8b9eb3b44ee78a0d6a07f25cd54bcc26f13

data/lib/hoss/spies/http.rb

@@ -45,15 +45,15 @@ module Hoss
               return perform_without_apm(req, options)
             end
 
-            begin
-              Hoss.with_event do |event|
+            Hoss.with_event do |event|
+              result = nil
+              begin
                 event.request.headers['host'] = req.uri.host
                 req.headers.each {|n,v| event.request.headers[n] = v}
                 event.request.method = req.verb.to_s.upcase
                 event.request.url = req.uri.to_s
                 event.request.body = Hoss::Spies::HTTPSpy::copy_request_body(req.body)
                 event.request.received_at = DateTime.now.strftime('%Q').to_i
-                begin
                   result = perform_without_apm(req, options)
                   if result
                     event.response = Hoss::Event::Response.new
@@ -63,18 +63,18 @@ module Hoss
                     event.response.body = result.body.to_s
                   end
                   result
-                rescue HTTP::TimeoutError => e
-                  event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionTimeout)
-                  event.error.received_at = DateTime.now.strftime('%Q').to_i
-                  raise
-                rescue Exception => e
-                  event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionError)
-                  event.error.received_at = DateTime.now.strftime('%Q').to_i
-                  raise
                 end
-              end
-            rescue
-              return perform_without_apm(req, options)
+              rescue HTTP::TimeoutError => e
+                event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionTimeout)
+                event.error.received_at = DateTime.now.strftime('%Q').to_i
+                raise
+              rescue HTTP::Error => e
+                event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionError)
+                event.error.received_at = DateTime.now.strftime('%Q').to_i
+                raise
+              rescue Exception => e
+                return result unless result.nil?
+                return perform_without_apm(req, options)
             end
           end
         end

data/lib/hoss/transport/serializers/event_serializer.rb

@@ -26,8 +26,8 @@ module Hoss
           r = {
               eventId: event.id,
               request: build_request(event.request),
-              response: build_response(event.response),
           }
+          r['response'] = build_response(event.response) if event.response
           r['error'] = build_error(event.error) if event.error
           r
         end

data/lib/hoss/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module Hoss
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoss-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Cameron Cooper