From afb5694ed695a5bb7eddebdb200bf680cd341140 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 3 Sep 2020 15:24:08 +0530
Subject: [PATCH] chore: Enable runtime metrics on Heroku (#1178)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 Gemfile                                                 | 2 ++
 Gemfile.lock                                            | 5 +++++
 app/builders/messages/facebook/message_builder.rb       | 2 +-
 app/controllers/api/v1/accounts/callbacks_controller.rb | 2 +-
 app/jobs/contact_avatar_job.rb                          | 2 +-
 app/services/twilio/incoming_message_service.rb         | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 591630a82..86a8e65b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,8 @@ gem 'dotenv-rails'
 gem 'foreman'
 gem 'puma'
 gem 'webpacker', '~> 5.x'
+# metrics on heroku
+gem 'barnes'
 
 ##--- gems for authentication & authorization ---##
 gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index fc5c613bb..2ef8c6297 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -122,6 +122,9 @@ GEM
       faraday (~> 1.0)
       faraday_middleware (~> 1.0.0.rc1)
       nokogiri (~> 1.10.4)
+    barnes (0.0.8)
+      multi_json (~> 1)
+      statsd-ruby (~> 1.1)
     bcrypt (3.1.13)
     bindex (0.8.1)
     bootsnap (1.4.6)
@@ -485,6 +488,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    statsd-ruby (1.4.0)
     telegram-bot-ruby (0.12.0)
       faraday
       inflecto
@@ -558,6 +562,7 @@ DEPENDENCIES
   attr_extras
   aws-sdk-s3
   azure-storage-blob
+  barnes
   bootsnap
   brakeman
   browser
diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index 8566dc4b0..aa232d2e1 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -50,7 +50,7 @@ class Messages::Facebook::MessageBuilder
   def attach_file(attachment, file_url)
     file_resource = LocalResource.new(file_url)
     attachment.file.attach(io: file_resource.file, filename: file_resource.tmp_filename, content_type: file_resource.encoding)
-  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
+  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, SocketError => e
     Rails.logger.info "invalid url #{file_url} : #{e.message}"
   end
 
diff --git a/app/controllers/api/v1/accounts/callbacks_controller.rb b/app/controllers/api/v1/accounts/callbacks_controller.rb
index 812646bfd..37116d8d0 100644
--- a/app/controllers/api/v1/accounts/callbacks_controller.rb
+++ b/app/controllers/api/v1/accounts/callbacks_controller.rb
@@ -81,7 +81,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
 
     avatar_resource = LocalResource.new(uri)
     facebook_inbox.avatar.attach(io: avatar_resource.file, filename: avatar_resource.tmp_filename, content_type: avatar_resource.encoding)
-  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
+  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, SocketError => e
     Rails.logger.info "invalid url #{file_url} : #{e.message}"
   end
 
diff --git a/app/jobs/contact_avatar_job.rb b/app/jobs/contact_avatar_job.rb
index 0cd88027e..b9b59a456 100644
--- a/app/jobs/contact_avatar_job.rb
+++ b/app/jobs/contact_avatar_job.rb
@@ -4,7 +4,7 @@ class ContactAvatarJob < ApplicationJob
   def perform(contact, avatar_url)
     avatar_resource = LocalResource.new(avatar_url)
     contact.avatar.attach(io: avatar_resource.file, filename: avatar_resource.tmp_filename, content_type: avatar_resource.encoding)
-  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
+  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, SocketError => e
     Rails.logger.info "invalid url #{file_url} : #{e.message}"
   end
 end
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index 0f51eca0a..d9418f61e 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -107,7 +107,7 @@ class Twilio::IncomingMessageService
     )
 
     @message.save!
-  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
+  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, SocketError => e
     Rails.logger.info "invalid url #{file_url} : #{e.message}"
   end
 end