red_cross 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1d776661a89ad9f7eb6d0c59f8aecb11cd36f6
-  data.tar.gz: 9528d65193ab657560be5527413caa9231e39457
+  metadata.gz: c4ef8509ec9795cffb59a04f51946fb0ce2b7e00
+  data.tar.gz: 73372e2dd188696ef7b24beb4ab01ee791827104
 SHA512:
-  metadata.gz: d31748feb72554b02708fd9a82a605493b10d2f4e94f396d1910743d3aec774c59487a3d9241ad853fd0b08327a8029577813136167b68c28059d2ac6e1aa01b
-  data.tar.gz: c125b0e77c839d7453a855968f4293c3337afcb52ff4591b14b8d7d9c2405525810f9dc8a010b014791c08b896ed3fa25bca37db5850e940e1655b07c1415995
+  metadata.gz: 2caf6c18bd0906f99030f8c32948113d5173a14773594887491a299c4e66ea98b5738203dd9d9725083afb00ecffc337f167b9d0ed3925f8900282a65fa7a58f
+  data.tar.gz: 2d6e8aab563f688228b46a2f995f36aaa7aec7f2b25ca05386c8e8c4466b2debe0cfbbd4dcde2dc9516b4be00c82c3b0f1d5e8d607f54b9980f3b14b2ae0fce0

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

@@ -0,0 +1,65 @@
+module Resque
+  module Plugins
+    module RedCrossMonitor
+      # Hash of properties for RedCross.monitor
+      # Please add count: MY_NUMBER in case your metric value differs 1
+      def job_method(*args)
+        #Add the method that triggered by the job
+        'no_job_method'
+      end
+
+      def before_schedule_send_monitor_data(*args)
+        send_metrics('before_schedule', *args)
+      end
+
+      def after_schedule_send_monitor_data(*args)
+        send_metrics('after_schedule', *args)
+      end
+
+      def before_delayed_enqueue_send_monitor_data(*args)
+        send_metrics('before_delayed_enqueue', *args)
+      end
+
+      def before_enqueue_send_monitor_data(*args)
+        send_metrics('before_enqueue', *args)
+      end
+
+      def after_enqueue_send_monitor_data(*args)
+        send_metrics('after_enqueue', *args)
+      end
+
+      def before_perform_send_monitor_data(*args)
+        @job_start_time = Time.now()
+        send_metrics('before_perform', *args)
+      end
+
+      def after_perform_actions(*args)
+        ::RedCross.flush
+        @job_end_time = Time.now()
+        send_metrics('performed', *args)
+      end
+
+      def on_failure_send_monitor_data(e, *args)
+        @job_end_time = Time.now()
+        send_metrics('failed', *args)
+      end
+
+      def default_event_properties(*args)
+        @event_properties ||= { fields: {  } }
+        @event_properties[:class] ||= self.name
+        event_job_method =  @event_properties[:event_method].nil? ? job_method(*args) : @event_properties[:event_method]
+        if (!event_job_method.nil? && ([String, Integer, Symbol].include? event_job_method.class))
+          @event_properties[:event_method] = event_job_method
+        else
+          @event_properties[:event_method] = 'no_valid_job_method'
+        end
+      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
+        ::RedCross.monitor_track(event: 'resque', properties: @event_properties.merge({ job_status: job_status }))
+      end
+    end
+  end
+end

data/lib/red_cross/resque/scheduler.rb

@@ -0,0 +1,15 @@
+module Resque
+  module Scheduler
+    module DelayingExtensions
+      alias default_last_enqueued_at last_enqueued_at
+      def last_enqueued_at(name, timestemp)
+        properties = {
+            task_name: name,
+            status: 'enqueued'
+        }
+        RedCross.monitor_track(event: 'resque_scheduler', properties: properties)
+        default_last_enqueued_at(name, timestemp)
+      end
+    end
+  end
+end

data/lib/red_cross/version.rb

@@ -1,3 +1,3 @@
 module RedCross
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/red_cross.rb

@@ -2,7 +2,6 @@ require 'red_cross/version'
 require 'red_cross/configuration'
 require 'segment'
 require 'typhoeus'
-require 'resque/plugins/red_cross_async'
 require 'resque'
 require 'influxdb'
 require 'red_cross/logger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_cross
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - ronbarab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: analytics-ruby
@@ -115,12 +115,13 @@ files:
 - lib/red_cross.rb
 - lib/red_cross/configuration.rb
 - lib/red_cross/logger.rb
+- lib/red_cross/resque/plugins/red_cross_monitor.rb
+- lib/red_cross/resque/scheduler.rb
 - lib/red_cross/trackers/base.rb
 - lib/red_cross/trackers/http_tracker.rb
 - lib/red_cross/trackers/monitor_tracker.rb
 - lib/red_cross/trackers/segment_tracker.rb
 - lib/red_cross/version.rb
-- lib/resque/plugins/red_cross_async.rb
 - red_cross.gemspec
 homepage: https://github.com/YotpoLtd
 licenses:

data/lib/resque/plugins/red_cross_async.rb

@@ -1,30 +0,0 @@
-module Resque
-  module Plugins
-    module RedCrossAsync
-      # Hash of properties for RedCross.monitor
-      # Please add count: MY_NUMBER in case your metric value differs 1
-      def properties(*args)
-        {}
-      end
-
-      def after_perform_actions(*args)
-        RedCross.flush
-        send_metrics('performed', *args)
-      end
-
-      def before_perform_send_monitor_data(*args)
-        send_metrics('before_perform', *args)
-      end
-
-      def on_failure_send_monitor_data(e, *args)
-        send_metrics('failed', *args)
-      end
-
-      private
-
-      def send_metrics(event_type, *args)
-        RedCross.monitor_track(event: 'resque_job_' + event_type, properties: { class: self.name }.merge(properties(*args)))
-      end
-    end
-  end
-end