hoss-agent 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5dc8f27616545b119c326f640f637d2771adb92a39f6e60c5efc6f7635f6ea
-  data.tar.gz: 3962d5f37d1fe1d2695daa6c51bdc6a8402a6eeb4a7504014de2d31cb06f7809
+  metadata.gz: 8e6c9d937aeedc94daaf59fbcefd4a37bf5982662586489b659913b47d2e27b3
+  data.tar.gz: 0a7f8e92ce4eef17f8415946c2e620a390c4bf99fb99df23f6e1c2c5284b6918
 SHA512:
-  metadata.gz: 4c4eef26d646864c31ddb0aeee65532162f4a85c68b7f563b4babe3b5cec1bbdbca9c420cd9cd1969498a1569c865703eccfa26011040fa149c13e7c4db57a15
-  data.tar.gz: 6ad4c3a97be28038aa69e196af7aa559472ed14fbd2ab2d968fc44364f896e78ae9fa48c68a6fb443267ef24e724f03927903c2d3ed6b704314ca2fc8e5c0197
+  metadata.gz: e5716d01ea3752aaa88bdcd48a37819a70602752e21e56ab7a816d15cda3b3db835a72c4247ef02b276518cface16467c11fb658be8c6d23207a2c83bf196d4b
+  data.tar.gz: 137ad627f7cd3565aeff78d02aed3ede01a2f20106e1333aeaeba71ef180402e964969a8cde302ba1b43dabbf14c598017411a5497f8bc7596bd897e235e1df5

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'
@@ -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

@@ -81,7 +81,7 @@ module Hoss
 
                   result
                 rescue Exception => e
-                  if e.wrapped_exception.is_a? Net::OpenTimeout
+                  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)

data/lib/hoss/spies/http.rb

@@ -45,7 +45,7 @@ module Hoss
               return perform_without_apm(req, options)
             end
             Hoss.with_event do |event|
-              event.request.headers['host'] = req.uri.hostname
+              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
@@ -58,7 +58,7 @@ module Hoss
                   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

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.3'
+  VERSION = '1.0.8'
 end

metadata

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