trashed 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: abfbb3ba8576bac0d578d9821479635dda52e57b
-  data.tar.gz: b5439fd5e664b3f439860b6fd6dd548248d1594c
+  metadata.gz: 8a76c1137b987b5c2e00ce832d90a32ed952d72b
+  data.tar.gz: 0530e17d53650ef1da7787f8f658b2eb93ecbaf0
 SHA512:
-  metadata.gz: 7748860b9937a18abcffb575cb51a2cfb0ed352b9d1ffb824dceafa67a47c22afbfd4bfd1d4e89974f20e5137996cd4ae65cc7285bc3e9c7eef117fb92a8cbf9
-  data.tar.gz: 6af120ce83a1048254fc0df2d41f1cef0c32bfd99c9ea81eb5bd1ef063562c447f32bf28e137e23d92f8e712f11536bc4f85b5d49c7d7f9451c86edd2e306349
+  metadata.gz: 1e39ad89bdd197f0fffaf9367778d32c48fe2bfa55e70fc11c648837979eadccc94014d5bc0a237ed97b68bc7901460bad8d166caf915a84880638d47b28e1a3
+  data.tar.gz: b1d891fe71584f900ba80adcd3d0a4a73472b1b3a46173341a10c678fa546eb21c314ed4581c8574000ffb621cfff5c096181f5594a12d9ac9436b4799eb5ed1

data/lib/trashed/instruments/object_space_counter.rb

@@ -0,0 +1,11 @@
+module Trashed
+  module Instruments
+    class ObjectSpaceCounter
+      def measure(state, timings, gauges)
+        ObjectSpace.count_objects.each do |type, count|
+          gauges << [ :"Objects.#{type}", count ]
+        end
+      end
+    end
+  end
+end

data/lib/trashed/instruments/ree_gc.rb

@@ -0,0 +1,28 @@
+module Trashed
+  module Instruments
+    class Ruby18GC
+      def initialize
+        GC.enable_stats
+      end
+
+      def start(state)
+        state.update \
+          :'Objects.total' => ObjectSpace.allocated_objects,
+          :'GC.count'      => GC.collections,
+          :'GC.elapsed'    => GC.time,
+          :'GC.memory'     => GC.allocated_size
+      end
+
+      def measure(state, timings, gauges)
+        timings.update \
+          :'Objects.total' => ObjectSpace.allocated_objects - state[:'Objects.total'],
+          :'GC.count'      => GC.collections - state[:'GC.count'],
+          :'GC.elapsed'    => GC.time - state[:'GC.elapsed'],
+          :'GC.memory'     => GC.allocated_size - state[:'GC.memory']
+
+        gauges << [ :'Objects.live',  ObjectSpace.live_objects ]
+        gauges << [ :'GC.growth',     GC.growth ]
+      end
+    end
+  end
+end

data/lib/trashed/instruments/ruby19_gc.rb

@@ -0,0 +1,16 @@
+module Trashed
+  module Instruments
+    class Ruby19GC
+      def start(state)
+        gc = GC.stat
+        state[:'GC.count'] = gc[:count]
+      end
+
+      def measure(state, timings, gauges)
+        gc = GC.stat
+        timings[:'GC.count'] = gc[:count] - state.delete(:'GC.count')
+        gauges.concat gc.map { |k, v| [ :"GC.#{k}", v ] }
+      end
+    end
+  end
+end

data/lib/trashed/instruments/ruby20_gc.rb

@@ -0,0 +1,24 @@
+module Trashed
+  module Instruments
+    class Ruby20GC
+      def start(state)
+        gc = GC.stat
+        state.update \
+          :'GC.count'             => gc[:count],
+          :'GC.allocated_objects' => gc[:total_allocated_object],
+          :'GC.freed_objects'     => gc[:total_freed_object]
+      end
+
+      def measure(state, timings, gauges)
+        gc = GC.stat
+
+        timings.update \
+          :'GC.count'             => gc[:count] - state.delete(:'GC.count'),
+          :'GC.allocated_objects' => gc[:total_allocated_object] - state.delete(:'GC.allocated_objects'),
+          :'GC.freed_objects'     => gc[:total_freed_object] - state.delete(:'GC.freed_objects')
+
+        gauges.concat gc.map { |k, v| [ :"GC.#{k}", v ] }
+      end
+    end
+  end
+end

data/lib/trashed/instruments/ruby21_gc.rb

@@ -0,0 +1,28 @@
+module Trashed
+  module Instruments
+    class Ruby21GC
+      def start(state)
+        gc = GC.stat
+        state.update \
+          :'GC.count'             => gc[:count],
+          :'GC.major_count'       => gc[:major_gc_count],
+          :'GC.minor_count'       => gc[:minor_gc_count],
+          :'GC.allocated_objects' => gc[:total_allocated_object],
+          :'GC.freed_objects'     => gc[:total_freed_object]
+      end
+
+      def measure(state, timings, gauges)
+        gc = GC.stat
+
+        timings.update \
+          :'GC.count'             => gc[:count] - state.delete(:'GC.count'),
+          :'GC.major_count'       => gc[:major_gc_count] - state.delete(:'GC.major_count'),
+          :'GC.minor_count'       => gc[:minor_gc_count] - state.delete(:'GC.minor_count'),
+          :'GC.allocated_objects' => gc[:total_allocated_object] - state.delete(:'GC.allocated_objects'),
+          :'GC.freed_objects'     => gc[:total_freed_object] - state.delete(:'GC.freed_objects')
+
+        gauges.concat gc.map { |k, v| [ :"GC.#{k}", v ] }
+      end
+    end
+  end
+end

data/lib/trashed/instruments/ruby_gc_profiler.rb

@@ -0,0 +1,27 @@
+module Trashed
+  module Instruments
+    class RubyGCProfiler
+      def initialize
+        @has_raw_data = GC::Profiler.respond_to?(:raw_data)
+      end
+
+      def start(state)
+        GC::Profiler.enable
+        GC::Profiler.clear
+      end
+
+      def measure(state, timings, gauges)
+        timings[:'GC.time'] = GC::Profiler.total_time
+
+        if @has_raw_data
+          GC::Profiler.raw_data.each do |data|
+            gauges.concat data.map { |k, v| [ :"GC.Profiler.#{k}", v ] }
+          end
+        end
+
+        GC::Profiler.disable
+        GC::Profiler.clear
+      end
+    end
+  end
+end

data/lib/trashed/instruments/stopwatch.rb

@@ -0,0 +1,44 @@
+module Trashed
+  module Instruments
+    class Stopwatch
+      def initialize(timepiece = Timepiece)
+        @timepiece = timepiece
+        @has_cpu_time = timepiece.respond_to?(:cpu)
+      end
+
+      def start(state)
+        state[:'Time.wall'] = @timepiece.wall
+        state[:'Time.cpu']  = @timepiece.cpu if @has_cpu_time
+      end
+
+      def measure(state, timings, gauges)
+        wall_elapsed = @timepiece.wall - state.delete(:'Time.wall')
+        timings[:'Time.wall'] = wall_elapsed
+        if @has_cpu_time
+          cpu_elapsed = @timepiece.cpu - state.delete(:'Time.cpu')
+          timings[:'Time.cpu'] = cpu_elapsed
+          timings[:'Time.idle'] = wall_elapsed - cpu_elapsed
+        end
+      end
+    end
+
+    module Timepiece
+      def self.wall
+        (::Time.now.to_f * 1000).to_i
+      end
+
+      # Ruby 2.1+
+      if Process.respond_to?(:clock_gettime)
+        def self.cpu
+          Process.clock_gettime Process::CLOCK_PROCESS_CPUTIME_ID, :millisecond
+        end
+
+      # ruby-prof installed
+      elsif defined? RubyProf::Measure::ProcessTime
+        def self.cpu
+          (RubyProf::Measure::Process.measure * 1000).to_i
+        end
+      end
+    end
+  end
+end

data/lib/trashed/meter.rb

@@ -1,40 +1,58 @@
 module Trashed
   class Meter
-    attr_reader :counters, :gauges
+    attr_reader :instruments
 
-    def initialize(&block)
-      @counters, @gauges = {}, {}
-      instance_eval(&block) if block_given?
+    def initialize
+      @instruments = []
+      @needs_start = []
     end
 
-    def counts(name, &block) @counters[name] = block end
-    def count; read @counters end
+    # Counters increase, so we measure before/after differences.
+    # Time elapsed, memory growth, objects allocated, etc.
+    def counts(name, &block)
+      instrument ChangeInstrument.new(name, block)
+    end
+
+    # Gauges measure point-in-time values.
+    # Heap size, live objects, GC count, etc.
+    def gauges(name, &block)
+      instrument GaugeInstrument.new(name, block)
+    end
 
-    def gauges(name, &block) @gauges[name] = block end
-    def gauge; read @gauges end
+    def instrument(instrument)
+      @instruments << instrument
+      @needs_start << instrument if instrument.respond_to?(:start)
+    end
 
-    def instrument
-      before = count
-      yield
-      delta before, count
+    def instrument!(state, timings, gauges)
+      @needs_start.each { |i| i.start state }
+      yield.tap do
+        @instruments.reverse_each { |i| i.measure state, timings, gauges }
+      end
     end
 
-    private
+    class ChangeInstrument
+      def initialize(name, probe)
+        @name, @probe = name, probe
+      end
 
-    def delta(before, after)
-      delta = {}
-      after.each { |k, v| delta[k] = v - before[k] }
-      delta
+      def start(state)
+        state[@name] = @probe.call
+      end
+
+      def measure(state, timings, gauges)
+        timings[@name] = @probe.call - state[@name]
+      end
     end
 
-    def read(measures)
-      data = {}
-      measures.each do |name, measure|
-        measure.call.each do |key, value|
-          data["#{name}.#{key}"] = value
-        end
+    class GaugeInstrument
+      def initialize(name, probe)
+        @name, @probe = name, probe
+      end
+
+      def measure(state, timings, gauges)
+        gauges << [ @name, @probe.call ]
       end
-      data
     end
   end
 end

data/lib/trashed/rack.rb

@@ -1,64 +1,37 @@
-module Trashed
-  module Rack
-    class MeasureResourceUsage
-      def initialize(app, options = {})
-        @app = app
-        @debug, @logger, @statsd, @sample_rate = options.values_at(:debug, :logger, :statsd, :sample_rate)
-        @sample_rate ||= 0.1
-
-        @request_namespaces, @sampler_namespaces = options.values_at(:statsd_request_namespaces, :statsd_sampler_namespaces)
-      end
-
-      def call(env)
-        response = nil
-        instrument(env) { response = @app.call(env) }
-        response
-      end
-
-      def instrument(env, &block)
-        change = ResourceUsage.instrument(&block)
-        usage  = ResourceUsage.gauge
-        record env, change, usage
-      end
-
-      def record(env, change, usage)
-        record_env    env, change, usage
-        record_logger env, change, usage if @logger
-        record_statsd env, change, usage if @statsd
-      end
+require 'trashed/resource_usage'
 
-      def record_env(env, change, usage)
-        env['trashed.change'] = change
-        env['trashed.usage']  = usage
-      end
+module Trashed
+  class Rack
+    STATE, TIMINGS, GAUGES = 'trashed.state', 'trashed.timings', 'trashed.gauges'
 
-      def record_logger(env, change, usage)
-        @logger.info "Rack handled in %dms (GC runs: %d)" % change.values_at('Time.wall', 'GC.count')
-        record_debug_logger env, change, usage if @debug
-      end
+    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
 
-      def record_debug_logger(env, change, usage)
-        @logger.debug "Changes: #{change.to_yaml}"
-        @logger.debug "Usage: #{usage.to_yaml}"
-      end
+      @request_namespaces = options[:statsd_request_namespaces]
+      @sampler_namespaces = options[:statsd_sampler_namespaces]
 
-      def record_statsd(env, change, usage)
-        record_statsd_timing change, :'Rack.Request.All'
-        record_statsd_timing usage,  :'Rack.Server.All'
+      # Wrap the app up in the meters.
+      @app = build_instrumented_app(app, @meters)
+    end
 
-        Array(@request_namespaces.call(env)).each do |namespace|
-          record_statsd_timing change, "Rack.Request.#{namespace}"
-        end if @request_namespaces
+    def call(env)
+      env[STATE]   = {}
+      env[TIMINGS] = {}
+      env[GAUGES]  = []
 
-        Array(@sampler_namespaces.call(env)).each do |namespace|
-          record_statsd_timing usage, "Rack.Server.#{namespace}"
-        end if @sampler_namespaces
-      end
+      @app.call(env).tap { @reporter.report env }
+    end
 
-      def record_statsd_timing(data, namespace = nil)
-        data.each do |name, value|
-          name = "#{namespace}.#{name}" if namespace
-          @statsd.timing name, value, @sample_rate
+    private
+    def build_instrumented_app(app, meters)
+      meters.inject app do |wrapped, meter|
+        lambda do |env|
+          meter.instrument! env[STATE], env[TIMINGS], env[GAUGES] do
+            wrapped.call env
+          end
         end
       end
     end

data/lib/trashed/railtie.rb

@@ -1,61 +1,18 @@
-require 'trashed'
 require 'rails/railtie'
-require 'active_support/ordered_options'
+require 'trashed/rack'
+require 'trashed/reporter'
 
 module Trashed
   class Railtie < ::Rails::Railtie
-    config.trashed = ActiveSupport::OrderedOptions.new
-    config.trashed.statsd = ActiveSupport::OrderedOptions.new
+    config.trashed = Trashed::Reporter.new
 
     initializer 'trashed' do |app|
-      # Debug data sent to statsd. Class-level config only :/
-      Statsd.logger = app.config.trashed.logger if app.config.trashed.debug
-
-      app.config.trashed.sample_rate ||= 0.1
-      app.config.trashed.logger = Rails.logger
-      app.config.trashed.statsd = connect_to_statsd(app.config.trashed.statsd)
-
-      app.config.trashed.statsd_request_namespaces = lambda do |env|
-        # Rails 3.2. Record request controller, action, and format.
-        if controller = env['action_controller.instance']
-          name    = controller.controller_name
-          action  = controller.action_name
-          format  = controller.request.format.try(:to_sym)
-          [ "Controllers.#{name}",
-            "Formats.#{format}",
-            "Actions.#{name}.#{action}.#{format}" ]
-        end
-      end
-
-      hostname = `hostname -s`.chomp
-      app.config.trashed.statsd_sampler_namespaces = lambda do |env|
-        # Rails 3.2. Record hostname.
-        [ "Hosts.#{hostname}" ]
-      end
-    end
-
-    initializer 'trashed.middleware', :after => 'trashed', :before => 'trashed.newrelic' do |app|
-      app.middleware.insert_after 'Rack::Runtime', Trashed::Rack::MeasureResourceUsage, app.config.trashed
-    end
-
-    initializer 'trashed.newrelic', :after => 'newrelic_rpm.start_plugin' do |app|
-      if defined?(NewRelic::Control) && NewRelic::Control.instance.agent_enabled?
-        require 'trashed/new_relic'
-        Trashed::NewRelic.sample ResourceUsage, app.config.trashed
-      end
-    end
-
-    def connect_to_statsd(options)
       require 'statsd'
 
-      case options
-      when Statsd
-        options
-      when Hash
-        Statsd.new(options[:host], options[:port]).tap do |statsd|
-          statsd.namespace = options[:namespace]
-        end
-      end
+      app.config.trashed.sample_rate ||= 1.0
+      app.config.trashed.logger ||= Rails.logger
+
+      app.middleware.insert_after 'Rack::Runtime', Trashed::Rack, app.config.trashed
     end
   end
 end

data/lib/trashed/reporter.rb

@@ -0,0 +1,48 @@
+require 'trashed/rack'
+
+module Trashed
+  class Reporter
+    attr_accessor :logger, :statsd, :sample_rate
+    attr_accessor :timing_dimensions, :gauge_dimensions
+
+    DEFAULT_DIMENSIONS = [ :All ]
+
+    def initialize
+      @logger = nil
+      @statsd = nil
+      @sample_rate = 1.0
+      @timing_dimensions  = ->(env) { DEFAULT_DIMENSIONS }
+      @gauge_dimensions   = ->(env) { DEFAULT_DIMENSIONS }
+    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
+    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)
+      end
+    end
+
+    def send_to_statsd(statsd, method, measurements, namespace, dimensions)
+      measurements.each do |metric, value|
+        if value.is_a? Numeric
+          Array(dimensions || :All).each do |dimension|
+            statsd.send method, :"#{namespace}.#{dimension}.#{metric}", value, @sample_rate
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trashed/resource_usage.rb

@@ -1,48 +1,46 @@
-module Trashed
-  ResourceUsage = Meter.new do
+require 'trashed/meter'
 
-    # Wall clock time, in milliseconds since epoch
-    counts :Time do
-      { :wall => (Time.now.to_f * 1000).to_i }
-    end
+module Trashed
+  ResourceUsage = Meter.new.tap do |meter|
+    # Wall clock time in milliseconds since epoch.
+    # Includes CPU and idle time on Ruby 2.1+.
+    require 'trashed/instruments/stopwatch'
+    meter.instrument Trashed::Instruments::Stopwatch.new
 
     # RailsBench GC patch / REE 1.8
     if GC.respond_to? :enable_stats
-      GC.enable_stats
-
-      counts :Objects do
-        { :total => ObjectSpace.allocated_objects }
-      end
-
-      gauges :Objects do
-        { :live => ObjectSpace.live_objects }
-      end
-
-      counts :GC do
-        { :count => GC.collections, :elapsed => GC.time, :memory => GC.allocated_size }
-      end
-
-      gauges :GC do
-        { :growth => GC.growth }
-      end
+      require 'trashed/instruments/ree_gc'
+      meter.instrument Trashed::Instruments::Ruby18GC.new
+    end
 
     # Ruby 1.9+
-    elsif ObjectSpace.respond_to? :count_objects
-      counts :Objects do
-        { :total => ObjectSpace.count_objects[:TOTAL] }
-      end
-
-      gauges :Objects do
-        ObjectSpace.count_objects
-      end
+    if ObjectSpace.respond_to? :count_objects
+      require 'trashed/instruments/object_space_counter'
+      meter.instrument Trashed::Instruments::ObjectSpaceCounter.new
+    end
 
-      counts :GC do
-        { :count => GC.stat[:count] }
+    # Ruby 1.9+
+    if GC.respond_to?(:stat)
+      case
+      # Ruby 2.1+
+      when GC.stat[:major_gc_count]
+        require 'trashed/instruments/ruby21_gc'
+        meter.instrument Trashed::Instruments::Ruby21GC.new
+      # Ruby 2.0+
+      when GC.stat[:total_allocated_object]
+        require 'trashed/instruments/ruby20_gc'
+        meter.instrument Trashed::Instruments::Ruby20GC.new
+      # Ruby 1.9
+      else
+        require 'trashed/instruments/ruby19_gc'
+        meter.instrument Trashed::Instruments::Ruby19GC.new
       end
+    end
 
-      gauges :GC do
-        GC.stat
-      end
+    # Ruby 1.9+
+    if defined? GC::Profiler
+      require 'trashed/instruments/ruby_gc_profiler'
+      meter.instrument Trashed::Instruments::RubyGCProfiler.new
     end
   end
 end

data/lib/trashed.rb

@@ -1,5 +1,2 @@
-module Trashed
-  require 'trashed/meter'
-  require 'trashed/resource_usage'
-  require 'trashed/rack'
-end
+require 'trashed/rack'
+require 'trashed/railtie' if defined? ::Rails::Railtie

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trashed
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeremy Kemper
@@ -14,37 +14,65 @@ dependencies:
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        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: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
+- !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: 
-email: jeremy@bitsweat.net
+email: jeremykemper@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./MIT-LICENSE
-- ./README.md
-- ./Rakefile
 - ./init.rb
 - ./lib/trashed.rb
+- ./lib/trashed/instruments/object_space_counter.rb
+- ./lib/trashed/instruments/ree_gc.rb
+- ./lib/trashed/instruments/ruby19_gc.rb
+- ./lib/trashed/instruments/ruby20_gc.rb
+- ./lib/trashed/instruments/ruby21_gc.rb
+- ./lib/trashed/instruments/ruby_gc_profiler.rb
+- ./lib/trashed/instruments/stopwatch.rb
 - ./lib/trashed/meter.rb
-- ./lib/trashed/new_relic.rb
 - ./lib/trashed/rack.rb
 - ./lib/trashed/railtie.rb
+- ./lib/trashed/reporter.rb
 - ./lib/trashed/resource_usage.rb
-- ./test/lib/trashed/test_helper.rb
-- ./test/meter_test.rb
-- ./test/rack_test.rb
-- ./trashed.gemspec
-homepage: https://github.com/37signals/trashed
+homepage: https://github.com/basecamp/trashed
 licenses: []
 metadata: {}
 post_install_message: 
@@ -66,6 +94,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: ! 'Keep tabs on Ruby garbage collection: object counts, allocated bytes,
-  GC time.'
+summary: Report per-request object allocations, GC time, and more to StatsD
 test_files: []

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 37signals, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,34 +0,0 @@
-## Trashed
-# Keep an eye on resource usage.
-
-
- - Logs per-request object counts, heap growth, and GC time.
- - Sends periodic resource usage snapshots to StatsD & NewRelic.
- - Requires Ruby 1.9 or REE.
-
-
-## Setup
-
-### Rails 3
-
-On Rails 3, add this to the top of `config/application.rb`:
-
-    require 'trashed/railtie'
-
-And in the body of your app config:
-
-    module YourApp
-      class Application < Rails::Application
-        config.trashed[:statsd] = YourApp.statsd
-
-
-### Rails 2
-
-On Rails 2, add the middleware to `config/environment.rb`:
-
-    Rails::Initializer.run do |config|
-      config.middleware.use Trashed::Rack::MeasureResourceUsage, :statsd => YourApp.statsd
-
-And set up the sampler in `config/initializers/trashed.rb`:
-
-    Trashed::Newrelic.sample Trashed::ResourceUsage, :statsd => YourApp.statsd

data/Rakefile

@@ -1,22 +0,0 @@
-require 'rake/testtask'
-require 'rdoc/task'
-
-desc 'Default: run unit tests'
-task :default => :test
-
-desc 'Run unit tests'
-Rake::TestTask.new :test do |t|
-  t.libs << 'test/lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate RDoc documentation'
-Rake::RDocTask.new :rdoc do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = 'Trashed'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('MIT-LICENSE')
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/trashed/new_relic.rb

@@ -1,47 +0,0 @@
-module Trashed
-  module NewRelic
-    def self.sample(meter, options = {})
-      ::NewRelic::Agent.instance.stats_engine.add_sampler Sampler.new(meter, options)
-    end
-
-    class Sampler
-      attr_accessor :stats_engine
-
-      def initialize(meter, options = {})
-        @meter  = meter
-        @label  = options[:label] || 'Custom/%s'
-        @statsd = options[:statsd]
-      end
-
-      def poll
-        record @meter.count
-        record @meter.gauge
-      end
-
-      def record(data)
-        data.each do |name, value|
-          record_newrelic name, value
-          record_statsd   name, value if @statsd
-        end
-      end
-
-      private
-
-      def record_statsd(name, value)
-        @statsd.timing name, value
-      end
-
-      def record_newrelic(name, value)
-        stats_for(label_for(name)).record_data_point(value)
-      end
-
-      def stats_for(metric)
-        stats_engine.get_stats(metric, false)
-      end
-
-      def label_for(name)
-        @label % name.gsub('.', '/')
-      end
-    end
-  end
-end

data/test/lib/trashed/test_helper.rb

@@ -1,3 +0,0 @@
-require 'trashed'
-require 'minitest/unit'
-MiniTest::Unit.autorun

data/test/meter_test.rb

@@ -1,15 +0,0 @@
-require 'trashed/test_helper'
-
-class MeterTest < MiniTest::Unit::TestCase
-  def test_count
-    time = Trashed::ResourceUsage.count['Time.wall']
-    refute_nil time
-    assert_in_delta time, (Time.now.to_f * 1000), 1000
-  end
-
-  def test_instrument
-    elapsed = Trashed::ResourceUsage.instrument { nil }['Time.wall']
-    refute_nil elapsed
-    assert_in_delta elapsed, 0, 1000
-  end
-end

data/test/rack_test.rb

@@ -1,18 +0,0 @@
-require 'trashed/test_helper'
-
-class RackTest < MiniTest::Unit::TestCase
-  Hello = lambda { |env| [200, {}, %w(hello)] }
-
-  def test_instruments_app_and_stores_in_env
-    env = {}
-
-    response = Trashed::Rack::MeasureResourceUsage.new(Hello).call(env)
-
-    refute_nil env['trashed.change']
-    refute_nil env['trashed.usage']
-
-    elapsed = env['trashed.change']['Time.wall']
-    refute_nil elapsed
-    assert_in_delta elapsed, 0, 1000
-  end
-end

data/trashed.gemspec

@@ -1,12 +0,0 @@
-Gem::Specification.new do |s|
-  s.name      = 'trashed'
-  s.version   = '2.0.5'
-  s.author    = 'Jeremy Kemper'
-  s.email     = 'jeremy@bitsweat.net'
-  s.homepage  = 'https://github.com/37signals/trashed'
-  s.summary   = 'Keep tabs on Ruby garbage collection: object counts, allocated bytes, GC time.'
-
-  s.add_dependency 'statsd-ruby', '>= 0.4'
-
-  s.files = Dir["#{File.dirname(__FILE__)}/**/*"]
-end