resque-cloudwatch-monitor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFiOTU4M2EzMGZlMzg2YzdhNDgyNTc1NzBkOGQ2MTlhMjhlZGFlMg==
+    ODQ4YjM3MGE0ZTNhNDgwYTY3YzRiYjExNmU2NWIxZDE3YTZiMTkzZg==
   data.tar.gz: !binary |-
-    NTU3NTY0OWNjODUyNjNkNTllOTY2ZGE1MGFhZTZmYTIzMTY3MDk3MA==
+    MzIzOTE1ODVlN2VhYTJhY2VkNzIyNWI4YTE3ZTZhZWI4YWU1Mzg4MA==
 SHA512:
   metadata.gz: !binary |-
-    ODIxYzNiNTM2OTVmYzAzMWJkOTljODBmODY1ZDc4YTdkNTkyYzkzNGI3MmZj
-    ZjMyOWU0Y2FhNjM5NWZkYzk5NDQ4YjE3NmU3ZDkwNzRjMGYwNWMwMjU5ZjA2
-    YTU5ODhlYzFjODQ5OTdjMWZmOWYzMTUxMjcyNTAwYmVjM2NkMjY=
+    Y2IwNzBmMGQ5NGZmMTNiZjg1NDFkODgwZTdlZTNlYzI0MzdmZmM3ZjY1MGVl
+    OTNjNGVjMzM5NjczMmQ5NzFjYTQ4YWRjM2M1ZDViMjNkNTVlMDFlN2JhYmQy
+    YTU4Y2ZjNDBkNjgyODZhYzc0NTFiY2I0ZjhlZWIzZTE2M2RiOTg=
   data.tar.gz: !binary |-
-    OTA5NjZhMDcyYjAzYWY4MmI5NjQyMzgzNDNlMWRjOTgxZTc0YjU1MThiZGM1
-    NzU3OWQxMWQyYWE5ODhhYjgyNmMwZjRhM2ZjMjg2MWFmMzczMzcyMWRhNzMz
-    YzdiZGJiY2VjNzI5ZDUzYmFjMWE0OWY0OWZhNjkzNWI2NmY5OWM=
+    ZTg0NTU3ZTUxYzU4MmVlNDdlMDdlMzQ5MzNiMmQ2YjQ5NTg5MDg2ZDBlYzc1
+    ODk1MjgzZGUwODZlNGEwMGVjYzQ0ZmQzZmQwYzZiYjQ1NDM3MDNmZjVmNzZi
+    MDUwNjQ1ZmZkOWM0N2I1OTBiNWFkMjg1MTdlYmMyM2E0ZTRkNjA=

data/README.md

@@ -1,5 +1,8 @@
 resque-cloudwatch-monitor
 ============
+[![Build Status](https://travis-ci.org/YotpoLtd/resque-cloudwatch-monitor.svg)](https://travis-ci.org/YotpoLtd/resque-cloudwatch-monitor)
+[![Code Climate](https://codeclimate.com/github/YotpoLtd/resque-cloudwatch-monitor/badges/gpa.svg)](https://codeclimate.com/github/YotpoLtd/resque-cloudwatch-monitor)
+[![Test Coverage](https://codeclimate.com/github/YotpoLtd/resque-cloudwatch-monitor/badges/coverage.svg)](https://codeclimate.com/github/YotpoLtd/resque-cloudwatch-monitor/coverage)
 
 A [Resque][rq] plugin. Requires Resque ~> 1.25
 

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

@@ -8,6 +8,16 @@ module Resque
         Configuration.namespace
       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
+      end
+
       #Cloudwatch metric name
       def metric_name
         @queue || queue
@@ -34,22 +44,30 @@ module Resque
       end
 
       #Job on failure hook. receives the job arguments and the exception
-      def on_failure(e, *args)
+      def on_failure_report_cw(e, *args)
+        report_dimensions = dimensions(*args)
+        report(fail_namespace, metric_name, report_dimensions)
+      end
 
-        dimensions = dimensions(*args)
+      def before_perform_report_cw(*args)
+        report_dimensions = dimensions(*args)
+        report(perform_namespace, metric_name, report_dimensions)
+      end
 
+      private
+      def report(report_namespace, metric_name, dimensions)
         metric_data = {
-          metric_name: metric_name.to_s,
-          dimensions: dimensions,
-          timestamp: timestamp,
-          value: value,
-          unit: unit.to_s
+            metric_name: metric_name.to_s,
+            dimensions: dimensions,
+            timestamp: timestamp,
+            value: value,
+            unit: unit.to_s
         }
-
+        report_namespace ||= namespace
         #Send to metrics. One general of the queue and another one with dimensions if custom dimensions
         metrics_to_send = dimensions.empty? ? [metric_data] : [metric_data, metric_data.merge(dimensions: [])]
 
-        Configuration.cloudwatch_client.put_metric_data(namespace: namespace, metric_data: metrics_to_send)
+        Configuration.cloudwatch_client.put_metric_data(namespace: report_namespace, metric_data: metrics_to_send)
       end
     end
   end

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

@@ -1,16 +1,16 @@
 module Resque
-	module Plugins
-		module CloudwatchMonitor
-			module Configuration
-				class << self
+  module Plugins
+    module CloudwatchMonitor
+      module Configuration
+        class << self
 
-					attr_accessor :namespace, :cloudwatch_client
+          attr_accessor :namespace, :cloudwatch_client, :fail_namespace, :perform_namespace
 
-					def configure
-						yield self
-					end
-				end
-			end
-		end
-	end
+          def configure
+            yield self
+          end
+        end
+      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.1'
-		end
-	end
+  module Plugins
+    module CloudwatchMonitor
+      VERSION = '0.0.2'
+    end
+  end
 end

data/resque-cloudwatch-monitor.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'resque', '~> 1.25'
   s.add_development_dependency 'rake', '~> 10.3'
   s.add_development_dependency 'aws-sdk', '~> 1.11.1'
-  s.add_development_dependency 'rspec', '~> 3.3.0'
-  s.add_development_dependency 'timecop', '~> 0.7.4'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'timecop'
 end

data/spec/cloudwatch_monitor_spec.rb

@@ -9,7 +9,7 @@ describe Resque::Plugins::CloudwatchMonitor do
     Timecop.freeze(Time.now)
 
     @metric_data = {
-        metric_name: 'Failure',
+        metric_name: 'FailingQueue',
         dimensions: [],
         timestamp: Time.now.iso8601,
         value: 1,
@@ -51,7 +51,13 @@ describe Resque::Plugins::CloudwatchMonitor do
   it 'successful job does not send a metric to cloudwatch' do
     expect(Resque::Plugins::CloudwatchMonitor::Configuration.cloudwatch_client).
         to receive(:put_metric_data).
-        exactly(0).times
+        with(namespace: 'Resque Perform',  metric_data: [{
+                                                                      metric_name: 'SuccessfulQueue',
+                                                                      dimensions: [],
+                                                                      timestamp: Time.now.iso8601,
+                                                                      value: 1,
+                                                                      unit: 'Count'
+                                                                  }])
 
     Resque.enqueue(SuccessJobTest, :success)
     CloudWatchMonitorTest.perform_enqueued_job(@worker)

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 require 'aws'
 require 'timecop'
 require 'resque-cloudwatch-monitor'
@@ -15,13 +17,15 @@ class CloudWatchMonitorTest
 end
 
 Resque::Plugins::CloudwatchMonitor::Configuration.configure do |config|
-  config.namespace = 'Resque Failures'
+  config.namespace = 'Resque Monitor'
+  config.fail_namespace = 'Resque Failures'
+  config.perform_namespace = 'Resque Perform'
   config.cloudwatch_client = AWS::CloudWatch::Client.new
 end
 
 class FailureJobTest
   extend Resque::Plugins::CloudwatchMonitor
-  @queue = 'Failure'
+  @queue = 'FailingQueue'
 
   def self.perform(*args)
     raise Exception.new('Test Error')
@@ -30,7 +34,7 @@ end
 
 class SuccessJobTest
   extend Resque::Plugins::CloudwatchMonitor
-  @queue = 'Success'
+  @queue = 'SuccessfulQueue'
 
   def self.perform(*args)
     1 + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-cloudwatch-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yotpo/avichay@yotpo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -56,30 +56,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: '0'
 description: Allows reporting failures of resque jobs to Amazon CloudWatch
 email: avichay@yotpo.com
 executables: []
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Send Resque Failures To AWS CloudWatch