request-log-analyzer 1.9.8 → 1.9.9

data/lib/request_log_analyzer.rb

@@ -13,7 +13,7 @@ module RequestLogAnalyzer
 
   # The current version of request-log-analyzer.
   # Do not change the value by hand; it will be updated automatically by the gem release script.
-  VERSION = "1.9.8"
+  VERSION = "1.9.9"
 
 
   autoload :Controller,     'request_log_analyzer/controller'

data/lib/request_log_analyzer/file_format/oink.rb

@@ -26,6 +26,12 @@ class RequestLogAnalyzer::FileFormat::Oink < RequestLogAnalyzer::FileFormat::Rai
     line.capture(:pid).as(:integer)
     line.capture(:memory).as(:traffic)
   end
+
+  line_definition :instance_type_counter do |line|
+    line.regexp = /\[(\d+)\]: Instantiation Breakdown: (.*)$/
+    line.capture(:pid).as(:integer) 
+    line.capture(:instance_counts).as(:pipe_separated_counts)
+  end
   
   report(:append) do |analyze|
     analyze.traffic :memory_diff, :category => REQUEST_CATEGORIZER, :title => "Largest Memory Increases", :line_type => :memory_usage
@@ -35,7 +41,7 @@ class RequestLogAnalyzer::FileFormat::Oink < RequestLogAnalyzer::FileFormat::Rai
   def pids
     @pids ||= {}
   end
-  
+
   class Request < RequestLogAnalyzer::FileFormat::Rails::Request
    # Overrides the #validate method to handle PID updating.
    def validate
@@ -74,5 +80,17 @@ class RequestLogAnalyzer::FileFormat::Oink < RequestLogAnalyzer::FileFormat::Rai
       end # if mem_line
       return true
    end # def update_pids
+
+  def convert_pipe_separated_counts(value, capture_definition)
+    count_strings = value.split(' | ')
+    count_arrays = count_strings.map do |count_string|
+      if count_string =~ /^(\w+): (\d+)/
+        [$1, $2.to_i]
+      end
+    end
+
+    Hash[count_arrays]
+  end
+  
   end # class Request
-end
+end

data/request-log-analyzer.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "1.9.8"
-  s.date    = "2010-12-01"
+  s.version = "1.9.9"
+  s.date    = "2010-12-17"
 
   s.rubyforge_project = 'r-l-a'
 

data/spec/unit/file_format/oink_format_spec.rb

@@ -30,6 +30,13 @@ describe RequestLogAnalyzer::FileFormat::Oink do
       line = 'Aug 14 21:16:30 derek rails[67783]: Processing PeopleController#index (for 1.1.1.1 at 2008-08-14 21:16:30) [GET]'
       @oink.should parse_line(line).as(:processing).and_capture(:pid => 67783, :controller => 'PeopleController', :action => 'index', :timestamp => 20080814211630, :method => 'GET', :ip => '1.1.1.1')
     end
+
+    it "should parse a :instance_type_counter correctly" do
+
+      line = "Dec 13 12:00:44 storenvy rails[26364]: Instantiation Breakdown: Total: 732 | User: 376 | Post: 323 | Comment: 32 | Blog: 1"
+
+      @oink.should parse_line(line).as(:instance_type_counter).and_capture(:pid => 26364, :instance_counts =>  {'Total' => 732, 'User' => 376, 'Post' => 323, 'Comment' => 32, 'Blog' => 1})
+    end
   end
   
   describe '#parse_io' do

data/spec/unit/tracker/numeric_value_tracker_spec.rb

@@ -54,11 +54,11 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     end
 
     it "should sum of the durations for a category correctly" do
-      @tracker.sum('a').should be_close(0.9, 0.000001)
+      @tracker.sum('a').should be_within(0.000001).of(0.9)
     end
 
     it "should overall sum of the durations correctly" do
-      @tracker.sum_overall.should be_close(0.9, 0.000001)
+      @tracker.sum_overall.should be_within(0.000001).of(0.9)
     end
 
     it "should keep track of the minimum and maximum duration" do
@@ -67,19 +67,19 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     end
 
     it "should calculate the mean duration correctly" do
-      @tracker.mean('a').should be_close(0.3, 0.000001)
+      @tracker.mean('a').should be_within(0.000001).of(0.3)
     end
 
     it "should calculate the overall mean duration correctly" do
-      @tracker.mean_overall.should be_close(0.3, 0.000001)
+      @tracker.mean_overall.should be_within(0.000001).of(0.3)
     end
 
     it "should calculate the duration variance correctly" do
-      @tracker.variance('a').should be_close(0.01, 0.000001)
+      @tracker.variance('a').should be_within(0.000001).of(0.01)
     end
 
     it "should calculate the duration standard deviation correctly" do
-      @tracker.stddev('a').should be_close(0.1,  0.000001)
+      @tracker.stddev('a').should be_within(0.000001).of(0.1)
     end
 
     it "should calculate the bucket spread correctly" do
@@ -92,12 +92,12 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.update(request(:category => 'a', :duration => 0.3))
       # 0.2, 0.3 and 0.4 are already there, so, 10 values in total
       
-      @tracker.median('a').should be_close(0.3, 0.01)
+      @tracker.median('a').should be_within(0.01).of(0.3)
       
-      @tracker.percentile_interval('a', 80).begin.should be_close(0.3, 0.01)
-      @tracker.percentile_interval('a', 80).end.should be_close(0.3, 0.01)
-      @tracker.percentile_interval('a', 90).begin.should be_close(0.2, 0.01)
-      @tracker.percentile_interval('a', 90).end.should be_close(0.4, 0.01)
+      @tracker.percentile_interval('a', 80).begin.should be_within(0.01).of(0.3)
+      @tracker.percentile_interval('a', 80).end.should be_within(0.01).of(0.3)
+      @tracker.percentile_interval('a', 90).begin.should be_within(0.01).of(0.2)
+      @tracker.percentile_interval('a', 90).end.should be_within(0.01).of(0.4)
     end
   end
 
@@ -135,9 +135,10 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.to_yaml_object.keys.should =~ ['a', 'b']
       
       @tracker.to_yaml_object['a'].should include(:min => 2, :hits => 1, :max => 2, :mean => 2.0, :sum => 2, :sum_of_squares => 0.0)
-      @tracker.to_yaml_object['a'][:interval_95_percent].member?(2).should be_true
+      @tracker.to_yaml_object['a'][:interval_95_percent].should be_member(2)
+      
       @tracker.to_yaml_object['b'].should include(:min => 3, :hits => 1, :max => 3, :mean => 3.0, :sum => 3, :sum_of_squares => 0.0)
-      @tracker.to_yaml_object['b'][:interval_95_percent].should be_true
+      @tracker.to_yaml_object['b'][:interval_95_percent].should be_member(3)
     end
   end
 

data/tasks/github-gem.rake

@@ -220,7 +220,7 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
+      proposed_version = Gem::Version.new((ENV['VERSION'] || gemspec.version).dup)
       raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
@@ -339,22 +339,26 @@ module GithubGem
 
     # Updates the tasks file using the latest file found on Github
     def update_tasks_task
-      require 'net/http'
-
-      server = 'github.com'
-      path   = '/wvanbergen/github-gem/raw/master/tasks/github-gem.rake'
+      require 'net/https'
+      require 'uri'
+      
+      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.request(Net::HTTP::Get.new(uri.path))
 
-      Net::HTTP.start(server) do |http|
-        response = http.get(path)
+      if Net::HTTPSuccess === response
         open(__FILE__, "w") { |file| file.write(response.body) }
-      end
-
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
-      if `#{git} ls-files -m #{relative_file}`.split("\n").any?
-        sh git, 'add', relative_file
-        sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+        if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+          sh git, 'add', relative_file
+          sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        else
+          puts "Release managament tasks already are at the latest version."
+        end
       else
-        puts "Release managament tasks already are at the latest version."
+        raise "Download failed with HTTP status #{response.code}!"
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 8
-  version: 1.9.8
+  - 9
+  version: 1.9.9
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency