lib/alephant/publisher/request/connection.rb in alephant-publisher-request-0.2.2 vs lib/alephant/publisher/request/connection.rb in alephant-publisher-request-0.2.3

@@ -1,35 +1,48 @@
 require "alephant/logger"
+require "alephant/publisher/request/log_helper"
 
 module Alephant
   module Publisher
     module Request
       class Connection
         include Logger
+        include Alephant::Publisher::Request::LogHelper
         attr_reader :driver
 
         def initialize(driver)
           @driver = driver
         end
 
         def get(uri)
-          before   = Time.new
-          response = driver.get(uri)
-          logger.metric(:name => "PublisherRequestDataMapperRequestHTTPTime", :unit => 'Seconds', :value => Time.new - before)
-          raise InvalidApiStatus, response.status unless response.status == 200
-          JSON::parse(response.body, :symbolize_names => true)
-        rescue Faraday::ConnectionFailed
-          logger.metric(:name => "PublisherRequestDataMapperConnectionFailed", :unit => "Count", :value => 1)
+          JSON::parse(request(uri).body, :symbolize_names => true)
+        rescue Faraday::ConnectionFailed => e
+          log_error_with_metric(e, 'DataMapper#request', uri, "PublisherRequestDataMapperConnectionFailed")
           raise ConnectionFailed
-        rescue JSON::ParserError
-          logger.metric(:name => "PublisherRequestDataMapperInvalidApiResponse", :unit => "Count", :value => 1)
-          raise InvalidApiResponse, "JSON parsing error: #{response.body}"
         rescue InvalidApiStatus => e
-          logger.metric(:name => "PublisherRequestDataMapperInvalidStatus#{e.status}", :unit => "Count", :value => 1)
+          log_error_with_metric(e, 'DataMapper#request', uri, "PublisherRequestDataMapperInvalidStatus#{e.status}")
           raise e
+        rescue JSON::ParserError => e
+          log_error_with_metric(e, 'DataMapper#get', uri, "PublisherRequestDataMapperInvalidApiResponse")
+          raise InvalidApiResponse, "JSON parsing error: #{response.body}"
         rescue StandardError => e
-          logger.metric(:name => "PublisherRequestDataMapperApiError", :unit => "Count", :value => 1)
+          log_error_with_metric(e, 'DataMapper#get', uri, "PublisherRequestDataMapperApiError")
           raise ApiError, e.message
+        end
+
+        private
+
+        def request(uri)
+          before = Time.new
+          logger.info "Publisher::Request::DataMapper#request: uri: #{uri}"
+
+          driver.get(uri).tap do |response|
+            response_time = Time.new - before
+            logger.metric(:name => "PublisherRequestDataMapperRequestHTTPTime", :unit => 'Seconds', :value => response_time)
+            logger.info "Publisher::Request::DataMapper#request: API response time: #{response_time}"
+            logger.info "Publisher::Request::DataMapper#request: status returned: #{response.status} for #{uri}"
+            raise InvalidApiStatus, response.status unless response.status == 200
+          end
         end
       end
     end
   end
 end