resque-cloudwatch-monitor 0.0.3 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTVhYWZhNWY0OGRhOWU5NTZiMzczNGI3ZWVlOGE0YjM5NzhjM2VhMQ==
+    ODdlZThhMDU0YmZiY2RiZjhjNjgzOTQ5NzhjYzJkNzcxM2Y3NDZjOQ==
   data.tar.gz: !binary |-
-    ZWU3Njc2MjBlNTJhOTY5NGI5MDU4NzVmNmEwNDVlN2I2NTM5NGJjYg==
+    NzVmNmM2MDQ3ZGE0YzYwZDc4NWQ3ZWZiZjRmMzIxYWM0Y2EyMjJiNw==
 SHA512:
   metadata.gz: !binary |-
-    NjY3MDgzM2RkYTNjMjQ1NGI5M2Q5NDRjZjBiNmEzM2M5MTA2NTNhOGNiYjZi
-    NTc2Mzc4ODJjNDRiYzMwOTUxMDJkMGFhOGY2Zjk0NzEzNjNkYzBlNGIxMzdj
-    NDBiNWYzZTg3OGM3M2FiMThiZjk5MThhMzRkZWY3ZmY3N2FlYTE=
+    MTg1MjNhNTM4NGFmNjdkNmU2ODg4NmE2NmE0ZjM4OGViYmJhOTllY2VjYzEx
+    ODZkYTVlYTY0Zjc3MTA5MDEwYzllZDdjYzQxYTMxNzQwNGZmZGE2MmUyZTA2
+    MDEyNmM5NDA1Zjk4ODI2MTc4ODZiMjY1ZWY0ZGEwZmNmMWQ4MjY=
   data.tar.gz: !binary |-
-    NzM2OTAzNGNkNTIzYTA2MDFhMWQzYTVjYmRhMjI5NGQ1ZjlkMzI5NDA3ZGQx
-    ODc2NTlhNjg1YTFhODYxY2EyMWI4OGEzNzA3YTVmMjliN2UwMjA2NmMzNzA1
-    ZTE0ZDQ4OWZlYmEyYzU4MDgwNGFhODc4ZjZhZWFlNDllNjU3Y2Q=
+    MGJhNzg0Y2YxMDgxNGFjZmEwMzk0ZDU3MTgwNmJkMjgzYjU2YzBmN2MwZWZj
+    ZWVhMmVlZDc3ZTNkM2Q0ZmIyZGI1Y2VjMjM5YWU4YmViODZiMGM4Njk3MTdh
+    Zjg0NGI2ZWI2Yjk5Zjg0M2FhYzI2MGMxMTdiMWZjM2NjMDZjNzc=

data/lib/resque-cloudwatch-monitor.rb

@@ -1,5 +1,5 @@
 require 'resque'
 
-require 'resque/plugins/cloudwatch-monitor/cloudwatch-monitor'
 require 'resque/plugins/cloudwatch-monitor/configuration'
-require 'resque/plugins/cloudwatch-monitor/version'
+require 'resque/plugins/cloudwatch-monitor/version'
+require 'resque/plugins/cloudwatch-monitor'

data/lib/resque/plugins/{cloudwatch-monitor/cloudwatch-monitor.rb → cloudwatch-monitor.rb}

@@ -3,19 +3,12 @@ module Resque
 
     module CloudwatchMonitor
 
-      #Cloudwatch Custom Metric Namespace
-      def namespace
-        Configuration.namespace
+      def get_namespace(type)
+        Configuration.get_namespace_for(type)
       end
 
-      #Cloudwatch Custom Metric Namespace For Failed Jobs
-      def fail_namespace
-        Configuration.fail_namespace
-      end
-
-      #Cloudwatch Custom Metric Namespace For Before Performed Jobs
-      def perform_namespace
-        Configuration.perform_namespace
+      def should_report?(type)
+        Configuration.should_report?(type)
       end
 
       #Cloudwatch metric name
@@ -43,19 +36,16 @@ module Resque
         1
       end
 
-      #Job on failure hook. receives the job arguments and the exception
-      def on_failure_report_cw(e, *args)
-        report_dimensions = dimensions(*args)
-        report(fail_namespace, metric_name, report_dimensions)
-      end
-
-      def before_perform_report_cw(*args)
-        report_dimensions = dimensions(*args)
-        report(perform_namespace, metric_name, report_dimensions)
+      Configuration.event_list.each do |type|
+        define_method("#{type}_report_cw") do |e, *args|
+          report(type, *args)
+        end
       end
 
       private
-      def report(report_namespace, metric_name, report_dimensions)
+      def report(type, *args)
+        return unless should_report?(type)
+        report_dimensions = dimensions(*args)
         report_dimensions ||= []
         report_dimensions.delete_if{|key| key[:value].nil? || key[:name].nil? }
         metric_data = {
@@ -65,7 +55,7 @@ module Resque
             value: value,
             unit: unit.to_s
         }
-        report_namespace ||= namespace
+        report_namespace = get_namespace(type)
         #Send to metrics. One general of the queue and another one with dimensions if custom dimensions
         metrics_to_send = report_dimensions.empty? ? [metric_data] : [metric_data, metric_data.merge(dimensions: [])]
 

data/lib/resque/plugins/cloudwatch-monitor/configuration.rb

@@ -4,11 +4,54 @@ module Resque
       module Configuration
         class << self
 
-          attr_accessor :namespace, :cloudwatch_client, :fail_namespace, :perform_namespace
+          attr_accessor :cloudwatch_client
 
+          @@report_on = {
+              before_perform: false,
+              after_perform: false,
+              on_failure: false,
+              after_enqueue: false,
+              before_enqueue: false,
+              after_dequeue: false,
+              before_dequeue: false
+          }
+
+          @@report_namespace = {
+              before_perform: 'Resque before_perform',
+              after_perform: 'Resque after_perform',
+              on_failure: 'Resque on_failure',
+              after_enqueue: 'Resque after_enqueue',
+              before_enqueue: 'Resque before_enqueue',
+              after_dequeue: 'Resque after_dequeue',
+              before_dequeue: 'Resque before_dequeue'
+          }
           def configure
             yield self
           end
+
+          def should_report?(type)
+            @@report_on[type]
+          end
+
+          def do_not_report_on(type)
+            @@report_on[type] = false
+          end
+
+          def report_on(type)
+            @@report_on[type] = true
+          end
+
+          def get_namespace_for(type)
+            @@report_namespace[type]
+          end
+
+          def set_namespace_for(type, namespace)
+            @@report_namespace[type] = namespace
+          end
+
+          def event_list
+            @@report_on.keys
+          end
         end
       end
     end

data/lib/resque/plugins/cloudwatch-monitor/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module CloudwatchMonitor
-      VERSION = '0.0.3'
+      VERSION = '0.1.0'
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -17,9 +17,13 @@ class CloudWatchMonitorTest
 end
 
 Resque::Plugins::CloudwatchMonitor::Configuration.configure do |config|
-  config.namespace = 'Resque Monitor'
-  config.fail_namespace = 'Resque Failures'
-  config.perform_namespace = 'Resque Perform'
+  config.set_namespace_for(:on_failure, 'Resque Failures')
+  config.set_namespace_for(:after_perform, 'Resque Success')
+  config.set_namespace_for(:before_perform, 'Resque Perform')
+  config.report_on(:on_failure)
+  config.report_on(:after_perform)
+  config.report_on(:before_perform)
+
   config.cloudwatch_client = AWS::CloudWatch::Client.new
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-cloudwatch-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Yotpo/avichay@yotpo, Yotpo/vlad@yotpo.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -89,7 +89,7 @@ files:
 - LICENSE
 - README.md
 - lib/resque-cloudwatch-monitor.rb
-- lib/resque/plugins/cloudwatch-monitor/cloudwatch-monitor.rb
+- lib/resque/plugins/cloudwatch-monitor.rb
 - lib/resque/plugins/cloudwatch-monitor/configuration.rb
 - lib/resque/plugins/cloudwatch-monitor/version.rb
 - resque-cloudwatch-monitor.gemspec