stella 0.8.4.001 → 0.8.5.001

data/CHANGES.txt

@@ -11,7 +11,20 @@ STELLA, CHANGES
 * TODO: process templates for calls to set in get blocks
 
 
-#### 0.8.4 (2010-03-??) ###############################
+#### 0.8.5 (2010-03-27) ###############################
+
+* FIXED: Add User-Agent header if Stella.agent is not null and one is not already provided
+* FIXED: Client wait (undefined method '>' for Range error)
+* CHANGE: Testrun#samples contains all data samples for each event in a given batch
+* CHANGE: Renamed Testrun#events -> Testrun#event_probes
+* ADDED: Testrun#logsize
+* ADDED: Store HTTP status codes in Testrun#stats
+* ADDED: Store error messages in Sample#errors
+* ADDED: Stella.get now takes a block
+* ADDED: Stella.agent
+
+
+#### 0.8.4 (2010-03-19) ###############################
 
 * FIXED: Misc issues getting and setting headers, params, and resources
 * FIXED: There was no response body in Stella::Engine::Log objects

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :MAJOR: 0
 :MINOR: 8
-:PATCH: 4
+:PATCH: 5
 :BUILD: '001'

data/bin/stella

@@ -67,7 +67,7 @@ class Stella::CLI::Definition
     true
   end
   global :V, :version, "Display version number" do
-    puts "Stella version: #{Stella::VERSION} (#{Stella::VERSION::PATCH})"
+    puts "Stella version: #{Stella::VERSION.inspect}"
     exit 0
   end
 

data/examples/essentials/plan.rb

@@ -221,7 +221,7 @@ usecase 25, "YAML API" do
     # user should repeat this request 7 times.
     #
     response 200 do
-      repeat 7
+      repeat 3
     end
   end
   
@@ -238,7 +238,7 @@ usecase 10, "Self-serve API" do
     param :city => random(['Toronto', 'Vancouver', 'Montreal'])
     param :logo => file('logo.png')
     response 302 do
-      repeat 3
+      repeat 2
     end
   end
   

data/lib/stella.rb

@@ -74,11 +74,12 @@ module Stella
   @debug   = false
   @abort   = false
   @quiet   = false
+  @agent   = "Stella/#{Stella::VERSION}"
   @log     = Stella::SyncLogger.new
   @stdout  = Stella::Logger.new STDOUT
     
   class << self
-    attr_accessor :log, :stdout
+    attr_accessor :log, :stdout, :agent
   end
   
   def le(*msg); stdout.info "  " << msg.join("#{$/}  ").colour(:red); end
@@ -127,10 +128,15 @@ module Stella
   autoload :Client, 'stella/client'
   autoload :Service, 'stella/service'
   
-  def get(uri, query={})
+  def get(uri, query={}, &blk)
     require 'stella/client'
     http_client = HTTPClient.new :agent_name => "Opera/9.51 (Windows NT 5.1; U; en)"
-    http_client.get(uri, query).body.content
+    res = http_client.get(uri, query)
+    if blk.nil?
+      res.body.content
+    else
+      blk.call res 
+    end
   rescue => ex
     STDERR.puts ex.message
     STDERR.puts ex.backtrace if Stella.debug?

data/lib/stella/cli.rb

@@ -35,11 +35,11 @@ class Stella::CLI < Drydock::Command
   
   def generate
     testrun = run :generate
-    @exit_code = (testrun.stats['summary']['failed'].n == 0 ? 0 : 1)
+    @exit_code = (testrun.has_errors? == 0 ? 0 : 1)
   end
   def verify
     testrun = run :verify
-    @exit_code = (testrun.stats['summary']['failed'].n == 0 ? 0 : 1)
+    @exit_code = (testrun.has_errors? == 0 ? 0 : 1)
   end
     
   def example

data/lib/stella/client.rb

@@ -154,8 +154,8 @@ module Stella
           next
         end
         
-        wait = (req.wait > 0) ? req.wait : @opts[:wait]
-        run_sleeper(wait, asset_duration) if (wait > 0) && !nowait?
+        wait = (req.wait != 0) ? req.wait : @opts[:wait]
+        run_sleeper(wait, asset_duration) unless nowait?
         
         # TODO: consider throw/catch
         case ret.class.to_s
@@ -212,6 +212,7 @@ module Stella
     end
   
     def run_sleeper(wait, already_waited=0)
+      return if wait == 0
       # The time it took to download the assets can
       # be removed from the specified wait time.
       if wait.is_a?(::Range)
@@ -228,7 +229,7 @@ module Stella
     def create_http_client
       opts = {
         :proxy       => @proxy.uri || nil, # a tautology for clarity
-        :agent_name  => "Stella/#{Stella::VERSION}",
+        :agent_name  => Stella.agent,
         :from        => nil
       }
       http_client = HTTPClient.new opts

data/lib/stella/engine.rb

@@ -97,6 +97,7 @@ class Stella::Testrun < Storable
   field :repetitions => Integer
   field :wait => Float
   field :nowait => TrueClass
+  field :logsize => Integer
   field :granularity => Integer
   field :withparam => TrueClass
   field :withheader => TrueClass
@@ -104,15 +105,18 @@ class Stella::Testrun < Storable
   field :nostats => TrueClass
   field :stats => Hash
   field :samples => Array
+  field :event_probes => Array
+  field :agent => String
   field :mode  # verify or generate
   field :plan
   field :hosts
-  field :events
   field :log
   gibbler :plan, :hosts, :mode, :clients, :duration, :repetitions, :wait, :start_time, :userid
   def initialize(plan=nil, opts={})
     @plan = plan
     @granularity = GRANULARITY
+    @logsize = 1
+    @log = []
     process_options! opts if !plan.nil? && !opts.empty?
     reset_stats
   end
@@ -137,33 +141,7 @@ class Stella::Testrun < Storable
     return Time.now.utc.to_i - @start_time if @end_time.nil? || @end_time <= 0
     @end_time - @start_time
   end
-  
-  def self.from_hash(hash={})
-    me = super(hash)
-    me.plan = Stella::Testplan.from_hash(me.plan)
-    me.process_options! unless me.plan.nil?
-    
-    me.samples.collect! do |sample|
-      Stella::Testrun::Sample.from_hash(sample)
-    end
-    
-    me.plan.usecases.uniq.each_with_index do |uc,i| 
-      uc.requests.each do |req| 
-        me.events.each_with_index do |event,idx|  # do_request, etc...
-          event &&= event.to_s
-          me.stats[uc.id][req.id][event] = 
-            Benelux::Stats::Calculator.from_hash(me.stats[uc.id][req.id][event])
-          me.stats[uc.id]['summary'][event] = 
-            Benelux::Stats::Calculator.from_hash(me.stats[uc.id]['summary'][event])
-          me.stats['summary'][event] = 
-            Benelux::Stats::Calculator.from_hash(me.stats['summary'][event])
-        end
-      end
-    end
-    
-    me
-  end
-  
+
   def client_options
     opts = {
       :nowait => self.nowait || false,
@@ -201,11 +179,13 @@ class Stella::Testrun < Storable
     @stats ||= { :summary => {} }
     
     @status ||= "new"
-    @events ||= [:response_time, :failed]
+    if @event_probes.nil? || @event_probes.empty?
+      @event_probes = ['response_time', 'response_content_size']
+    end
     
     @start_time ||= Time.now.to_i
     
-    @events.collect! { |event| event.to_sym }
+    @event_probes.collect! { |event| event.to_s }
     
     @duration ||= 0
     @repetitions ||= 0
@@ -278,6 +258,7 @@ class Stella::Testrun < Storable
   
   
   def run(opts={})
+    Stella.agent = @agent unless @agent.nil? || @agent.empty?
     engine = case self.mode 
     when :verify 
       Stella::Engine::Functional.new(opts)
@@ -304,20 +285,60 @@ class Stella::Testrun < Storable
     @stats = { 'summary' => {} }
     unless @plan.nil?
       @plan.usecases.each do |uc|
-        @events.each do |event|
+        @event_probes.each do |event|
           event &&= event.to_s
           @stats['summary'][event] = Benelux::Stats::Calculator.new
           @stats[uc.id] ||= { 'summary' => {} }
           @stats[uc.id]['summary'][event] = Benelux::Stats::Calculator.new
+          @stats[uc.id]['summary']['status'] ||= {}
+          @stats['summary']['status'] ||= {}
           uc.requests.each do |req|
             @stats[uc.id][req.id] ||= {}
             @stats[uc.id][req.id][event] = Benelux::Stats::Calculator.new
+            @stats[uc.id][req.id]['status'] ||= {} 
           end
         end
       end
     end
   end
   
+  
+  def self.from_hash(hash={})
+    me = super(hash)
+    me.plan = Stella::Testplan.from_hash(me.plan)
+    me.process_options! unless me.plan.nil?
+    
+    me.samples.collect! do |sample|
+      Stella::Testrun::Sample.from_hash(sample)
+    end
+    
+    me.plan.usecases.uniq.each_with_index do |uc,i| 
+      uc.requests.each do |req| 
+        me.event_probes.each_with_index do |event,idx|  # do_request, etc...
+          event &&= event.to_s
+          next unless me.stats[uc.id][req.id].has_key?(event)
+          next if Benelux::Stats::Calculator === me.stats[uc.id][req.id][event]
+          me.stats[uc.id][req.id][event] = 
+            Benelux::Stats::Calculator.from_hash(me.stats[uc.id][req.id][event])
+          me.stats[uc.id]['summary'][event] = 
+            Benelux::Stats::Calculator.from_hash(me.stats[uc.id]['summary'][event])
+          me.stats['summary'][event] = 
+            Benelux::Stats::Calculator.from_hash(me.stats['summary'][event])
+        end
+      end
+    end
+    
+    me
+  end
+  
+  def has_errors?
+    return false if @samples.nil? || @samples.empty?
+    @samples.each { |sam| 
+      return true if sam.has_errors? 
+    }
+    false
+  end
+  
   def add_sample batch, concurrency, tl
     
     opts = {
@@ -334,14 +355,35 @@ class Stella::Testrun < Storable
       uc.requests.each do |req| 
         sam.stats[uc.id][req.id] ||= {}
         filter = [uc.id, req.id]
-        @events.each_with_index do |event,idx|  # do_request, etc...
+        @event_probes.each_with_index do |event,idx|  # do_request, etc...
           event &&= event.to_s
-          stats = tl.stats.group(event.to_sym)[filter].merge
-          sam.stats[uc.id][req.id][event] = stats
+          stats = tl.stats.group(event.to_sym)[filter]
+          unless sam.stats[uc.id][req.id].has_key?(event)
+            stats[uc.id][req.id][event] ||= {}
+            @stats[uc.id][req.id][event] ||= Benelux::Stats::Calculator.new
+            @stats[uc.id]['summary'][event] ||= Benelux::Stats::Calculator.new
+            @stats['summary'][event] ||= Benelux::Stats::Calculator.new
+          end
+          # When we don't merge the stats from benelux, 
+          # the each calculator contains just one sample. 
+          # So when we grab the sum, it's just one event sample. 
+          sam.stats[uc.id][req.id][event] = stats.collect {|c| c.sum }
           # Tally request, usecase and total summaries at the same time. 
-          @stats[uc.id][req.id][event] += stats
-          @stats[uc.id]['summary'][event] += stats
-          @stats['summary'][event] += stats
+          @stats[uc.id][req.id][event] += stats.merge
+          @stats[uc.id]['summary'][event] += stats.merge
+          @stats['summary'][event] += stats.merge
+        end
+        resp = tl.stats.group(:execute_response_handler)[filter]
+        resp.tag_values(:status).each do |status|
+          sam.stats[uc.id][req.id]['status'] ||= {}
+          count = resp[:status => status].size
+          sam.stats[uc.id][req.id]['status'][status.to_i] = count
+        end
+        tmp = tl.messages.filter([filter, :exception].flatten)
+        unless tmp.empty?
+          sam.errors[uc.id] ||= {}
+          sam.errors[uc.id][req.id] ||= []
+          sam.errors[uc.id][req.id].push *tmp        
         end
       end
     end
@@ -358,27 +400,31 @@ class Stella::Testrun < Storable
     field :stamp
     field :duration
     field :stats => Hash
+    field :errors => Hash
     #gibbler :batch, :concurrency, :stamp, :duration
     def initialize(opts={})
       opts.each_pair do |n,v|
         self.send("#{n}=", v) if has_field? n
       end
-      @stats = { }
+      @stats, @errors = {}, {}
+    end
+    def has_errors?
+      !@errors.nil? && !@errors.empty?
     end
     def self.from_hash(hash={})
       me = super(hash)
-      stats = {}
+      #stats = {}
       me.stats.each_pair { |ucid,uchash| 
-        stats[ucid] = {}
         uchash.each_pair { |reqid,reqhash|
-          stats[ucid][reqid] = {}
-          reqhash.each_pair { |event,stat|
-            tmp = Benelux::Stats::Calculator.from_hash(stat)
-            stats[ucid][reqid][event] = tmp
-          }
-        }
+          if me.stats[ucid][reqid].has_key? 'status'
+             me.stats[ucid][reqid]['status'].each_pair do |status,value|
+               me.stats[ucid][reqid]['status'].delete status
+               me.stats[ucid][reqid]['status'][status.to_i] = value.to_i
+             end
+           end
+         }
       }
-      me.stats = stats
+      #me.stats = stats
       me
     end
   end

data/lib/stella/engine/load.rb

@@ -31,8 +31,6 @@ module Stella::Engine
         Load.counts  = [:request_header_size, :request_content_size]
         Load.counts += [:response_headers_size, :response_content_size]
       end
-      
-      events = [Load.timers, Load.counts, :failed].flatten
 
       testrun.save
       
@@ -196,8 +194,13 @@ module Stella::Engine
         concurrency = @threads.select { |t| !t.status.nil? }.size
         batch, timeline = Benelux.timeline_updates, Benelux.timeline_chunk
         testrun.add_sample batch, concurrency, timeline
-        if batch == 1 # only save the first batch
-          testrun.log = Benelux.timeline.messages.filter(:kind => :log)
+        testrun.log = [] unless testrun.has_log?
+        if testrun.log.size < testrun.logsize
+          tmp = Benelux.timeline.messages.filter(:kind => :log)
+          unless tmp.nil? || tmp.empty?
+            # grab only as many elements from the log as configured
+            testrun.log.push *tmp.first(testrun.logsize-testrun.log.size) 
+          end
         end
         testrun.save
         @failog.info Benelux.timeline.messages.filter(:kind => :exception)
@@ -426,6 +429,8 @@ module Stella::Engine
     end
     
     def update_error_execute_response_handler(client_id, ex, req, container)
+      Benelux.thread_timeline.add_message ex.message, :kind => :exception
+      Benelux.thread_timeline.add_count :exception, 1
       desc = "#{container.usecase.desc} > #{req.desc}"
       if Stella.stdout.lev == 2
         Stella.stdout.print 2, '.'.color(:red)
@@ -436,6 +441,8 @@ module Stella::Engine
     end
     
     def update_request_unhandled_exception(client_id, usecase, uri, req, params, ex)
+      Benelux.thread_timeline.add_message ex.message, :kind => :exception
+      Benelux.thread_timeline.add_count :error, 1
       desc = "#{usecase.desc} > #{req.desc}"
       if Stella.stdout.lev == 2
         Stella.stdout.print 2, '.'.color(:red)
@@ -446,28 +453,23 @@ module Stella::Engine
     end
     
     def update_usecase_quit client_id, msg, req, container
-      args = [Time.now.to_f, Stella.sysinfo.hostname, client_id.short]
       Benelux.thread_timeline.add_count :quit, 1
-      args.push [req, container.status, 'QUIT', msg, container.unique_id[0,10]]
-      Benelux.thread_timeline.add_message args.join('; '), :kind => :exception
+      Benelux.thread_timeline.add_message msg, :kind => :quit
       Stella.stdout.info3 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
     end
     
     def update_request_fail client_id, msg, req, container
-      args = [Time.now.to_f, Stella.sysinfo.hostname, client_id.short]
       Benelux.thread_timeline.add_count :failed, 1
-      args.push [req, container.status, 'FAIL', msg, container.unique_id[0,10]]
-      Benelux.thread_timeline.add_message args.join('; '), :kind => :exception
+      Benelux.thread_timeline.add_message msg, :kind => :fail
       Stella.stdout.info3 "  Client-%s     FAILED   %s" % [client_id.shorter, msg]
     end
     
     def update_request_error client_id, msg, req, container
       args = [Time.now.to_f, Stella.sysinfo.hostname, client_id.short]
-      Benelux.thread_timeline.add_count :error, 1
-      args.push [req, container.status, 'ERROR', msg, container.unique_id[0,10]]
-      Benelux.thread_timeline.add_message args.join('; '), :kind => :exception
+      Benelux.thread_timeline.add_count :exception, 1
+      Benelux.thread_timeline.add_message msg, :kind => :exception
       if Stella.stdout.lev >= 3
-        Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
+        Stella.le '  Client-%s %s' % [client_id.shorter, ex.message]
       end
     end
       

data/stella.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "0.8.4.001"
+  s.version = "0.8.5.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2010-03-19}
+  s.date = %q{2010-03-29}
   s.default_executable = %q{stella}
   s.description = %q{Blame Stella for breaking your web application!}
   s.email = %q{delano@solutious.com}

data/vendor/httpclient-2.1.5.2/httpclient/session.rb

@@ -618,7 +618,7 @@ class HTTPClient
           req.version = $1.to_f
         end
       end
-      if @agent_name && req.header.get('User-Agent').nil?
+      if @agent_name && req.header.get('User-Agent').empty?
         req.header.set('User-Agent', "#{@agent_name}")
       end
       if @from

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.8.4.001
+  version: 0.8.5.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -04:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: stella
 dependencies: 
 - !ruby/object:Gem::Dependency