meter 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bfa875029fe6f0a486fc8d78039e310720a795
-  data.tar.gz: a32afa1f67caa3c26ddfb17b3e8326ee3032753e
+  metadata.gz: 9d92202ec3c138c26b1735b6ff29e9d225b779f3
+  data.tar.gz: 3caff126ac19e40757e39c741062e5d694d453cc
 SHA512:
-  metadata.gz: c88b11d073e90b96033c4c91583e82c8308650467d3bf0d7e478f71782a8635d833693f4d7ba317bade1649077c12224a710a06c27400170fbe32daccc3e5978
-  data.tar.gz: 0c70247d4fac2a78b7d069cd4aec81d8c6b66519aa42ea069032fca9699e33294c3348648abe6c1b0a5683ad98833573825cf7f7f52c0ed2abf11effe4888c42
+  metadata.gz: e1176186d018a71e4cf6f0317c87da626b2993e4d106f5869faf00c41039bff4580feae626c4afd1696de9483a1179f6354992f6eec82ddb86ecec5d3fbf5e48
+  data.tar.gz: c5f8b6738c1a7b61f04e957465fe2f3d382e9adf0fc320ed480fef3727ba731a926639eea83d73cb0f2dd49711a31e83e490eafc77c0a5d76eb8ce2c5291cb13

data/lib/meter/rails/controller_instrumentation.rb

@@ -0,0 +1,42 @@
+ActiveSupport::Notifications.subscribe /process_action.action_controller/ do |*args|
+  event       = ActiveSupport::Notifications::Event.new(*args)
+  payload     = event.payload
+  controller  = payload[:controller]
+  action      = payload[:action]
+  format      = payload[:format] || 'all'
+  format      = "all" if format == "*/*"
+  http_status = payload[:status]
+
+  total_duration = event.duration.to_i
+
+  meter_tags = {
+    controller:  controller,
+    format:      format,
+    method:      payload[:method],
+    http_status: http_status
+  }
+
+  meter_data = {
+    action:      action,
+    path:        payload[:path],
+    params:      payload[:params].to_query,
+    user_id:     payload[:user].to_s,
+    duration:    total_duration
+  }
+
+  instrumented_layers = {
+    db_runtime:            :db_duration,
+    view_runtime:          :view_duration,
+    elasticsearch_runtime: :elasticsearch_duration
+  }
+
+  instrumented_layers.each do |layer, tag_value|
+    next unless payload.has_key? layer
+    duration = payload[layer].to_i
+    meter_data[tag_value] = duration
+    Meter.timing("request.layer_duration", duration, tags: meter_tags.merge(layer: tag_value))
+  end
+
+  Meter.timing "request.total_duration", total_duration, tags: meter_tags
+  Meter.track  "requests", tags: meter_tags, data: meter_data
+end

data/lib/meter/rails/middleware.rb

@@ -32,8 +32,8 @@ module Meter
 
       def store_geoip_data(request)
         lookup = Locality::IP.new request.ip
-        Meter::MDC.tags['geoip_country'] = lookup.country_name
-        Meter::MDC.data['geoip_city']    = lookup.city_name
+        Meter::MDC.tags['geoip_country'] = lookup.country_name if lookup.country_name
+        Meter::MDC.data['geoip_city']    = lookup.city_name    if lookup.city_name
         Meter::MDC.data['geoip_coords']  = "#{lookup.latitude},#{lookup.longitude}" if lookup.latitude && lookup.longitude
       end
     end

data/lib/meter/version.rb

@@ -2,7 +2,7 @@ module Meter
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meter
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - bukowskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: useragent
@@ -117,6 +117,7 @@ files:
 - lib/meter/metric/gauge.rb
 - lib/meter/metric/histogram.rb
 - lib/meter/metric/timing.rb
+- lib/meter/rails/controller_instrumentation.rb
 - lib/meter/rails/middleware.rb
 - lib/meter/rails/railtie.rb
 - lib/meter/version.rb