trashed 3.2.4 → 3.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 752e28b8c2e40e9184854dfe4106d8c6958df718
-  data.tar.gz: 9fbba453cad9c0550d509d78047cdd919272980a
+SHA256:
+  metadata.gz: d8605dfac9cdf258de2cd15e1b1dba1f64be269de8d46dc4c6c7ad3e6e344673
+  data.tar.gz: 8f9d5b604c45a801ed2872a66b187a0905a3c371fe42a32ca40e4ade49c07e6a
 SHA512:
-  metadata.gz: 4ac79924b9b01d3f202bf7a2e8aad61805816e46f4406e1f842e8cc3cf289e48506541a0b441239d1f56862ff33e94c50f288760d5b6e45da559e238ecff29c5
-  data.tar.gz: 18f6f7dce9a5bf355ddc93aa0473b50540a5217156b97509a26270798141415b1a2debe6d3754eca61ee9e4760e3b70f7c77ff38e17992f0aa53fbf49863e12a
+  metadata.gz: 84228d81e2285d328d43f5d568489fa3107639be507ff848db6816c5dfea30cf2afe193a29e8f389419324d2754a816ea6686e128df781fd52062572f3be02b5
+  data.tar.gz: f606088042009c1a068a4ef547df33ccdf4ef6ff26ce11a274e1dd8483e0ddaf8c5e30d120d9aadbecfdba98dde2b704839277dfe44f3e778057cdc55a2ba01a

data/lib/trashed/instruments/ree_gc.rb

@@ -18,7 +18,7 @@ module Trashed
 
         timings.update \
           :'GC.count'             => GC.collections - before[:gc_count],
-          :'GC.time'              => GC.time - before[:gc_time],
+          :'GC.time'              => (GC.time - before[:gc_time]) / 1000.0,
           :'GC.memory'            => GC.allocated_size - before[:gc_memory],
           :'GC.allocated_objects' => ObjectSpace.allocated_objects - before[:objects]
 

data/lib/trashed/instruments/ruby_gc.rb

@@ -6,13 +6,35 @@ module Trashed
       end
 
       MEASUREMENTS = {
-        :count => :'GC.count',
+        :count => :'GC.count'
+      }
+
+      RUBY_2X_MEASUREMENTS = {
         :major_gc_count => :'GC.major_count',
-        :minor_gc_count => :'GC.minor_gc_count',
-        :total_allocated_object => :'GC.allocated_objects',
-        :total_freed_object => :'GC.freed_objects'
+        :minor_gc_count => :'GC.minor_gc_count'
       }
 
+      # Detect Ruby 1.9, 2.1 or 2.2 GC.stat naming
+      begin
+        GC.stat :total_allocated_objects
+      rescue TypeError
+        # Ruby 1.9, nothing to do
+      rescue ArgumentError
+        # Ruby 2.1
+        MEASUREMENTS.update \
+          RUBY_2X_MEASUREMENTS.merge(
+            :total_allocated_object => :'GC.allocated_objects',
+            :total_freed_object => :'GC.freed_objects'
+          )
+      else
+        # Ruby 2.2+
+        MEASUREMENTS.update \
+          RUBY_2X_MEASUREMENTS.merge(
+            :total_allocated_objects => :'GC.allocated_objects',
+            :total_freed_objects => :'GC.freed_objects'
+          )
+      end
+
       def measure(state, timings, gauges)
         gc = GC.stat
         before = state[:ruby_gc]

data/lib/trashed/railtie.rb

@@ -28,8 +28,8 @@ module Trashed
       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
-      app.middleware.insert_after 'Rails::Rack::Logger', ExposeLoggerTagsToRackEnv
+      app.middleware.insert_after ::Rack::Runtime, Trashed::Rack, app.config.trashed
+      app.middleware.insert_after ::Rails::Rack::Logger, ExposeLoggerTagsToRackEnv
     end
   end
 end

data/lib/trashed/reporter.rb

@@ -13,8 +13,8 @@ module Trashed
       @statsd = nil
       @timing_sample_rate = 0.1
       @gauge_sample_rate = 0.05
-      @timing_dimensions  = ->(env) { DEFAULT_DIMENSIONS }
-      @gauge_dimensions   = ->(env) { DEFAULT_DIMENSIONS }
+      @timing_dimensions  = lambda { |env| DEFAULT_DIMENSIONS }
+      @gauge_dimensions   = lambda { |env| DEFAULT_DIMENSIONS }
     end
 
     def report(env)

metadata

@@ -1,99 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: trashed
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.8
 platform: ruby
 authors:
-- Jeremy Kemper
-autorequire: 
+- Jeremy Daer
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
 description: Each Rack request eats up time, objects, and GC. Report usage to logs
   and StatsD.
-email: jeremykemper@gmail.com
+email: jeremydaer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./init.rb
-- ./lib/trashed.rb
-- ./lib/trashed/instruments/gctools_oobgc.rb
-- ./lib/trashed/instruments/object_space_counter.rb
-- ./lib/trashed/instruments/ree_gc.rb
-- ./lib/trashed/instruments/ruby_gc.rb
-- ./lib/trashed/instruments/ruby_gc_profiler.rb
-- ./lib/trashed/instruments/stopwatch.rb
-- ./lib/trashed/meter.rb
-- ./lib/trashed/rack.rb
-- ./lib/trashed/railtie.rb
-- ./lib/trashed/reporter.rb
-- ./lib/trashed/resource_usage.rb
+- "./init.rb"
+- "./lib/trashed.rb"
+- "./lib/trashed/instruments/gctools_oobgc.rb"
+- "./lib/trashed/instruments/object_space_counter.rb"
+- "./lib/trashed/instruments/ree_gc.rb"
+- "./lib/trashed/instruments/ruby_gc.rb"
+- "./lib/trashed/instruments/ruby_gc_profiler.rb"
+- "./lib/trashed/instruments/stopwatch.rb"
+- "./lib/trashed/meter.rb"
+- "./lib/trashed/rack.rb"
+- "./lib/trashed/railtie.rb"
+- "./lib/trashed/reporter.rb"
+- "./lib/trashed/resource_usage.rb"
 homepage: https://github.com/basecamp/trashed
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Rack request GC stats => logs + StatsD
 test_files: []