hoss-agent 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd2239031e74d5f25fafa6f441f51b3e0d58b9bc751fd71969991fa0761e261
-  data.tar.gz: db69f9d259c944bfbc935ab0967d20e39403fbaa86169188c597bcc9fff31fcb
+  metadata.gz: eb17fe11c7d97d41c4cb2c5a701286233ea53255092a89a3924793e5d2a6a3c4
+  data.tar.gz: babeee044660be9fcb0f6c4d8a26f6204abfb2f539fa83497bac97d1b461a54b
 SHA512:
-  metadata.gz: a05a2e06817b1535ad21b76c0a72ca7bcf148ab3cfce2aeb5e9f96052d4cc3be9e8d6eb802cb270fe65ab08ace0befe92f446236d4ae468428923c9f9716b821
-  data.tar.gz: 50b283758201a779aa3648cb8f7928682a8fbfd0cb53d8280d89d65956064bed5e4cb4225875d4c2efa3e124848011a1a12c2cef10eee98bc524e143a5d755d5
+  metadata.gz: 70b395a9f4e36e3677bbe82148ff0a3ad13844c1a281184148ed22b5f8204414a6e22e0d27f98addeb723e68da4bcf89f97ab3da0248c6bc967baae48691b65e
+  data.tar.gz: d05143b093eab36c8f034fe9e05eae9b863b4fca370f1b7c8e04d28d3eba8a69c770f4c0ef137fedde869761401c7617a74f998caa2e91fc559ae707c44550ac

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
-              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
+
+            begin
+              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)
+                  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
+                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
-                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
+              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/worker.rb

@@ -61,100 +61,108 @@ module Hoss
         
         done = false
         while (!done && msg = queue.pop)
-          debug 'working message', msg
+          begin
+            debug 'working message', msg
 
-          # wait if we don't have a config
-          while config.agentConfig.nil?
-            sleep 0.1
-          end
-          
-          case msg
-          when StopMessage
-            debug 'Stopping worker -- %s', self
-            done = true
-            break
-          else
-            batch = []
-            current_batch_size = 0
-
-            # Use this as the first message in the batch
-            event = msg.filtered ? msg : filter_resource(msg)
-            unless event.nil?
-              event_size = resource_size(event)
-              if current_batch_size + event_size <= @config.batch_size
-                unless host_blacklisted(event)
-                  current_batch_size += event_size
-                  if event.retries < @config.max_event_retries
-                    batch.push(event) 
-                  else
-                    debug "max retries hit for event"
+            # wait if we don't have a config
+            while config.agentConfig.nil?
+              sleep 0.1
+            end
+
+            case msg
+            when StopMessage
+              debug 'Stopping worker -- %s', self
+              done = true
+              break
+            else
+              batch = []
+              current_batch_size = 0
+
+              # Use this as the first message in the batch
+              event = msg.filtered ? msg : filter_resource(msg)
+              unless event.nil?
+                event_size = resource_size(event)
+                if current_batch_size + event_size <= @config.batch_size
+                  unless host_blacklisted(event)
+                    current_batch_size += event_size
+                    if event.retries < @config.max_event_retries
+                      batch.push(event)
+                    else
+                      debug "max retries hit for event"
+                    end
                   end
+                else
+                  debug "Event is too large, body needs to be truncated"
                 end
-              else
-                debug "Event is too large, body needs to be truncated"
               end
-            end
 
-            # Do inner loop reading queue to build report
-            requeue_messages = []
-            while current_batch_size < @config.batch_size && !queue.empty?
-              next_msg = queue.pop
-              case next_msg
-              when StopMessage
-                debug 'Stopping worker -- %s', self
-                done = true
-                break
-              else
-                event = next_msg.filtered ? next_msg : filter_resource(next_msg) unless 
-                unless event.nil?
-                  event_size = resource_size(event)
-                  if current_batch_size + event_size <= @config.batch_size
-                    unless host_blacklisted(event)
-                      current_batch_size += event_size
-                      if event.retries < @config.max_event_retries
-                        batch.push(event) 
-                      else
-                        debug "max retries hit for event"
+              # Do inner loop reading queue to build report
+              requeue_messages = []
+              while current_batch_size < @config.batch_size && !queue.empty?
+                next_msg = queue.pop
+                case next_msg
+                when StopMessage
+                  debug 'Stopping worker -- %s', self
+                  done = true
+                  break
+                else
+                  event = next_msg.filtered ? next_msg : filter_resource(next_msg)
+                  unless event.nil?
+                    event_size = resource_size(event)
+                    if current_batch_size + event_size <= @config.batch_size
+                      unless host_blacklisted(event)
+                        current_batch_size += event_size
+                        if event.retries < @config.max_event_retries
+                          batch.push(event)
+                        else
+                          debug "max retries hit for event"
+                        end
                       end
+                    else
+                      debug "Event too large for this batch, requeue"
+                      requeue_messages.push(event)
                     end
-                  else
-                    debug "Event too large for this batch, requeue"
-                    requeue_messages.push(event)
                   end
                 end
               end
-            end
-          
-            if batch.length == 0
-              debug "batch is empty, breaking"
-              break
-            end
 
-            debug "Requeue #{requeue_messages.length} messages" if requeue_messages.length > 0
-            requeue_messages.each {|msg| queue.push(msg, false) }
+              if batch.length == 0
+                debug "batch is empty, breaking"
+                break
+              end
 
-            report = Report.new
-            report.events = batch.map {|event| serializers.serialize(event) }
+              debug "Requeue #{requeue_messages.length} messages" if requeue_messages.length > 0
+              requeue_messages.each {|msg| queue.push(msg, false) }
 
-            debug "Finished building report"
-            data = serializers.serialize(report)
-            json = JSON.fast_generate(data)
-            begin
-              debug json
-            rescue Exception => e
-              debug 'unable to print body'
-              puts json if config.debug
-            end
-            begin
-              connection.write(json)
-            rescue Exception => e
-              error format('Failed send report: %s %s', e.inspect, e.backtrace)
-              batch.each do |m|
-                m.retries += 1
-                queue.push(m, false)
+              report = Report.new
+              report.events = batch.map {|event| serializers.serialize(event) }
+
+              debug "Finished building report"
+              data = serializers.serialize(report)
+              json = JSON.fast_generate(data)
+              begin
+                debug json
+              rescue Exception => e
+                debug 'unable to print body'
+                puts json if config.debug
+              end
+              begin
+                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|
+                  m.retries += 1
+                  queue.push(m, false)
+                end
+                sleep 1
               end
-              sleep 1
             end
+          rescue Exception => e
+            debug "error in worker #{e.inspect}"
           end
         end
       rescue Exception => e
@@ -183,6 +191,9 @@ module Hoss
         else
           body
         end
+      rescue Exception => e
+        debug "unable to decompress body #{e.inspect}"
+        return nil
       end
 
       def get_header(headers, name)

data/lib/hoss/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoss-agent
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 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