trashed 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 403348c2e748309e00d851be66bd0428116c9961
-  data.tar.gz: ad21d476079f3aa50de9290d2ee338e060df9fd7
+  metadata.gz: fd60c1035b68ae01277826155e500c675958f97a
+  data.tar.gz: 264984b670dcceaecaf6054eeba872e78f412ff3
 SHA512:
-  metadata.gz: 14c777b0892850a0402d084919b3fabf9932f812f6a41085985ca83ad4cc38d35c495b72ba7bd6cae8fd5de1c366342aa6fc2dfe5103b1f1574e1cb8445ac3de
-  data.tar.gz: d51091fb467bc565d4b4aa854ca509745d8aed287c577aaf1498ca37793a1a6a1d12515fff7a37670ef330c1addf0b6ad784ba7afc40b0165e5612a6fdc380fe
+  metadata.gz: aca33bba6021edcb5e1f363209604884f6f64de06c9b97f87095064562f3bb3faf0e6e9feda39a8980a7fa381f39c0aa5afa7cc5fc5cb578c46a9dd5a8a084d4
+  data.tar.gz: 3a3ec7763247d51dcd5f020ede1abc9fb6d04e77a7e2b841d9a8c3d9e147ac105714b61c3cd904d62f4e9faafb0c08e8e50e8da1a960e9c6a97e01f757cbe4b7

data/lib/trashed/instruments/gctools_oobgc.rb

@@ -6,10 +6,10 @@ module Trashed
         last = state[:persistent][:oobgc] || Hash.new(0)
 
         current = {
-          :count => GC::OOB.stat(:count),
-          :major => GC::OOB.stat(:major),
-          :minor => GC::OOB.stat(:minor),
-          :sweep => GC::OOB.stat(:sweep) }
+          :count => GC::OOB.stat(:count).to_i,
+          :major => GC::OOB.stat(:major).to_i,
+          :minor => GC::OOB.stat(:minor).to_i,
+          :sweep => GC::OOB.stat(:sweep).to_i }
 
         timings.update \
           :'OOBGC.count'        => current[:count] - last[:count],

data/lib/trashed/instruments/ruby_gc_profiler.rb

@@ -17,12 +17,7 @@ module Trashed
 
         if @has_raw_data
           timings[:"#{captured}.count"] ||= GC::Profiler.raw_data.size
-
           timings[:'GC.interval'] = GC::Profiler.raw_data.map { |data| data[:GC_INVOKE_TIME] }
-
-          GC::Profiler.raw_data.each do |data|
-            gauges.concat data.map { |k, v| [ :"GC.Profiler.#{k}", v ] }
-          end
         end
 
         GC::Profiler.clear

data/lib/trashed/meter.rb

@@ -3,8 +3,8 @@ module Trashed
     attr_reader :instruments
 
     def initialize
-      @instruments = []
-      @needs_start = []
+      @timers = []
+      @gauges = []
     end
 
     # Counters increase, so we measure before/after differences.
@@ -20,14 +20,18 @@ module Trashed
     end
 
     def instrument(instrument)
-      @instruments << instrument
-      @needs_start << instrument if instrument.respond_to?(:start)
+      if instrument.respond_to?(:start)
+        @timers << instrument
+      else
+        @gauges << instrument
+      end
     end
 
     def instrument!(state, timings, gauges)
-      @needs_start.each { |i| i.start state, timings, gauges }
+      @timers.each { |i| i.start state, timings, gauges }
       yield.tap do
-        @instruments.reverse_each { |i| i.measure state, timings, gauges }
+        @timers.reverse_each { |i| i.measure state, timings, gauges }
+        @gauges.each { |i| i.measure state, timings, gauges }
       end
     end
 

data/lib/trashed/rack.rb

@@ -7,7 +7,7 @@ module Trashed
     def initialize(app, reporter, options = {})
       @reporter = reporter
       @meters = Array(options.fetch(:meters, [ResourceUsage]))
-      @app = build_sampled_instrumented_app(app, @meters)
+      @app = build_instrumented_app(app, @meters)
     end
 
     def call(env)
@@ -23,20 +23,6 @@ module Trashed
       Thread.current[:trashed_rack_state] ||= {}
     end
 
-    def build_sampled_instrumented_app(app, meters)
-      build_sampled_app app, build_instrumented_app(app, meters)
-    end
-
-    def build_sampled_app(app, instrumented)
-      lambda do |env|
-        if @reporter.sample? env
-          instrumented.call env
-        else
-          app.call env
-        end
-      end
-    end
-
     def build_instrumented_app(app, meters)
       meters.inject app do |wrapped, meter|
         lambda do |env|

data/lib/trashed/railtie.rb

@@ -24,7 +24,8 @@ module Trashed
     initializer 'trashed' do |app|
       require 'statsd'
 
-      app.config.trashed.sample_rate ||= 1.0
+      app.config.trashed.timing_sample_rate ||= 0.1
+      app.config.trashed.gauge_sample_rate ||= 0.05
       app.config.trashed.logger ||= Rails.logger
 
       app.middleware.insert_after 'Rack::Runtime', Trashed::Rack, app.config.trashed

data/lib/trashed/reporter.rb

@@ -2,7 +2,8 @@ require 'trashed/rack'
 
 module Trashed
   class Reporter
-    attr_accessor :logger, :statsd, :sample_rate
+    attr_accessor :logger, :statsd
+    attr_accessor :timing_sample_rate, :gauge_sample_rate
     attr_accessor :timing_dimensions, :gauge_dimensions
 
     DEFAULT_DIMENSIONS = [ :All ]
@@ -10,21 +11,12 @@ module Trashed
     def initialize
       @logger = nil
       @statsd = nil
-      @sample_rate = 1.0
+      @timing_sample_rate = 0.1
+      @gauge_sample_rate = 0.05
       @timing_dimensions  = ->(env) { DEFAULT_DIMENSIONS }
       @gauge_dimensions   = ->(env) { DEFAULT_DIMENSIONS }
     end
 
-    # Override in subclasses. Be sure to `super && ...` if you want to rely
-    # on the sample_rate.
-    def sample?(env = nil)
-      random_sample?
-    end
-
-    def random_sample?
-      @sample_rate == 1 or rand < @sample_rate
-    end
-
     def report(env)
       report_logger env if @logger
       report_statsd env if @statsd
@@ -80,13 +72,14 @@ module Trashed
     end
 
     def report_statsd(env)
-      @statsd.batch do |statsd|
-        send_to_statsd statsd, :timing, env[Trashed::Rack::TIMINGS], :'Rack.Request', @timing_dimensions.call(env)
-        send_to_statsd statsd, :gauge,  env[Trashed::Rack::GAUGES],  :'Rack.Server',  @gauge_dimensions.call(env)
+      method = @statsd.respond_to?(:easy) ? :easy : :batch
+      @statsd.send(method) do |statsd|
+        send_to_statsd statsd, :timing, @timing_sample_rate, env[Trashed::Rack::TIMINGS], :'Rack.Request', @timing_dimensions.call(env)
+        send_to_statsd statsd, :timing, @gauge_sample_rate,  env[Trashed::Rack::GAUGES],  :'Rack.Server',  @gauge_dimensions.call(env)
       end
     end
 
-    def send_to_statsd(statsd, method, measurements, namespace, dimensions)
+    def send_to_statsd(statsd, method, sample_rate, measurements, namespace, dimensions)
       measurements.each do |metric, value|
         case value
         when Array
@@ -95,7 +88,7 @@ module Trashed
           end
         when Numeric
           Array(dimensions || :All).each do |dimension|
-            statsd.send method, :"#{namespace}.#{dimension}.#{metric}", value, @sample_rate
+            statsd.send method, :"#{namespace}.#{dimension}.#{metric}", value, sample_rate
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trashed
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Jeremy Kemper