trashed 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 8a76c1137b987b5c2e00ce832d90a32ed952d72b
-  data.tar.gz: 0530e17d53650ef1da7787f8f658b2eb93ecbaf0
+  metadata.gz: fc92cf23f413c7dbc13b7e974f0ff667050296dd
+  data.tar.gz: 83a9dacf210062f9aec4d1632095989ec20be08b
 SHA512:
-  metadata.gz: 1e39ad89bdd197f0fffaf9367778d32c48fe2bfa55e70fc11c648837979eadccc94014d5bc0a237ed97b68bc7901460bad8d166caf915a84880638d47b28e1a3
-  data.tar.gz: b1d891fe71584f900ba80adcd3d0a4a73472b1b3a46173341a10c678fa546eb21c314ed4581c8574000ffb621cfff5c096181f5594a12d9ac9436b4799eb5ed1
+  metadata.gz: a13685415df07c31c6b3a95afc25ac2b22c18325b8b799c9b3eb4fca7a4bf805bc0c5bf4acb5f787f4a401214b3c79e05f5d5464deb33936cc5488fbe5934d2f
+  data.tar.gz: ad71d73f6ded5cd28c032b54b45ccec80eccbd2cf129c50582740b0d187331fa8af13db2384e26312b4ba8721f37ee11a098c6fa886280e2b03d7e48e3d71ea3

data/lib/trashed/rack.rb

@@ -7,14 +7,7 @@ module Trashed
     def initialize(app, reporter, options = {})
       @reporter = reporter
       @meters = Array(options.fetch(:meters, [ResourceUsage]))
-      @logger, @statsd, @sample_rate = options.values_at(:logger, :statsd_instance, :sample_rate)
-      @sample_rate ||= 1.0
-
-      @request_namespaces = options[:statsd_request_namespaces]
-      @sampler_namespaces = options[:statsd_sampler_namespaces]
-
-      # Wrap the app up in the meters.
-      @app = build_instrumented_app(app, @meters)
+      @app = build_sampled_instrumented_app(app, @meters)
     end
 
     def call(env)
@@ -26,6 +19,20 @@ module Trashed
     end
 
     private
+    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/reporter.rb

@@ -15,17 +15,24 @@ module Trashed
       @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
     end
 
     def report_logger(env)
-      elapsed = env[Trashed::Rack::TIMINGS].assoc(:'Time.wall')
-      gc_runs = env[Trashed::Rack::TIMINGS].assoc(:'GC.count')
-      if elapsed && gc_runs
-        @logger.info "Rack handled in %dms (GC runs: %d)" % [elapsed[1], gc_runs[1]]
-      end
+      timings = env[Trashed::Rack::TIMINGS]
+      @logger.info "Rack handled in %dms (GC runs: %d)" % timings.values_at(:'Time.wall', :'GC.count')
     end
 
     def report_statsd(env)

metadata

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