celluloid-benchmark 0.1.15 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71cb69d5a66e3aeacbd81a69142f21648673825b
-  data.tar.gz: 26a007aa1629f007232cbd7636d9190889f60309
+  metadata.gz: e9c3d7d1944efb1aaf1bad886c4b908e85091c60
+  data.tar.gz: e279f4774b8790d66c6acde77963cb8e7865e53b
 SHA512:
-  metadata.gz: 6b02c99bcecb85c1e75d1fd2bcc7eff510810ad2fa68ad669667dba0c7aeabb47df21a0fe46dbb1390401789093295896ed93e5e94a80f096d60cc496c720d9b
-  data.tar.gz: dbb9384a8381484855ba11e47af41b917aef8d4ba8374507454b11495695d200c686afa3f012f25ca5713e90e35a6c015bd697fd082501ee1a72b664c64ce63b
+  metadata.gz: 80245cd323174a52cdeb6f6cd71ade1fd02491793086b76fb0eb4608781ea5c415bf74fa8171b7ac9fcf8b0e34bbc6fc19779d0288dff493b51dac5d1c93d266
+  data.tar.gz: 35c665225dc623b5eecc11d19b7f8fecba92d3b23cb1849da98e89cfbbce884d83cf0f7e13c71affc048565a4d1ff86891c7ede5a59f5ebb980f3203b7ee1d05

data/bin/celluloid-benchmark

@@ -16,13 +16,15 @@ require_relative "../lib/celluloid_benchmark/visitor"
 
 benchmark_run = CelluloidBenchmark::Runner.run opts.to_hash
 
-p benchmark_run
-puts
-p "#{benchmark_run.requests / benchmark_run.elapsed_time} requests per second. #{benchmark_run.requests} requests in #{benchmark_run.elapsed_time} seconds by #{benchmark_run.visitors} visitors."
-
 puts
 benchmark_run.benchmarks.each do |trans|
   puts "#{trans.ok? ? '[ OK ]' : '[FAIL]'} #{trans.label}"
 end
 
-exit benchmark_run.ok?
+puts
+p "#{benchmark_run.requests / benchmark_run.elapsed_time} requests per second. #{benchmark_run.requests} requests in #{benchmark_run.elapsed_time} seconds by #{benchmark_run.visitors} visitors. Network time: #{benchmark_run.network_time}"
+
+puts
+p benchmark_run
+
+exit benchmark_run.ok?

data/lib/celluloid_benchmark/benchmark.rb

@@ -40,9 +40,6 @@ module CelluloidBenchmark
       response_codes.all? { |code| code == 200 || code == 201 || code == 302 || code == 304 || code == 401 }
     end
 
-
-    private
-
     def average_response_time
       response_times.reduce(:+) / response_times.size
     end

data/lib/celluloid_benchmark/benchmark_run.rb

@@ -24,20 +24,24 @@ module CelluloidBenchmark
       @thresholds = Hash.new
     end
 
-    def log(http_status_code, start_time, end_time, label, threshold)
-      time = 0
-      if start_time && end_time
-        time = end_time - start_time
-      end
-
-      response_times[label] << time
+    def log(http_status_code, start_time, end_time, server_response_time, label, threshold)
       response_codes[label] << http_status_code.to_i
 
+      network_and_server_time = network_and_server_time(start_time, end_time)
+
+      if server_response_time
+        response_times[label] << server_response_time
+        network_times[label] << network_and_server_time - server_response_time
+      else
+        response_times[label] << network_and_server_time
+        network_times[label] << network_and_server_time
+      end
+
       if threshold
         thresholds[label] = threshold
       end
 
-      logger.info "#{http_status_code} #{time} #{label}"
+      logger.info "#{http_status_code} #{network_and_server_time} #{label}"
     end
 
     def response_times
@@ -52,6 +56,15 @@ module CelluloidBenchmark
       response_times.values.compact.map(&:size).reduce(0, &:+)
     end
 
+    def network_times
+      @network_times ||= Hash.new { |hash, value| hash[value] = [] }
+    end
+
+    def network_time
+      requests = network_times.values.flatten
+      requests.reduce(:+) / requests.size
+    end
+
     def benchmarks
       response_times.map do |label, response_times|
         CelluloidBenchmark::Benchmark.new label, thresholds[label], response_times, response_codes[label]
@@ -83,5 +96,16 @@ module CelluloidBenchmark
         "#{label} #{response_times.reduce(:+) / response_times.size} #{response_times.min} #{response_times.max} #{response_times.size}"
       end
     end
+
+
+    private
+
+    def network_and_server_time(start_time, end_time)
+      if start_time && end_time
+        end_time - start_time
+      else
+        0
+      end
+    end
   end
 end

data/lib/celluloid_benchmark/version.rb

@@ -1,3 +1,3 @@
 module CelluloidBenchmark
-  VERSION = "0.1.15"
+  VERSION = "0.2.0"
 end

data/lib/celluloid_benchmark/visitor.rb

@@ -2,6 +2,7 @@ require "mechanize"
 require "multi_json"
 require "logger"
 require_relative "data_sources"
+require_relative "visitors/http_methods"
 
 module CelluloidBenchmark
   # Actor that models a person using a web browser. Runs a test scenario. Delegates web browsing to
@@ -9,10 +10,11 @@ module CelluloidBenchmark
   class Visitor
     include Celluloid
     include CelluloidBenchmark::DataSources
+    include CelluloidBenchmark::Visitors::HTTPMethods
 
     extend Forwardable
 
-    def_delegators :@browser, :add_auth, :get, :post, :put, :submit, :transact
+    def_delegators :@browser, :add_auth, :submit, :transact
 
     attr_reader :benchmark_run
     attr_accessor :browser
@@ -77,26 +79,6 @@ module CelluloidBenchmark
       end
     end
 
-    def get_json(uri, headers = {})
-      get uri, [], nil, headers.merge("Accept" => "application/json, text/javascript, */*; q=0.01")
-    end
-
-    def post_json(uri, query, headers = {})
-      post(
-        uri,
-        MultiJson.dump(query),
-        { "Content-Type" => "application/json", "Accept" => "application/json, text/javascript, */*; q=0.01" }.merge(headers)
-      )
-    end
-
-    def put_json(uri, query, headers = {})
-      put(
-        uri,
-        MultiJson.dump(query),
-        { "Content-Type" => "application/json", "Accept" => "application/json, text/javascript, */*; q=0.01" }.merge(headers)
-      )
-    end
-
 
     private
 
@@ -107,7 +89,25 @@ module CelluloidBenchmark
 
       browser.post_connect_hooks << proc do |agent, uri, response, body|
         self.request_end_time = Time.now
-        benchmark_run.async.log response.code, request_start_time, request_end_time, current_request_label, current_request_threshold
+      end
+    end
+
+    def server_response_time(page)
+      if page && page["x-runtime"]
+        page["x-runtime"].to_f
+      end
+    end
+
+    def log_response(page)
+      if benchmark_run
+        benchmark_run.async.log(
+          page.code,
+          request_start_time,
+          request_end_time,
+          server_response_time(page),
+          current_request_label,
+          current_request_threshold
+        )
       end
     end
 

data/lib/celluloid_benchmark/visitors/http_methods.rb

@@ -0,0 +1,43 @@
+module CelluloidBenchmark
+  module Visitors
+    module HTTPMethods
+      def get(uri, parameters = [], referer = nil, headers = {})
+        page = browser.get(uri, parameters, referer, headers)
+        log_response page
+        page
+      end
+
+      def post(uri, query = {}, headers = {})
+        page = browser.post(uri, query, headers)
+        log_response page
+        page
+      end
+
+      def put(uri, entity, headers = {})
+        page = browser.put(uri, entity, headers)
+        log_response page
+        page
+      end
+
+      def get_json(uri, headers = {})
+        get uri, [], nil, headers.merge("Accept" => "application/json, text/javascript, */*; q=0.01")
+      end
+
+      def post_json(uri, query, headers = {})
+        post(
+          uri,
+          MultiJson.dump(query),
+          { "Content-Type" => "application/json", "Accept" => "application/json, text/javascript, */*; q=0.01" }.merge(headers)
+        )
+      end
+
+      def put_json(uri, query, headers = {})
+        put(
+          uri,
+          MultiJson.dump(query),
+          { "Content-Type" => "application/json", "Accept" => "application/json, text/javascript, */*; q=0.01" }.merge(headers)
+        )
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.0
 platform: ruby
 authors:
 - Scott Willson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -116,6 +116,7 @@ files:
 - lib/celluloid_benchmark/version.rb
 - lib/celluloid_benchmark/visitor.rb
 - lib/celluloid_benchmark/visitor_group.rb
+- lib/celluloid_benchmark/visitors/http_methods.rb
 homepage: https://github.com/scottwillson/celluloid-benchmark
 licenses:
 - MIT
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Pure Ruby, realistic, website load test tool