meter 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa7c2dcd6179f6f90438097a4b5e4c0ffd6ee900
-  data.tar.gz: d18165ffd183652093b2e2cab2c9267780f92a0f
+SHA256:
+  metadata.gz: c623ec75b3dbafa90e381faf47007b7cedf897ab9713ff45b4b7d274280054a2
+  data.tar.gz: 4acb548008b84b1c5019a33534fa5320c96a0b942b043f0a8ed6bf57c41dfc1a
 SHA512:
-  metadata.gz: 375aa514949f39ec0628622c347e1aae8c6c47dbfd0c466d8db73dd033af10b7995f1f8f91dc9a6601657be5aa12fd24f8f82cccb04e78dad4c4a1dc82e06ba6
-  data.tar.gz: 380808d540765cb5dc19653a49577b0297e3c036ea02487059367152bc82ad8655523a9587f46d6a977cd98c6de87d49b91312da499b8934d22a85f628fcd5d0
+  metadata.gz: caa06fd4a0e6afded4227c7c159fa411137db1d2a2a08895688f0dd5a471411a987efb56187af62e3ab122f109cb23db31cf348cd9aa0c5434076b5d2506c53d
+  data.tar.gz: a3403fc15edd7e29205cf905d6d6d69f4fa47965df3d72a92ecad96fb98bfb50f39c06cf4894c6d38bb260b88658690ec928e41dca3a811d7891da389b5c2387

data/lib/meter.rb

@@ -3,6 +3,7 @@ require 'meter/backends/udp'
 require 'meter/backends/statsd'
 require 'meter/backends/datadog'
 require 'meter/backends/json_log'
+require 'meter/backends/logger'
 require 'meter/configure'
 require 'meter/mdc'
 require 'meter/metric/base'

data/lib/meter/backends/datadog.rb

@@ -5,7 +5,7 @@ module Meter
     class Datadog < ::Meter::Backends::Statsd
 
       def self.supported_metrics
-        [:log, :counter, :gauge, :timing, :histogram]
+        [:counter, :gauge, :timing, :histogram]
       end
 
       def convert_to_backend_format(metric)
@@ -19,7 +19,7 @@ module Meter
       end
 
       def statsd_type(metric)
-        types = {log: 'c', counter: 'c', gauge: 'g', timing: 'ms', histogram: 'h'}
+        types = {counter: 'c', gauge: 'g', timing: 'ms', histogram: 'h'}
         types[metric.type]
       end
 

data/lib/meter/backends/logger.rb

@@ -0,0 +1,21 @@
+module Meter
+  module Backends
+    class Logger < ::Meter::Backends::Base
+      def self.supported_metrics
+        [:log]
+      end
+
+      def convert_to_backend_format(metric)
+        {
+          statname:    metric.name,
+          metric_type: metric.type,
+          metric_value: metric.value
+        }.merge(metric.data).merge(metric.tags)
+      end
+
+      def output_data(data)
+        ::Meter.config.logger.info payload: data
+      end
+    end
+  end
+end

data/lib/meter/rails/controller_instrumentation.rb

@@ -4,38 +4,21 @@ ActiveSupport::Notifications.subscribe /process_action.action_controller/ do |*a
   controller  = payload[:controller]
   action      = payload[:action]
   format      = payload[:format] || 'all'
-  format      = "all" if format == "*/*"
+  format      = 'all' if format == '*/*'
   http_status = payload[:status]
 
   total_duration = event.duration.to_i
 
-  meter_tags = {
+  meter_data = {
     controller:  controller,
     format:      format,
     method:      payload[:method],
-    http_status: http_status
-  }
-
-  meter_data = {
+    http_status: http_status,
     action:      action,
     path:        payload[:path],
     params:      payload[:params].to_query,
     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
+  Meter.log 'requests', data: meter_data
 end

data/lib/meter/rails/middleware.rb

@@ -27,9 +27,9 @@ module Meter
 
       def store_user_agent_data(request)
         user_agent = UserAgent.parse(request.user_agent)
-        Meter::MDC.tags['user_agent_name']     = user_agent.browser
-        Meter::MDC.tags['user_agent_platform'] = user_agent.platform
-        Meter::MDC.tags['user_agent_bot']      = user_agent.bot?
+        Meter::MDC.data['user_agent_name']     = user_agent.browser
+        Meter::MDC.data['user_agent_platform'] = user_agent.platform
+        Meter::MDC.data['user_agent_bot']      = user_agent.bot?
         Meter::MDC.data['user_agent_version']  = "#{user_agent.browser}_#{user_agent.version}"
 
         Meter::MDC.data['user_agent']          = user_agent.to_s
@@ -37,7 +37,7 @@ module Meter
 
       def store_geoip_data(request)
         lookup = Locality::IP.new request.ip
-        Meter::MDC.tags['geoip_country'] = lookup.country_name if lookup.country_name
+        Meter::MDC.data['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

data/lib/meter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meter
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - bukowskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: useragent
@@ -107,6 +107,7 @@ files:
 - lib/meter/backends/base.rb
 - lib/meter/backends/datadog.rb
 - lib/meter/backends/json_log.rb
+- lib/meter/backends/logger.rb
 - lib/meter/backends/statsd.rb
 - lib/meter/backends/udp.rb
 - lib/meter/configuration.rb
@@ -143,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A generic abstraction layer for fire and forgetting measurements via UDP.