oink 0.9.3 → 0.10.0

data/History.txt

@@ -1,3 +1,33 @@
+=== 0.10.0 / 2013-01-03
+
+* Additional summary information (average, max, min, total, number requests) (bjpirt)
+
+=== 0.9.3 / 2011-07-08
+
+* (BUGFIX) Correctly log a controller action that lives in a module (wagner)
+* (BUGFIX) Log fix for Rails 2.3.x (yar)
+
+=== 0.9.2 / 2011-04-05
+
+* More configurable middleware (noahd1, edsinclair)
+* Update license (still MIT) (noahd1)
+
+=== 0.9.1 / 2011-03-23
+
+* Remove unnecessary dependency (noahd1)
+
+=== 0.9.0 / 2011-03-23
+
+* Introduce middleware and deprecate controller modules (noahd1, edsinclair)
+
+=== 0.1.2 / 2010-10-08
+
+* Prefer statm to smaps (jordan-brough)
+
+=== 0.1.1 / 2010-09-30
+
+* Dependency fixes
+
 === 0.1.0 / 2009-02-09
 
 * 1st release

data/README.rdoc

@@ -30,7 +30,7 @@ When used as a gem, this is automatically brought in as a dependency.
 
 Add oink to your Gemfile
 
-gem "oink"
+  gem "oink"
 
 In most rails environments this is sufficient and oink will be required for you via bundler.
 If not, add a require statement "require 'oink'" in your app.
@@ -115,6 +115,16 @@ e.g. To find all actions which increase the heap size more than 75 MB, where log
   1, PublicPagesController#join
   1, CommentsController#create
 
+  Aggregated Totals:
+  Action                                  Max     Mean    Min     Total   Number of requests
+  SportsController#show                   101560  19754   4       5590540 283
+  CommentsController#create               8344    701     4       253324  361
+  ColorSchemesController#show             10124   739     4       68756   93
+  PublicPagesController#join              9004    1346    8       51172   38
+  DashboardsController#show               13696   2047    8       45036   22
+  SessionsController#create               9220    528     8       17448   33
+  GroupsController#show                   10748   1314    8       15776   12
+
 e.g. In verbose mode, oink will print out all the log information from your logs about the actions which exceeded the threshold specified
 
   $ oink --format verbose --threshold=75 /tmp/logs/*

data/Rakefile

@@ -1,4 +1,4 @@
-require "rake/gempackagetask"
+require "rubygems/package_task"
 require "rake/clean"
 require "rspec/core/rake_task"
 
@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name         = "oink"
-    s.version      = "0.9.3"
+    s.version      = "0.10.0"
     s.author       = "Noah Davis"
     s.email        = "noahd1" + "@" + "yahoo.com"
     s.homepage     = "http://github.com/noahd1/oink"

data/lib/oink/instrumentation/active_record.rb

@@ -8,31 +8,39 @@ module Oink
     @oink_extended_active_record = true
   end
 
+  def self.extend_active_record!
+    ::ActiveRecord::Base.class_eval do
+      include Instrumentation::ActiveRecord
+    end
+  end
+
   module Instrumentation
     module ActiveRecord
 
       def self.included(klass)
         klass.class_eval do
 
-          @@instantiated = {}
-          @@total = nil
-
           def self.reset_instance_type_count
-            @@instantiated = {}
-            @@total = nil
+            self.instantiated_hash = {}
+            Thread.current['oink.activerecord.instantiations_count'] = nil
           end
 
           def self.increment_instance_type_count
-            @@instantiated[base_class.name] ||= 0
-            @@instantiated[base_class.name] += 1
+            self.instantiated_hash ||= {}
+            self.instantiated_hash[base_class.name] ||= 0
+            self.instantiated_hash[base_class.name] += 1
           end
 
           def self.instantiated_hash
-            @@instantiated
+            Thread.current['oink.activerecord.instantiations']
+          end
+
+          def self.instantiated_hash=(hsh)
+            Thread.current['oink.activerecord.instantiations'] = hsh
           end
 
           def self.total_objects_instantiated
-            @@total ||= @@instantiated.values.sum
+            Thread.current['oink.activerecord.instantiations_count'] ||= self.instantiated_hash.values.sum
           end
 
           unless Oink.extended_active_record?

data/lib/oink/instrumentation/memory_snapshot.rb

@@ -72,7 +72,8 @@ module Oink
     class SmapsMemorySnapshot
       def memory
         proc_file = File.new("/proc/#{$$}/smaps")
-        proc_file.map do |line|
+        lines = proc_file.lines
+        lines.map do |line|
           size = line[/Size: *(\d+)/, 1] and size.to_i
         end.compact.sum
       end
@@ -116,4 +117,4 @@ module Oink
 
   end
 
-end
+end

data/lib/oink/middleware.rb

@@ -10,7 +10,7 @@ module Oink
       @logger      = options[:logger] || Hodel3000CompliantLogger.new("log/oink.log")
       @instruments = options[:instruments] ? Array(options[:instruments]) : [:memory, :activerecord]
 
-      ActiveRecord::Base.send(:include, Oink::Instrumentation::ActiveRecord) if @instruments.include?(:activerecord)
+      Oink.extend_active_record! if @instruments.include?(:activerecord)
     end
 
     def call(env)

data/lib/oink/reports/base.rb

@@ -13,6 +13,7 @@ module Oink
 
         @pids = {}
         @bad_actions = {}
+        @bad_actions_averaged = {}
         @bad_requests = PriorityQueue.new(10)
       end
 
@@ -32,6 +33,25 @@ module Oink
         @bad_actions.sort{|a,b| b[1]<=>a[1]}.each { |elem|
           output.puts "#{elem[1]}, #{elem[0]}"
         }
+        output.puts "\nAggregated Totals:\n"
+        if @bad_actions_averaged.length > 0
+          action_stats =  @bad_actions_averaged.map { |action,values|
+            total = values.inject(0){ |sum,x| sum+x }
+            {
+              :action => action,
+              :total => total,
+              :mean => total/values.length,
+              :max => values.max,
+              :min => values.min,
+              :count => values.length,
+            }
+          }
+          action_width = @bad_actions_averaged.keys.map{|k| k.length}.max
+          output.puts "#{'Action'.ljust(action_width)}\tMax\tMean\tMin\tTotal\tNumber of requests"
+          action_stats.sort{|a,b| b[:total]<=>a[:total]}.each do |action_stat|
+            output.puts "#{action_stat[:action].ljust(action_width)}\t#{action_stat[:max]}\t#{action_stat[:mean]}\t#{action_stat[:min]}\t#{action_stat[:total]}\t#{action_stat[:count]}"
+          end
+        end
       end
     end
   end

data/lib/oink/reports/memory_usage_report.rb

@@ -52,6 +52,8 @@ module Oink
                     @pids[pid][:buffer].each { |b| output.puts b }
                     output.puts "---------------------------------------------------------------------"
                   end
+                  @bad_actions_averaged[@pids[pid][:action]] ||= []
+                  @bad_actions_averaged[@pids[pid][:action]] << memory_diff
                 end
               end
 
@@ -68,4 +70,4 @@ module Oink
       end
     end
   end
-end
+end

metadata

@@ -1,144 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oink
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 0.10.0
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 3
-  version: 0.9.3
 platform: ruby
-authors: 
+authors:
 - Noah Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 -04:00
-default_executable: oink
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-  prerelease: false
+date: 2013-01-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hodel_3000_compliant_logger
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activerecord
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: sqlite3
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rack-test
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ruby-debug
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Log parser to identify actions which significantly increase VM heap size
 email: noahd1@yahoo.com
-executables: 
+executables:
 - oink
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - History.txt
 - MIT-LICENSE
 - README.rdoc
@@ -161,66 +185,31 @@ files:
 - lib/oink/reports/priority_queue.rb
 - lib/oink/reports/request.rb
 - lib/oink/utils/hash_utils.rb
-- spec/fakes/fake_application_controller.rb
-- spec/fakes/psuedo_output.rb
-- spec/helpers/database.rb
-- spec/oink/instrumentation/instance_type_counter_spec.rb
-- spec/oink/instrumentation/memory_snapshot_spec.rb
-- spec/oink/middleware_configuration_spec.rb
-- spec/oink/middleware_spec.rb
-- spec/oink/rails/instance_type_counter_spec.rb
-- spec/oink/rails/memory_usage_logger_spec.rb
-- spec/oink/reports/active_record_instantiation_report_spec.rb
-- spec/oink/reports/memory_usage_report_spec.rb
-- spec/oink/reports/oinked_request_spec.rb
-- spec/oink/reports/priority_queue_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/noahd1/oink
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1899106649143514208
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Log parser to identify actions which significantly increase VM heap size
-test_files: 
-- spec/fakes/fake_application_controller.rb
-- spec/fakes/psuedo_output.rb
-- spec/helpers/database.rb
-- spec/oink/instrumentation/instance_type_counter_spec.rb
-- spec/oink/instrumentation/memory_snapshot_spec.rb
-- spec/oink/middleware_configuration_spec.rb
-- spec/oink/middleware_spec.rb
-- spec/oink/rails/instance_type_counter_spec.rb
-- spec/oink/rails/memory_usage_logger_spec.rb
-- spec/oink/reports/active_record_instantiation_report_spec.rb
-- spec/oink/reports/memory_usage_report_spec.rb
-- spec/oink/reports/oinked_request_spec.rb
-- spec/oink/reports/priority_queue_spec.rb
-- spec/spec_helper.rb
+test_files: []