From 12a46e7943c0a4dee1f9b05474c4afaf8140f935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Mart=C3=ADnez?= <zen@itram.es>
Date: Tue, 2 Dec 2014 15:52:55 +0100
Subject: [PATCH] Add resque-metrics gem

---
 Gemfile                       | 1 +
 Gemfile.lock                  | 3 +++
 config/initializers/statsd.rb | 1 +
 lib/resque/base_job.rb        | 3 ++-
 lib/resque/user_jobs.rb       | 7 +++++++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 77987c3cad..2b6f42a1a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,6 +71,7 @@ gem 'bartt-ssl_requirement',   '~>1.4.0', require: 'ssl_requirement'
 gem 'mixpanel',              '4.0.2'
 gem 'rollbar',               '0.12.14'
 gem 'resque',                '1.23.0'
+gem 'resque-metrics',        '0.1.1'
 
 group :development, :test do
   gem 'rb-readline'
diff --git a/Gemfile.lock b/Gemfile.lock
index 47a8fdd614..f0cf395d72 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -215,6 +215,8 @@ GEM
       redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
+    resque-metrics (0.1.1)
+      resque (~> 1.19)
     retriable (1.4.1)
     rollbar (0.12.14)
       multi_json (~> 1.3)
@@ -340,6 +342,7 @@ DEPENDENCIES
   redcarpet (= 3.1.1)
   redis (= 2.2.2)
   resque (= 1.23.0)
+  resque-metrics (= 0.1.1)
   retriable (= 1.4.1)
   rollbar (= 0.12.14)
   roo (= 1.13.2)
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
index 6f49e1ab4c..ddded2ad4c 100644
--- a/config/initializers/statsd.rb
+++ b/config/initializers/statsd.rb
@@ -3,6 +3,7 @@ require 'statsd'
 begin
   Statsd.host = Cartodb.config[:graphite]['host']
   Statsd.port = Cartodb.config[:graphite]['port']
+  Resque::Metrics.backends.append Resque::Metrics::Backends::Statsd.new(Statsd)
 rescue => e
   Rails.logger.info "Ignoring statsd, because there were a error loading the config"
 end
diff --git a/lib/resque/base_job.rb b/lib/resque/base_job.rb
index 027134e18d..d8fbb4af7f 100644
--- a/lib/resque/base_job.rb
+++ b/lib/resque/base_job.rb
@@ -4,6 +4,7 @@ require 'sequel'
 
 module Resque
   class BaseJob
+    extend ::Resque::Metrics
     MAX_RETRIES = 3
 
     @@queue = ''
@@ -38,4 +39,4 @@ module Resque
     end #self.perform
 
   end #BaseJobs
-end
\ No newline at end of file
+end
diff --git a/lib/resque/user_jobs.rb b/lib/resque/user_jobs.rb
index 5bb8786d76..36af13a84f 100644
--- a/lib/resque/user_jobs.rb
+++ b/lib/resque/user_jobs.rb
@@ -7,6 +7,7 @@ module Resque
     module SyncTables
 
       module LinkGhostTables 
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(user_id)
@@ -22,6 +23,7 @@ module Resque
     module Mail
 
       module NewOrganizationUser
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(user_id)
@@ -31,6 +33,7 @@ module Resque
       end
 
       module ShareVisualization
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(visualization_id, user_id)
@@ -41,6 +44,7 @@ module Resque
       end
       
       module ShareTable
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(table_id, user_id)
@@ -51,6 +55,7 @@ module Resque
       end
     
       module UnshareVisualization
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(visualization_name, visualization_owner_name, user_id)
@@ -61,6 +66,7 @@ module Resque
       end
       
       module UnshareTable
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(table_name, table_owner_name, user_id)
@@ -71,6 +77,7 @@ module Resque
       end
 
       module DataImportFinished
+        extend ::Resque::Metrics
         @queue = :users
 
         def self.perform(user_id, imported_tables, total_tables, first_imported_table, first_table, errors)