hoss-agent 1.0.6 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 722e5fcda718182f47faa927fbfd9f19b96567d472eaa0f929bef3982b6024a3
-  data.tar.gz: f009f58f3659233bd2cb88670698e8cbcf382d85602abb0d898b3a49a0395d34
+  metadata.gz: f1317a4f764c2af70fb5c2637637d3f9afc06e50c0d8b5a7a06ab3eef83b995b
+  data.tar.gz: 16f7a332cf59692b9fdc2fc09b1a021f0ab755451308b2444ccf5e55006fb1a2
 SHA512:
-  metadata.gz: a9ba92e08cbfb0a6daa8fcb30b2d6dc88b37e7ea1ed426197982c0a23df7df493737925b1cc56d7c6f53baa4a72495db4b9241b6d49aa91a7c10afffdc3ddc65
-  data.tar.gz: 55b09ee50f6e2c85ba683678de3f2216ceafff367a1e6aa89526ae359ae5b565aa7565e20356ba5b3e0ea5c1b3bb27360e5b288069065aec390c468dbdfbe281
+  metadata.gz: 1bf307cabbf220bfb3a8ed8423c7ac0971e75e09939b7b03a4d6d7b5417bf40eae7495230df57980ff1218be07c2b1294c4bad201898189edb01078c98bc892b
+  data.tar.gz: df81ae88e4390fa7e860b470f19d22175d908dd1739ade15e41842aa2b1142be7303655233c38e7fe865df8d57ab386aae688e675e851614f8ef0bac6ed1c643

data/lib/hoss/config.rb

@@ -41,7 +41,7 @@ module Hoss
     option :remote_config_fetch_interval,      type: :int,    default: 300
     option :agentConfig,                       type: :dict
     option :debug,                             type: :boolean, default: ENV['HOSS_DEBUG']
-
+    option :disable_reporting,                 type: :boolean, default: ENV['HOSS_DISABLE_REPORTING'] == 'true'
 
     option :central_config,                    type: :bool,   default: true
     option :capture_body,                      type: :string, default: 'off'
@@ -109,7 +109,9 @@ module Hoss
         )
       end
 
-      warn '[HOSS] No API Key provided' unless self.api_key
+      unless self.disable_reporting.nil?
+        self.disable_reporting = self.disable_reporting == 'true' || self.disable_reporting == true
+      end
 
       yield self if block_given?
 

data/lib/hoss/spies/faraday.rb

@@ -39,38 +39,57 @@ module Hoss
           alias run_request_without_apm run_request
 
           def run_request(method, url, body, headers, &block)
-            Hoss.with_event do |event|
-              Hoss::Spies::FaradaySpy.without_net_http do
-                begin
+            result = nil
+            error_in_request = false
+            error_in_block = false
+            begin
+              Hoss.with_event do |event|
+                Hoss::Spies::FaradaySpy.without_net_http do
                   uri = URI(build_url(url))
-                  result = run_request_without_apm(method, url, body, headers) do |req|
-                    if block_given?
-                      yield req
-                      new_path = req.path
-                      new_query = URI.encode_www_form(req.params)
-                      if uri.path != new_path || uri.query != new_query
-                        test_uri = uri
-                        test_uri.query = nil
+                  begin
+                    result = run_request_without_apm(method, url, body, headers) do |req|
+                      if block_given?
+                        yield req
                         begin
-                          test_uri.path = new_path
-                        rescue Exception => e
+                          new_path = req.path
+                          new_query = URI.encode_www_form(req.params)
+                          if uri.path != new_path || uri.query != new_query
+                            test_uri = uri
+                            test_uri.query = nil
+                            begin
+                              test_uri.path = new_path
+                            rescue Exception => e
+                            end
+                            # The original url can be set to path if Faraday.get used
+                            if test_uri.to_s != uri.to_s
+                              uri.path = new_path
+                            end
+                            uri.query = new_query
+                          end
+                        rescue
+                          error_in_block = true
+                          raise
                         end
-                        # The original url can be set to path if Faraday.get used
-                        if test_uri.to_s != uri.to_s
-                          uri.path = new_path
-                        end
-                        uri.query = new_query
+                      end
+                      begin
+                        event.request.method = method.to_s.upcase
+                        event.request.url = uri.to_s
+                        event.request.received_at = DateTime.now.strftime('%Q').to_i
+                        event.request.headers['host'] = uri.hostname
+                        req.headers.each {|n,v| event.request.headers[n] = v}
+                        event.request.url = uri.to_s
+                        event.request.body = req.body
+                      rescue
+                        error_in_block = true
+                        raise
                       end
                     end
-                    event.request.method = method.to_s.upcase
-                    event.request.url = uri.to_s
-                    event.request.received_at = DateTime.now.strftime('%Q').to_i
-                    event.request.headers['host'] = uri.hostname
-                    req.headers.each {|n,v| event.request.headers[n] = v}
-                    event.request.url = uri.to_s
-                    event.request.body = req.body
+                  rescue
+                    error_in_request = true
+                    event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionError)
+                    event.error.received_at = DateTime.now.strftime('%Q').to_i
+                    raise
                   end
-
                   if result
                     event.response = Hoss::Event::Response.new
                     event.response.received_at = DateTime.now.strftime('%Q').to_i
@@ -78,18 +97,14 @@ module Hoss
                     result.headers.each {|n,v| event.response.headers[n] = v}
                     event.response.body = result.body
                   end
-
                   result
-                rescue Exception => e
-                  if e.wrapped_exception.is_a? Net::OpenTimeout
-                    event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionTimeout)
-                  else
-                    event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionError)
-                  end
-                  event.error.received_at = DateTime.now.strftime('%Q').to_i
-                  raise
                 end
               end
+            rescue Exception => e
+              raise if error_in_request && !error_in_block
+              puts format('Hoss Error: %s %s', e.inspect, e.backtrace)
+              return result unless result.nil?
+              return run_request_without_apm(method, url, body, headers, &block)
             end
           end
         end

data/lib/hoss/spies/http.rb

@@ -41,35 +41,47 @@ module Hoss
           alias perform_without_apm perform
 
           def perform(req, options)
-            if req.headers['HOSS-SKIP-INSTRUMENTATION'] == 'true'
-              return perform_without_apm(req, options)
-            end
-            Hoss.with_event do |event|
-              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)
+            result = nil
+            error_in_request = false
+            begin
+              if req.headers['HOSS-SKIP-INSTRUMENTATION'] == 'true'
+                return perform_without_apm(req, options)
+              end
+
+              Hoss.with_event do |event|
+                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)
+                rescue HTTP::TimeoutError => e
+                  error_in_request = true
+                  event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionTimeout)
+                  event.error.received_at = DateTime.now.strftime('%Q').to_i
+                  raise
+                rescue Exception => e
+                  error_in_request = true
+                  event.error = Hoss::Event::Error.new(Hoss::Event::Error::ConnectionError)
+                  event.error.received_at = DateTime.now.strftime('%Q').to_i
+                  raise
+                end
                 if result
                   event.response = Hoss::Event::Response.new
                   event.response.received_at = DateTime.now.strftime('%Q').to_i
                   event.response.status_code = result.code.to_i
                   result.headers.each {|n,v| event.response.headers[n] = v}
-                  event.response.body = result.body.dup.to_s
+                  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
+            rescue Exception => e
+              raise if error_in_request
+              puts format('Hoss Error: %s %s', e.inspect, e.backtrace)
+              return result unless result.nil?
+              return perform_without_apm(req, options)
             end
           end
         end

data/lib/hoss/spies/net_http.rb

@@ -52,39 +52,55 @@ module Hoss
           alias request_without_apm request
 
           def request(req, body = nil, &block)
-            if req['HOSS-SKIP-INSTRUMENTATION'] == 'true' || Hoss::Spies::NetHTTPSpy.disabled?
-              return request_without_apm(req, body, &block)
-            end
+            result = nil
+            error_in_request = false
+            begin
+              if req['HOSS-SKIP-INSTRUMENTATION'] == 'true' || Hoss::Spies::NetHTTPSpy.disabled?
+                return request_without_apm(req, body, &block)
+              end
+
+              host = req['host']&.split(':')&.first || address
+              method = req.method.to_s.upcase
+              path, query = req.path.split('?')
 
-            host = req['host']&.split(':')&.first || address
-            method = req.method.to_s.upcase
-            path, query = req.path.split('?')
+              url = use_ssl? ? +'https://' : +'http://'
+              url << host
+              url << ":#{port}" if port
+              url << path
+              url << "?#{query}" if query
+              uri = URI(url)
 
-            url = use_ssl? ? +'https://' : +'http://'
-            url << host
-            url << ":#{port}" if port
-            url << path
-            url << "?#{query}" if query
-            uri = URI(url)
+              Hoss.with_event do |event|
+                # Record request
+                event.request.headers['host'] = uri.hostname
+                req.each_header {|n,v| event.request.headers[n] = v}
+                event.request.method = method
+                event.request.url = uri.to_s
+                event.request.body = req.body
+                event.request.received_at = DateTime.now.strftime('%Q').to_i
 
-            Hoss.with_event do |event|
-              # Record request
-              event.request.headers['host'] = uri.hostname
-              req.each_header {|n,v| event.request.headers[n] = v}
-              event.request.method = method
-              event.request.url = uri.to_s
-              event.request.body = req.body
-              event.request.received_at = DateTime.now.strftime('%Q').to_i
-              
-              result = request_without_apm(req, body, &block)
-              if result
-                event.response = Hoss::Event::Response.new
-                event.response.received_at = DateTime.now.strftime('%Q').to_i
-                event.response.status_code = result.code.to_i
-                result.each_header {|n,v| event.response.headers[n] = v}
-                event.response.body = result.body
+                begin
+                  result = request_without_apm(req, body, &block)
+                rescue
+                  error_in_request = true
+                  raise
+                end
+
+                if result
+                  event.response = Hoss::Event::Response.new
+                  event.response.received_at = DateTime.now.strftime('%Q').to_i
+                  event.response.status_code = result.code.to_i
+                  result.each_header {|n,v| event.response.headers[n] = v}
+                  event.response.body = result.body
+                end
+
+                result
               end
-              result
+            rescue Exception => e
+              raise if error_in_request
+              puts format('Hoss Error: %s %s', e.inspect, e.backtrace)
+              return result unless result.nil?
+              return request_without_apm(req, body, &block)
             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/transport/worker.rb

@@ -147,7 +147,11 @@ module Hoss
                 puts json if config.debug
               end
               begin
-                connection.write(json)
+                if config.disable_reporting
+                  debug "Reprting disabled, skipping"
+                else
+                  connection.write(json)
+                end
               rescue Exception => e
                 error format('Failed send report: %s %s', e.inspect, e.backtrace)
                 batch.each do |m|

data/lib/hoss/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoss-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.11
 platform: ruby
 authors:
 - Cameron Cooper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby