red_cross 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e4b4f06dcded53b8790298ea43dee10c413b3dd
-  data.tar.gz: 90d0a731c01730e2cdb90579faca4ce04d474923
+  metadata.gz: daa8a11872bc4bc51250785df23512137156f604
+  data.tar.gz: f2a690c66d17f6f474704310b6c190f992696129
 SHA512:
-  metadata.gz: 96cf40eb35b443ed47b96eb376a709377cb506ce69e853ee898ac1ebd3441fc5b328185391af90abeb281f5f99ede562e87259955bab525f354d8702ded25c55
-  data.tar.gz: caa5f4ff5d91def610a390f7800622e0440b3fa230d79116df100311acb65669a18c4e016425a6e8b1a5d1e2a8a236a22f87ad207dc989f8c9b592b20553e02b
+  metadata.gz: 0e01f87ad61306a8d8e6550c0a49000e95983365c7cd6dfe69457afd2ae144a7f0b20a2cc6d04d10153bc1a1ed96be56ae27895f5adccd92a2b9f82fe55556e2
+  data.tar.gz: 4c20a2d88b7607bc6bb616e00b46d628a3552ee37520bbca12a6b56c5fe7cd9dc917b961799e9cb4efacf48010d0632e096531ef5c4a8f889822b2a1da526f9d

data/lib/red_cross/resque/plugins/red_cross_monitor.rb

@@ -29,40 +29,39 @@ module Resque
       end
 
       def before_perform_send_monitor_data(*args)
-        @job_start_time = Time.now()
+        @red_cross_job_start_time = Time.now()
         send_metrics('before_perform', *args)
       end
 
       def after_perform_actions(*args)
         ::RedCross.flush
-        @job_end_time = Time.now()
+        @red_cross_job_end_time = Time.now()
         send_metrics('performed', *args)
       end
 
-      def on_failure_send_monitor_data(*args)
-        @job_end_time = Time.now()
+      def on_failure_send_monitor_data(e, *args)
+        @red_cross_job_end_time = Time.now()
         send_metrics('failed', *args)
       end
 
       def default_event_properties(*args)
-        @event_properties ||= { fields: {  } }
-        @event_properties[:class] ||= self.name
-        @event_properties[:queue] ||= Resque.queue_from_class(self)
+        event_properties = { class: self.name, fields: { } }
+        event_properties[:exception] = args.shift.class.to_s if args.is_a?(Array) && args[0].is_a?(Exception)
+        queue = Resque.queue_from_class(self)
+        (queue && !queue.to_s.empty?) ? event_properties[:queue] = queue : event_properties[:class]
         event_job_method = job_method(*args)
         if (!event_job_method.nil? && ([String, Integer, Symbol].include? event_job_method.class))
-          @event_properties[:event_method] = event_job_method
+          event_properties[:event_method] = event_job_method
         else
-          @event_properties[:event_method] = 'no_valid_job_method'
+          event_properties[:event_method] = 'no_valid_job_method'
         end
+        event_properties
       end
 
       def send_metrics(job_status, *args)
-        default_event_properties(*args)
-        @event_properties[:fields][:run_time] = ((@job_end_time - @job_start_time)*1000).to_i if %w(performed failed).include? job_status
-        if args.is_a?(Array) && args[0].is_a?(Exception)
-          @event_properties[:exception] = args.shift.class.to_s
-        end
-        ::RedCross.monitor_track(event: 'resque', properties: @event_properties.merge({ job_status: job_status }))
+        event_properties = default_event_properties(*args)
+        event_properties[:fields][:run_time] = ((@red_cross_job_end_time - @red_cross_job_start_time)*1000).to_i if %w(performed failed).include? job_status
+        ::RedCross.monitor_track(event: 'resque', properties: event_properties.merge({ job_status: job_status }))
       end
     end
   end

data/lib/red_cross/trackers/monitor_tracker.rb

@@ -32,7 +32,7 @@ module RedCross
         properties = attrs[:properties] || {}
         values = { count: 1 }.merge((properties.delete(:fields) || {}))
         begin
-          client.write_point(event, { values: values, tags: properties })
+          client.write_point(event, { values: compact(values), tags: compact(properties) })
           client.writer.worker.stop!
         rescue => e
           error_data = {
@@ -51,6 +51,10 @@ module RedCross
           log :error, error_data
         end
       end
+
+      def compact(hash)
+        hash.respond_to?(:compact) ? hash.compact : hash.delete_if {|k,v| v == nil }
+      end
     end
   end
 end

data/lib/red_cross/version.rb

@@ -1,3 +1,3 @@
 module RedCross
-  VERSION = '0.2.14'
+  VERSION = '0.2.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_cross
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - ronbarab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: analytics-ruby