hoss-agent 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1cebfdfba6abb3ab019045a1faa17d1bcf97a687d0697beb58aad31858f326
-  data.tar.gz: 535953f56fb21bfd7c7609a6d108c92ae8b481f68897ae2e70d623db5262d9d3
+  metadata.gz: 1f6e25b94d999ae0da999fb7de8ca429445a27a7d87a72be82da4bfc4a367ab8
+  data.tar.gz: 6e3b46812e39dde84acd627649f2557da0019b9a406791d35c61da77ecb781b7
 SHA512:
-  metadata.gz: aa5f706cd00e4ad32552dafd841d9058f1ad3eedba861245fe9499f1f4a04af8b4573290d1939eb4a984e9bea878735bb055da4cd2fa4bdce87d12e2d17e81a2
-  data.tar.gz: bfab7adec4611a3fb091cf99a28594ea8b7250597ade3d86e0ef9c6a077ccc7f302e4e34981f8c6d2894ae8bbeb49faf2f9948158bed09dfc290b49ba6a3709e
+  metadata.gz: 9a9e8e511a25e1580b32bfd63aed336be1c2a804a70d580bb36e612d72cf79f25cdeb76a16fd2d5ba6b1f60cfb2e51e15a6dd14fa83387205eb3234c3d4952e9
+  data.tar.gz: cd7c026248bd252cb8a8dfc53e72234281bc7cc1a3ea9c58e5f446ea78cc3341664e760000728c78ce2f6a7ba252b8b9eb3b44ee78a0d6a07f25cd54bcc26f13

data/lib/hoss/agent.rb

@@ -103,6 +103,10 @@ module Hoss
     def_delegator :@central_config, :config
 
     def start
+      unless config.api_key
+        config.logger.warn "Hoss API Key missing, not starting."
+        return
+      end
       unless config.disable_start_message?
         config.logger.info format(
           '[%s] Starting agent, reporting to %s',

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'
@@ -101,10 +101,6 @@ module Hoss
       assign(load_config_file)
       assign(env)
 
-      if self.log_level == Logger::DEBUG
-        assign(debug: true)
-      end
-
       if self.debug == true || self.debug == 'true'
         assign(
           log_level: Logger::DEBUG,
@@ -113,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,57 +39,61 @@ 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
-                  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
-                          test_uri.path = new_path
-                        rescue Exception => e
+            begin
+              Hoss.with_event do |event|
+                Hoss::Spies::FaradaySpy.without_net_http do
+                  begin
+                    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
+                            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
-                        # 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
+                      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
                     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
-                  end
 
-                  if result
-                    event.response = Hoss::Event::Response.new
-                    event.response.received_at = DateTime.now.strftime('%Q').to_i
-                    event.response.status_code = result.status.to_i
-                    result.headers.each {|n,v| event.response.headers[n] = v}
-                    event.response.body = result.body
-                  end
+                    if result
+                      event.response = Hoss::Event::Response.new
+                      event.response.received_at = DateTime.now.strftime('%Q').to_i
+                      event.response.status_code = result.status.to_i
+                      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)
+                    result
+                  rescue Exception => e
+                    if e.respond_to?(:wrapped_exception) && 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
-                  event.error.received_at = DateTime.now.strftime('%Q').to_i
-                  raise
                 end
               end
+            rescue
+              run_request_without_apm(method, url, body, headers, &block)
             end
           end
         end

data/lib/hoss/spies/http.rb

@@ -44,32 +44,37 @@ module Hoss
             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
+              result = nil
               begin
-                result = perform_without_apm(req, options)
-                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.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
+                  result = perform_without_apm(req, options)
+                  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.to_s
+                  end
+                  result
                 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
+              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
-              end
+              rescue Exception => e
+                return result unless result.nil?
+                return perform_without_apm(req, options)
             end
           end
         end

data/lib/hoss/spies/net_http.rb

@@ -56,35 +56,39 @@ module Hoss
               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('?')
-
-            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
-              
-              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
+              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)
+  
+              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
+                end
+                result
               end
-              result
+            rescue
+              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.5'
+  VERSION = '1.0.10'
 end

metadata

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