lib/influxdb/rails/middleware/request_subscriber.rb in influxdb-rails-1.0.0.beta3 vs lib/influxdb/rails/middleware/request_subscriber.rb in influxdb-rails-1.0.0.beta4

@@ -2,49 +2,47 @@
 
 module InfluxDB
   module Rails
     module Middleware
       class RequestSubscriber < Subscriber # :nodoc:
-        def call(_name, start, finish, _id, payload) # rubocop:disable Metrics/MethodLength
+        def call(_name, start, finish, _id, payload)
           return unless enabled?
 
-          ts = InfluxDB.convert_timestamp(finish.utc, configuration.time_precision)
-          tags = tags(payload)
-          begin
-            series(payload, start, finish).each do |series_name, value|
-              InfluxDB::Rails.client.write_point \
-                series_name,
-                values:    { value: value },
-                tags:      tags,
-                timestamp: ts
-            end
-          rescue StandardError => e
-            log :error, "[InfluxDB::Rails] Unable to write points: #{e.message}"
-          ensure
-            InfluxDB::Rails.current.reset
-          end
+          InfluxDB::Rails.client.write_point \
+            configuration.measurement_name,
+            values:    values(start, finish, payload),
+            tags:      tags(payload),
+            timestamp: timestamp(finish)
+        rescue StandardError => e
+          ::Rails.logger.error("[InfluxDB::Rails] Unable to write points: #{e.message}")
+        ensure
+          InfluxDB::Rails.current.reset
         end
 
         private
 
-        def series(payload, start, finish)
-          {
-            configuration.series_name_for_controller_runtimes => ((finish - start) * 1000).ceil,
-            configuration.series_name_for_view_runtimes       => (payload[:view_runtime] || 0).ceil,
-            configuration.series_name_for_db_runtimes         => (payload[:db_runtime] || 0).ceil,
-          }
-        end
-
         def tags(payload)
           tags = {
             method:      "#{payload[:controller]}##{payload[:action]}",
+            hook:        "process_action",
             status:      payload[:status],
             format:      payload[:format],
             http_method: payload[:method],
             server:      Socket.gethostname,
             app_name:    configuration.application_name,
           }
           super(tags)
+        end
+
+        def values(started, finished, payload)
+          {
+            controller: ((finished - started) * 1000).ceil,
+            view:       (payload[:view_runtime] || 0).ceil,
+            db:         (payload[:db_runtime] || 0).ceil,
+            started:    timestamp(started),
+          }.merge(InfluxDB::Rails.current.values).reject do |_, value|
+            value.nil? || value == ""
+          end
         end
       end
     end
   end
 end