beaker-benchmark 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad1b7758bee8e9c263e6909925cac7af1fba34f8
-  data.tar.gz: 00fd11a91d73320730633fbf1ef05aeffb91ec16
+SHA256:
+  metadata.gz: 3d364c9ffbb33d937c20b19d76c5cd038605dd3f051ff0c2b333a338086e7fc1
+  data.tar.gz: ee0585b80157575a778fc3f153ee8798e219c825ae7bf9690124683a758d403a
 SHA512:
-  metadata.gz: a5344ecd190011029178205d6eee9b968cc2ab4f90cc7bdb762a647bad4274007f97c9569fd4099e8d4add578cf551fc6d9cf9fa907c277aa9130c6e901213e1
-  data.tar.gz: fd8efade10166d8bc4764f71903269541858ff26f5e967dcd9fe661c00cbfcd7509f8ff7e7203f7a6dac8cddc1bc0991538ceb65a1e425c4949eb2b403728317
+  metadata.gz: 74f817474f7eafbe19c40cd91461eb7d380fa29a2daf244d611e56a8818817d5716e5e295ccf88db9db92e48d0ddce38bf1af2ba164fded979546b8c5031f95c
+  data.tar.gz: dcc8cdfbf6b07857348f6565b034405f50a2a9c31b65ee974d1fa9ce2193a980d8fa32b555ddcc17fb22a0849f0e27077424f8bfcd1fa9dd827e686403018da4

data/Rakefile

@@ -1,4 +1,4 @@
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 namespace :test do
 
@@ -152,3 +152,8 @@ namespace :docs do
     end
   end
 end
+
+namespace :gem do
+  # add the Bundler gem tasks (build, clean, clobber, install, release)
+  require "bundler/gem_tasks"
+end

data/beaker-benchmark.gemspec

@@ -5,12 +5,12 @@ require 'beaker-benchmark/version'
 Gem::Specification.new do |s|
   s.name        = "beaker-benchmark"
   s.version     = Beaker::DSL::BeakerBenchmark::Version::STRING
-  s.authors     = ["Puppetlabs"]
-  s.email       = ["silver-team@puppetlabs.com"]
+  s.authors     = ["Puppet"]
+  s.email       = ["team-system-level-validation@puppet.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-benchmark"
   s.summary     = %q{Beaker benchmark Helpers!}
   s.description = %q{Used to monitor performance on a puppet infrastructure node in a Beaker test}
-  s.license     = 'Apache2'
+  s.license     = "Apache-2.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/beaker-benchmark/helpers.rb

@@ -33,7 +33,7 @@ module Beaker
 
         TMP_DIR = "tmp/atop/#{@@session_timestamp}"
 
-                # Example usage:
+        # Example usage:
         # test_name('measure_perf_on_puppetserver_start') {
         #   on(master, 'puppet resource service pe-puppetserver ensure=stopped')
         #   result = measure_perf_on(master, 'start_pe-puppetserver', true) {
@@ -135,13 +135,13 @@ module Beaker
               when 'PRM'
                 add_process_measure(:mem_usage, row[PROC_PID_INDEX], row[PROC_MEM_INDEX].to_i)
               when 'PRD'
-                # TODO: investigate why atop always shows disk_read as 0
-                # add_process_measure(:disk_read, row[PROC_PID_INDEX], row[PROC_DISK_READ_INDEX].to_i)
+                add_process_measure(:disk_read, row[PROC_PID_INDEX], row[PROC_DISK_READ_INDEX].to_i)
                 add_process_measure(:disk_write, row[PROC_PID_INDEX], row[PROC_DISK_WRITE_INDEX].to_i)
             end
           end
 
-          PerformanceResult.new({ :cpu => cpu_usage, :mem => mem_usage, :disk_read => disk_read, :disk_write => disk_write, :action => @action_name, :duration => duration, :processes => @processes_to_monitor, :logger => @logger, :hostname => infrastructure_host})
+          # rounding duration to improve results formatting
+          PerformanceResult.new({ :cpu => cpu_usage, :mem => mem_usage, :disk_read => disk_read, :disk_write => disk_write, :action => @action_name, :duration => duration.round(2), :processes => @processes_to_monitor, :logger => @logger, :hostname => infrastructure_host})
         end
 
         def set_processes_to_monitor(infrastructure_host, process_regex)
@@ -174,7 +174,7 @@ module Beaker
           def initialize(args)
             @avg_cpu = args[:cpu].empty? ? 0 : args[:cpu].inject{ |sum, el| sum + el } / args[:cpu].size
             @avg_mem = args[:mem].empty? ? 0 : args[:mem].inject{ |sum, el| sum + el } / args[:mem].size
-            # @avg_disk_read = args[:disk_read].empty? ? 0 : args[:disk_read].inject{ |sum, el| sum + el } / args[:disk_read].size
+            @avg_disk_read = args[:disk_read].empty? ? 0 : args[:disk_read].inject{ |sum, el| sum + el } / args[:disk_read].size
             @avg_disk_write = args[:disk_write].empty? ? 0 : args[:disk_write].inject{ |sum, el| sum + el } / args[:disk_write].size
             @action_name = args[:action]
             @duration = args[:duration]
@@ -186,7 +186,7 @@ module Beaker
             @processes.keys.each do |key|
               @processes[key][:avg_cpu] = @processes[key][:cpu_usage].inject{ |sum, el| sum + el } / @processes[key][:cpu_usage].size unless @processes[key][:cpu_usage].empty?
               @processes[key][:avg_mem] = @processes[key][:mem_usage].inject{ |sum, el| sum + el } / @processes[key][:mem_usage].size unless @processes[key][:mem_usage].empty?
-              # @processes[key][:avg_disk_read] = @processes[key][:disk_read].inject{ |sum, el| sum + el } / @processes[key][:disk_read].size unless @processes[key][:disk_read].empty?
+              @processes[key][:avg_disk_read] = @processes[key][:disk_read].inject{ |sum, el| sum + el } / @processes[key][:disk_read].size unless @processes[key][:disk_read].empty?
               @processes[key][:avg_disk_write] = @processes[key][:disk_write].inject{ |sum, el| sum + el } / @processes[key][:disk_write].size unless @processes[key][:disk_write].empty?
             end if @processes
             # TODO: At this point, we need to push these results into bigquery or elasticsearch

data/lib/beaker-benchmark/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module BeakerBenchmark
 
       module Version
-        STRING = '0.0.6'
+        STRING = '0.0.7'
       end
 
     end

data/spec/beaker-benchmark/performance_result_spec.rb

@@ -12,9 +12,9 @@ end
 
 describe ClassMixedWithDSLHelpers do
   subject { Beaker::DSL::BeakerBenchmark::Helpers::PerformanceResult.new (
-            {:cpu => [60, 40], :mem => [6000, 4000], :disk_write => [600, 400], :action => 'test_action', :duration => 10,
-             :processes => {1000 => {:cmd => 'proc1', :cpu_usage => [10, 20], :mem_usage => [1000, 2000], :disk_write => [100, 200]},
-                            2000 => {:cmd => 'proc2', :cpu_usage => [20, 40], :mem_usage => [2000, 4000], :disk_write => [200, 400]}},
+            {:cpu => [60, 40], :mem => [6000, 4000], :disk_read => [600, 400], :disk_write => [600, 400], :action => 'test_action', :duration => 10,
+             :processes => {1000 => {:cmd => 'proc1', :cpu_usage => [10, 20], :mem_usage => [1000, 2000], :disk_read => [100, 200], :disk_write => [100, 200]},
+                            2000 => {:cmd => 'proc2', :cpu_usage => [20, 40], :mem_usage => [2000, 4000], :disk_read => [200, 400], :disk_write => [200, 400]}},
              :logger => logger, :hostname => 'my_host'}) }
 
   describe 'initialize' do
@@ -57,11 +57,11 @@ describe ClassMixedWithDSLHelpers do
       csv_file_content = file.read
       expected_content = <<-EOS
 Action,Duration,Avg CPU,Avg MEM,Avg DSK read,Avg DSK Write
-test_action,10,50,5000,,500
+test_action,10,50,5000,500,500
 
 Process pid,command,Avg CPU,Avg MEM,Avg DSK read,Avg DSK Write
-1000,'proc1',15,1500,,150
-2000,'proc2',30,3000,,300
+1000,'proc1',15,1500,150,150
+2000,'proc2',30,3000,300,300
       EOS
       expect(csv_file_content).to eq(expected_content)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
-- Puppetlabs
+- Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -153,7 +153,7 @@ dependencies:
 description: Used to monitor performance on a puppet infrastructure node in a Beaker
   test
 email:
-- silver-team@puppetlabs.com
+- team-system-level-validation@puppet.com
 executables:
 - beaker-benchmark
 extensions: []
@@ -181,7 +181,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/beaker-benchmark
 licenses:
-- Apache2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Beaker benchmark Helpers!