Upgrade to ruby 2.4.0 and added datadog metrics to alert on

Author: andreausu

Dockerfile_enqueuer

@@ -1,4 +1,4 @@
-FROM gitnotifier/ruby:latest
+FROM gitnotifier/ruby:2.4.0
 
 # Set proper locale
 ENV APP_ENV=development \
@@ -10,6 +10,9 @@ APP_CONFIG_REDIS_PORT=6379 \
 APP_CONFIG_REDIS_DB=1 \
 APP_CONFIG_REDIS_NAMESPACE=ghntfr \
 
+APP_CONFIG_STATSD_HOST=localhost \
+APP_CONFIG_STATSD_PORT=8125 \
+
 APP_CONFIG_DOMAIN=gitnotifier.local \
 
 APP_CONFIG_SECRET=somesecret \

Dockerfile_puma

@@ -1,4 +1,4 @@
-FROM gitnotifier/ruby:latest
+FROM gitnotifier/ruby:2.4.0
 
 # Set proper locale
 ENV APP_ENV=development \
@@ -10,6 +10,9 @@ APP_CONFIG_REDIS_PORT=6379 \
 APP_CONFIG_REDIS_DB=1 \
 APP_CONFIG_REDIS_NAMESPACE=ghntfr \
 
+APP_CONFIG_STATSD_HOST=localhost \
+APP_CONFIG_STATSD_PORT=8125 \
+
 APP_CONFIG_DOMAIN=gitnotifier.local \
 
 APP_CONFIG_SECRET=somesecret \

Dockerfile_sidekiq

@@ -1,4 +1,4 @@
-FROM gitnotifier/ruby:latest
+FROM gitnotifier/ruby:2.4.0
 
 # Set proper locale
 ENV APP_ENV=development \
@@ -10,6 +10,9 @@ APP_CONFIG_REDIS_PORT=6379 \
 APP_CONFIG_REDIS_DB=1 \
 APP_CONFIG_REDIS_NAMESPACE=ghntfr \
 
+APP_CONFIG_STATSD_HOST=localhost \
+APP_CONFIG_STATSD_PORT=8125 \
+
 APP_CONFIG_DOMAIN=gitnotifier.local \
 
 APP_CONFIG_SECRET=somesecret \

Gemfile

@@ -5,7 +5,7 @@ gem 'github_api', '~> 0.13.0'
 gem "redis", "~> 3.2.1"
 gem 'hiredis', '~> 0.6.0'
 gem 'haml', '~> 4.0.6'
-gem 'json', '~> 1.8.1'
+gem 'json', '~> 2.0'
 gem 'sidekiq', '~> 4.1.0'
 gem 'mail', '~> 2.6.3'
 gem 'puma', '~> 2.16.0'
@@ -14,3 +14,4 @@ gem 'rack_csrf', '~> 2.5.0'
 gem 'rack-flash3', '~> 1.0.5'
 gem 'newrelic-redis', '~> 2.0.0'
 gem 'sinatra-contrib', '~> 1.4.2'
+gem 'dogstatsd-ruby', '~> 2.2.0'

Gemfile.lock

@@ -7,6 +7,7 @@ GEM
     connection_pool (2.2.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    dogstatsd-ruby (2.2.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     github_api (0.13.1)
@@ -20,7 +21,7 @@ GEM
       tilt
     hashie (3.4.3)
     hiredis (0.6.1)
-    json (1.8.3)
+    json (2.0.3)
     jwt (1.5.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
@@ -71,10 +72,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  dogstatsd-ruby (~> 2.2.0)
   github_api (~> 0.13.0)
   haml (~> 4.0.6)
   hiredis (~> 0.6.0)
-  json (~> 1.8.1)
+  json (~> 2.0)
   mail (~> 2.6.3)
   newrelic-redis (~> 2.0.0)
   newrelic_rpm (~> 3.14.2)
@@ -87,4 +89,4 @@ DEPENDENCIES
   sinatra-contrib (~> 1.4.2)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

app.rb

@@ -3,7 +3,7 @@
 require 'haml'
 require 'json'
 require 'github_api'
-require 'pp'
+require 'datadog/statsd'
 
 class GitNotifier < Sinatra::Base
 
@@ -22,6 +22,8 @@ class GitNotifier < Sinatra::Base
     fail "Configuration file " + config_file + " missing!" unless File.exist?(config_file)
     config = YAML.load_file(config_file)
 
+    statsd = Datadog::Statsd.new(config['statsd']['host'], config['statsd']['port'])
+
     redis_conn = proc {
       Redis.new(
         :driver => :hiredis,
@@ -37,6 +39,7 @@ class GitNotifier < Sinatra::Base
     end
 
     set :CONFIG, config
+    set :STATSD, statsd
 
     use Rack::Session::Cookie, :expire_after => 2592000, :secret => config['secret'] # 30 days
 
@@ -231,6 +234,7 @@ class GitNotifier < Sinatra::Base
         'class' => SendEmail,
         'args' => [email, 'Confirm your Git Notifier email address!', 'html', 'confirm', {:confirm_link => link, :username => user['login']}]
       )
+      settigs.STATSD.increment('ghntfr.business.signup')
 
       flash.now[:success] = "We have sent an email to #{email}, please open it and click on the link inside to activate your account."
     end

config.yml.example

@@ -9,6 +9,10 @@ redis:
     db: APP_CONFIG_REDIS_DB # 0
     namespace: APP_CONFIG_REDIS_NAMESPACE # ghntfr
 
+statsd:
+  host: APP_CONFIG_STATSD_HOST # localhost
+  port: APP_CONFIG_STATSD_PORT # 8125
+
 mail:
     enabled: APP_CONFIG_MAIL_ENABLE # true
     method: APP_CONFIG_MAIL_METHOD # smtp

config/docker.env.example

@@ -7,6 +7,8 @@ APP_CONFIG_REDIS_HOST=redis
 APP_CONFIG_REDIS_PORT=6379
 APP_CONFIG_REDIS_DB=1
 APP_CONFIG_REDIS_NAMESPACE=ghntfr
+APP_CONFIG_STATSD_HOST=localhost
+APP_CONFIG_STATSD_PORT=8125
 APP_CONFIG_DOMAIN=gitnotifier.local
 APP_CONFIG_SECRET=somesecret
 APP_CONFIG_MAIL_ENABLE=true

scripts/job_enqueuer.rb

@@ -4,12 +4,16 @@
 require 'redis'
 require_relative '../workers/notifications_checker'
 require_relative '../workers/email_builder'
+require 'datadog/statsd'
 require 'newrelic_rpm' # it should be the last entry in the require list
 
 config_file = File.dirname(__FILE__) + '/../config.yml'
 fail "Configuration file " + config_file + " missing!" unless File.exist?(config_file)
 CONFIG = YAML.load_file(config_file)
 
+statsd = Datadog::Statsd.new(CONFIG['statsd']['host'], CONFIG['statsd']['port'])
+statsd.increment('ghntfr.scripts.job_enqueuer.start')
+
 users_keys = nil
 
 redis_conn = proc {
@@ -97,3 +101,5 @@
     Sidekiq::Client.push_bulk('queue' => 'email_builder', 'class' => EmailBuilder, 'args' => jobs_args)
   end
 end
+
+statsd.increment('ghntfr.scripts.job_enqueuer.finish')

workers/email_builder.rb

@@ -6,7 +6,9 @@
 class EmailBuilder
   include Sidekiq::Worker
   sidekiq_options :queue => :email_builder
+  STATSD = Datadog::Statsd.new() unless defined? STATSD
   def perform(events_list_key)
+    STATSD.increment('ghntfr.workers.email_builder.start')
 
     events = nil
     user = nil
@@ -96,6 +98,7 @@ def perform(events_list_key)
       conn.hset("#{CONFIG['redis']['namespace']}:users:" + events_list_key.split(':').last, :last_email_queued_on, Time.now.to_i)
     end
 
+    STATSD.increment('ghntfr.workers.email_builder.finish')
   end
 
   def inject_day(events)

workers/init.rb

@@ -1,11 +1,15 @@
 # encoding: utf-8
 
+require 'datadog/statsd'
+
 GC::Profiler.enable
 
 config_file = File.dirname(__FILE__) + '/../config.yml'
 fail "Configuration file " + config_file + " missing!" unless File.exist?(config_file)
 CONFIG = YAML.load_file(config_file)
 
+STATSD = Datadog::Statsd.new(CONFIG['statsd']['host'], CONFIG['statsd']['port'])
+
 redis_conn = proc {
   Redis.new(
     :driver => :hiredis,

workers/notifications_checker.rb

@@ -2,13 +2,16 @@
 require 'pp'
 require 'json'
 require 'net/http'
+require 'datadog/statsd'
 
 class NotificationsChecker
   include Sidekiq::Worker
   sidekiq_options :queue => :notifications_checker, :retry => false, :dead => false
   @first_time = nil
   @new_events = nil
+  STATSD = Datadog::Statsd.new() unless defined? STATSD
   def perform(user_key, first_time = false)
+    STATSD.increment('ghntfr.workers.notifications_checker.start')
     @new_events = []
     puts 'Started processing ' + user_key
     @first_time = first_time
@@ -137,7 +140,7 @@ def perform(user_key, first_time = false)
       end
       enqueue_email_builder(user) unless @first_time
     end
-
+    STATSD.increment('ghntfr.workers.notifications_checker.finish')
   end
 
   def on_new_event(type, entity)

workers/send_email.rb

@@ -15,11 +15,14 @@
 # This is merely a workaround since
 # it should fixed by not using the `autoload`
 require "mail/parsers/content_type_parser"
+require 'datadog/statsd'
 
 class SendEmail
   include Sidekiq::Worker
   sidekiq_options :queue => :send_email
+  STATSD = Datadog::Statsd.new() unless defined? STATSD
   def perform(to, subject, content_type = 'text', template = nil, locals = {}, delete_key = nil, lock_key = nil, lock_id = nil, user_id = nil)
+    STATSD.increment('ghntfr.workers.send_email.start')
 
     raise "Missing template!" unless template
 
@@ -74,6 +77,7 @@ def perform(to, subject, content_type = 'text', template = nil, locals = {}, del
       conn.zadd(lock_key, Time.now.to_i, JSON.generate(lock_id)) if lock_id
     end
   end
+  STATSD.increment('ghntfr.workers.send_email.finish')
 end
 
 def strip_html(string)