resque-cloudwatch-metrics 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8eb5f6b8c5444de892c7c310384f6a7b4aaf02b
-  data.tar.gz: bee349c2d915e0f8ad874e303062f0a800e23000
+  metadata.gz: 35f370eb016eaf0a9b1393edb97933e50ad328c6
+  data.tar.gz: ca1e50cac0cbe1a44c193604f1df6d76eb368247
 SHA512:
-  metadata.gz: c5e42d49fb5bab5f32531a0c80e2a59ba8d94dc1704378d0d010896b6768fa2fd316f40311682f975eacc8dfaf92adc9fb5ee613d8bb6d5cef2bbb0f224b1c91
-  data.tar.gz: 02ea0c7f59ce26fa7ddca67ab2156dc096cda770ffe1712d05e334d5ddf14991ce8bf0f16489e01be2bd0f482daf4579239f09e0ee651e6a586fa0cef2f3b5bf
+  metadata.gz: adeaa94b383ce7a2ca7a3627d51adaebfaf80acdd56e50d8301b12ee7a99bc163bb6789606d6266fb42b1f5fc8ea4d1e5be53d918b5f171043c99266e76ff4a1
+  data.tar.gz: bc5251942a12c395e55f824129e945ebcc98a1cac05c3946ce4fbacc8bb737d2646a80bb43c090ae9cd8d32ad6cfb7b69c2fc58b9709ad49a0763c2f820177a5

data/README.md

@@ -2,6 +2,10 @@
 
 Send Resque.info to CloudWatch Metrics
 
+[![Gem Version](https://badge.fury.io/rb/resque-cloudwatch-metrics.svg)](https://badge.fury.io/rb/resque-cloudwatch-metrics)
+[![Code Climate](https://codeclimate.com/github/m4i/resque-cloudwatch-metrics/badges/gpa.svg)](https://codeclimate.com/github/m4i/resque-cloudwatch-metrics)
+[![Dependency Status](https://gemnasium.com/badges/github.com/m4i/resque-cloudwatch-metrics.svg)](https://gemnasium.com/github.com/m4i/resque-cloudwatch-metrics)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -18,6 +22,10 @@ Or install it yourself as:
 
     $ gem install resque-cloudwatch-metrics
 
+Or use Docker:
+
+    $ docker run --rm m4i0/resque-cloudwatch-metrics --help
+
 ## Usage
 
 ```

data/docker/.gitignore

@@ -0,0 +1 @@
+/.bundle/

data/docker/Dockerfile

@@ -0,0 +1,19 @@
+FROM alpine
+
+RUN set -eux \
+	&& apk add --no-cache \
+		ca-certificates \
+		openssl \
+		ruby \
+		ruby-bundler \
+		ruby-json \
+	# dumb-init
+	&& VERSION=1.2.0 \
+	&& wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v$VERSION/dumb-init_${VERSION}_amd64 \
+	&& chmod +x /usr/local/bin/dumb-init
+
+ENTRYPOINT ["dumb-init", "resque-cloudwatch-metrics"]
+WORKDIR /app
+
+COPY Gemfile Gemfile.lock /app/
+RUN bundle install -j4 --frozen

data/docker/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'resque-cloudwatch-metrics'

data/docker/Gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-sdk-core (2.6.41)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sigv4 (1.0.0)
+    jmespath (1.3.1)
+    mono_logger (1.1.0)
+    multi_json (1.12.1)
+    rack (1.6.5)
+    rack-protection (1.5.3)
+      rack
+    redis (3.3.2)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.26.0)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-cloudwatch-metrics (0.2.0)
+      aws-sdk-core (~> 2)
+      resque (~> 1)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    tilt (2.0.5)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  resque-cloudwatch-metrics
+
+BUNDLED WITH
+   1.13.6

data/lib/resque/cloudwatch/metrics/metric.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'resque'
+
+module Resque
+  module CloudWatch
+    class Metrics
+      class Metric
+        class << self
+          @@mutex = Mutex.new
+
+          def create(namespace)
+            @@mutex.synchronize do
+              Resque.redis.namespace = namespace
+              new(
+                Time.now,
+                namespace,
+                Resque.info,
+                current_queue_sizes,
+                get_previous_processed(namespace),
+              ).tap do |metric|
+                set_previous_processed(namespace, metric.processed)
+              end
+            end
+          end
+
+          private
+
+          def current_queue_sizes
+            Resque.queues.map { |name| [name, Resque.size(name)] }
+          end
+
+          def get_previous_processed(namespace)
+            @_previous_processed ||= {}
+            @_previous_processed[namespace]
+          end
+
+          def set_previous_processed(namespace, previous_processed)
+            @_previous_processed ||= {}
+            @_previous_processed[namespace] = previous_processed
+          end
+        end
+
+        def initialize(time, namespace, info, queue_sizes, previous_processed)
+          @time = time
+          @namespace = namespace
+          @info = info
+          @queue_sizes = queue_sizes
+          @previous_processed = previous_processed
+        end
+
+        def pending;   @info[:pending];   end
+        def processed; @info[:processed]; end
+        def failed;    @info[:failed];    end
+        def queues;    @info[:queues];    end
+        def workers;   @info[:workers];   end
+        def working;   @info[:working];   end
+
+        def processing
+          incremental_size_of_processed + working
+        end
+
+        def to_cloudwatch_metric_data
+          dimensions = [{ name: 'namespace', value: @namespace.to_s }]
+
+          %i(pending processed failed queues workers working processing).map do |key|
+            build_cloudwatch_metric_datum(key.to_s.capitalize, public_send(key))
+          end +
+          @queue_sizes.map do |name, size|
+            build_cloudwatch_metric_datum('Pending', size, queue: name)
+          end
+        end
+
+        private
+
+        def build_cloudwatch_metric_datum(metric_name, value, dimensions = {})
+          {
+            metric_name: metric_name,
+            dimensions:  default_dimensions.merge(dimensions).to_cloudwatch,
+            timestamp:   @time,
+            value:       value,
+            unit:        'Count',
+          }
+        end
+
+        def default_dimensions
+          @_default_dimensions = Dimensions.new(namespace: @namespace.to_s)
+        end
+
+        def incremental_size_of_processed
+          if @previous_processed.nil?
+            0
+          else
+            [0, processed - @previous_processed].max
+          end
+        end
+      end
+
+      class Dimensions < Hash
+        def initialize(hash)
+          super()
+          update(hash)
+        end
+
+        def to_cloudwatch
+          map { |name, value| { name: name, value: value } }
+        end
+      end
+    end
+  end
+end

data/lib/resque/cloudwatch/metrics/version.rb

@@ -3,7 +3,7 @@
 module Resque
   module CloudWatch
     class Metrics
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

data/lib/resque/cloudwatch/metrics.rb

@@ -4,6 +4,7 @@ require 'resque/cloudwatch/metrics/version'
 require 'optparse'
 require 'aws-sdk-core'
 require 'resque'
+require 'resque/cloudwatch/metrics/metric'
 
 module Resque
   module CloudWatch
@@ -47,8 +48,6 @@ module Resque
         @redis_namespace = redis_namespace
         @interval = interval
         @cw_namespace = cw_namespace
-
-        @mutex = Mutex.new
       end
 
       def run
@@ -66,19 +65,11 @@ module Resque
       private
 
       def run_once
-        now, infos = @mutex.synchronize { [Time.now, get_infos] }
-        put_metric_data(infos.flat_map { |args| build_metric_data(now, *args) })
-      end
-
-      def get_infos
-        redis_namespaces.map do |redis_namespace|
-          Resque.redis.namespace = redis_namespace
-          [
-            redis_namespace,
-            Resque.info,
-            Resque.queues.map { |name| [name, Resque.size(name)] },
-          ]
-        end
+        put_metric_data(
+          redis_namespaces
+            .map { |redis_namespace| Metric.create(redis_namespace) }
+            .flat_map(&:to_cloudwatch_metric_data)
+        )
       end
 
       def redis_namespaces
@@ -96,29 +87,6 @@ module Resque
         end
       end
 
-      def build_metric_data(timestamp, redis_namespace, info, queue_sizes)
-        dimensions = [{ name: 'namespace', value: redis_namespace.to_s }]
-
-        %i(pending processed failed queues workers working).map do |key|
-          {
-            metric_name: key.to_s.capitalize,
-            dimensions:  dimensions,
-            timestamp:   timestamp,
-            value:       info[key],
-            unit:        'Count',
-          }
-        end +
-        queue_sizes.map do |name, size|
-          {
-            metric_name: 'Pending',
-            dimensions:  dimensions + [{ name: 'queue', value: name }],
-            timestamp:   timestamp,
-            value:       size,
-            unit:        'Count',
-          }
-        end
-      end
-
       def put_metric_data(metric_data)
         metric_data.each_slice(MAX_METRIC_DATA_PER_PUT).map do |data|
           Thread.start(data) do |data|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-cloudwatch-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -82,8 +82,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker/.gitignore
+- docker/Dockerfile
+- docker/Gemfile
+- docker/Gemfile.lock
 - exe/resque-cloudwatch-metrics
 - lib/resque/cloudwatch/metrics.rb
+- lib/resque/cloudwatch/metrics/metric.rb
 - lib/resque/cloudwatch/metrics/version.rb
 - resque-cloudwatch-metrics.gemspec
 homepage: https://github.com/m4i/resque-cloudwatch-metrics