jmeter_perf 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1953dbeec068d309f9602732fd4e869f983183db4e3042d064ba1e66d82ce392
-  data.tar.gz: '0582be320dc704d59b08e00c9e8ac629abfcf8e2cb6814c66b9723aaea86de3a'
+  metadata.gz: 600531edf66d0d72c64c6015327f9b63db03ab11357e28758a7250aead0d9106
+  data.tar.gz: f254970ad87fb7850e4989d25c3f6437cb037614a76cd5c145b6c3bb5db6b4a3
 SHA512:
-  metadata.gz: 0cf02d52a911f48b3d2c56916d13968c446b98207680dafac44eea0be1b085f71ea13fe70738271c63cb1387f8792e7c161ab711706fb0a652e41d41924b0283
-  data.tar.gz: 4e374d93ecc6156d54e4c14882c824d038c08221f3cfb346cba29299dac32e416a6fcb5db1e48d3668906fa5433ddece6a453be08b7f802319b7344a1b896240
+  metadata.gz: 14c69cb7eac86ce588226a5c69a4b791e7d4f9015034c2314f9c13daab0a5dbeab5feeaaaaf6f58fe9be22c3216ac99e94f9d0e718cc1027ea4aa0d2e43e43a7
+  data.tar.gz: 2608a6d4db406a42a9bbaf2874e2cebfdb0768b62100e5515eb68a098683fc191410632aa9c314c0b17a8884405fc314499473d7335dc4d4177b3c56e8f3abfe

data/lib/jmeter_perf/report/summary.rb

@@ -188,33 +188,27 @@ module JmeterPerf
 
       # Starts streaming and processing JTL file content asynchronously.
       # @note Once streaming, in order to finish processing, call `finish!` otherwise it will continue indefinitely.
-      # @return [Thread] a thread that handles the asynchronous file streaming and parsing
+      # @return [void]
       def stream_jtl_async
         @processing_jtl_thread = Thread.new do
-          Timeout.timeout(@jtl_read_timeout) do
+          Timeout.timeout(@jtl_read_timeout, nil, "Timed out attempting to open JTL File #{@file_path}") do
             sleep 0.1 until File.exist?(@file_path) # Wait for the file to be created
           end
 
           File.open(@file_path, "r") do |file|
             until @finished && file.eof?
-              line = nil
-
-              # Protect against blocking reads that are still in progress
-              Timeout.timeout(@jtl_read_timeout) do
-                line = file.gets
-                sleep 0.1 until line || file.eof? || @finished
-              end
+              line = file.gets
 
-              # Skip if the line is nil. Could be EOF but not yet marked as finished or vice versa.
+              # Skip if the line is nil. This can happen if not @finished, and we are at EOF
               next if line.nil?
-              # Process only if the line is complete (ends with a newline)
+              # Process only if the line is complete. JMeter always finishes with a newline
               read_until_complete_line(file, line)
             end
           end
         end
 
         @processing_jtl_thread.abort_on_exception = true
-        @processing_jtl_thread
+        nil
       end
 
       # Summarizes the collected data by calculating statistical metrics and error rates.
@@ -232,16 +226,19 @@ module JmeterPerf
       private
 
       def read_until_complete_line(file, line)
-        return if file.lineno == 1 # Skip the header row
-        Timeout.timeout(@jtl_read_timeout) do
-          until line.end_with?("\n")
+        lineno = file.lineno
+        return if lineno == 1 # Skip the header row
+        Timeout.timeout(@jtl_read_timeout, nil, "Timed out processing line #{lineno}") do
+          # If finished and eof but no newline: Means processing was interrupted
+          # JMeter always finishes with a new line in the JTL file
+          until line.end_with?("\n") || (file.eof? && @finished)
             sleep 0.1
             line += file.gets.to_s
           end
         end
         parse_csv_row(line)
       rescue Timeout::Error
-        raise Timeout::Error, "Timed out reading JTL file at line #{file.lineno}"
+        raise Timeout::Error, "Timed out reading JTL file at line #{lineno}"
       rescue CSV::MalformedCSVError
         @csv_error_lines << file.lineno
       end

data/lib/jmeter_perf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JmeterPerf
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/jmeter_perf.rb

@@ -61,7 +61,7 @@ module JmeterPerf
       @root = Nokogiri::XML(JmeterPerf::Helpers::String.strip_heredoc(
         <<-EOF
           <?xml version="1.0" encoding="UTF-8"?>
-          <jmeterTestPlan version="1.2" properties="3.1" jmeter="3.1" ruby-jmeter="3.0">
+          <jmeterTestPlan version="1.2" properties="3.1" jmeter="3.1" jmeterperf="#{JmeterPerf::VERSION}">
           <hashTree>
           </hashTree>
           </jmeterTestPlan>
@@ -74,17 +74,17 @@ module JmeterPerf
 
     # Saves the test plan as a JMX file.
     #
-    # @param out_jmx [String] The path for the output JMX file (default: `"ruby-jmeter.jmx"`).
-    def jmx(out_jmx: "ruby-jmeter.jmx")
+    # @param out_jmx [String] The path for the output JMX file (default: `"jmeter_perf.jmx"`).
+    def jmx(out_jmx: "jmeter_perf.jmx")
       File.write(out_jmx, doc.to_xml(indent: 2))
       logger.info "JMX saved to: #{out_jmx}"
     end
 
     # Runs the test plan with the specified configuration.
     #
-    # @param name [String] The name of the test run (default: `"ruby-jmeter"`).
+    # @param name [String] The name of the test run (default: `"jmeter_perf"`).
     # @param jmeter_path [String] Path to the JMeter executable (default: `"jmeter"`).
-    # @param out_jmx [String] The filename for the output JMX file (default: `"ruby-jmeter.jmx"`).
+    # @param out_jmx [String] The filename for the output JMX file (default: `"jmeter_perf.jmx"`).
     # @param out_jtl [String] The filename for the output JTL file (default: `"jmeter.jtl"`).
     # @param out_jmeter_log [String] The filename for the JMeter log file (default: `"jmeter.log"`).
     # @param out_cmd_log [String] The filename for the command log file (default: `"jmeter-cmd.log"`).
@@ -92,9 +92,9 @@ module JmeterPerf
     # @return [JmeterPerf::Report::Summary] The summary report of the test run.
     # @raise [RuntimeError] If the test execution fails.
     def run(
-      name: "ruby-jmeter",
+      name: "jmeter_perf",
       jmeter_path: "jmeter",
-      out_jmx: "ruby-jmeter.jmx",
+      out_jmx: "jmeter_perf.jmx",
       out_jtl: "jmeter.jtl",
       out_jmeter_log: "jmeter.log",
       out_cmd_log: "jmeter-cmd.log",

data/sig/jmeter_perf.rbs

@@ -9,11 +9,11 @@ module JmeterPerf
     attr_accessor root: ::Nokogiri::XML::Document
 
     def initialize: (params: Hash[Symbol, untyped] ?) -> void
-    def jmx: (out_jmx: String = "ruby-jmeter.jmx") -> void
+    def jmx: (out_jmx: String = "jmeter_perf.jmx") -> void
     def run: (
-      name: String = "ruby-jmeter",
+      name: String = "jmeter_perf",
       jmeter_path: String = "jmeter",
-      out_jmx: String = "ruby-jmeter.jmx",
+      out_jmx: String = "jmeter_perf.jmx",
       out_jtl: String = "jmeter.jtl",
       out_jmeter_log: String = "jmeter.log",
       out_cmd_log: String = "jmeter-cmd.log",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jmeter_perf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jean Luis Urena
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-03 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri