You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/09/11 20:08:53 UTC

svn commit: r1760277 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/reporters/Summariser.java xdocs/changes.xml xdocs/usermanual/properties_reference.xml

Author: pmouawad
Date: Sun Sep 11 20:08:53 2016
New Revision: 1760277

URL: http://svn.apache.org/viewvc?rev=1760277&view=rev
Log:
Bug 60109 - Summariser : Make it ignore TC generated SampleResult in its summary computations
Bugzilla Id: 60109

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1760277&r1=1760276&r2=1760277&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Sep 11 20:08:53 2016
@@ -874,6 +874,10 @@ summariser.name=summary
 # Write messages to System.out
 #summariser.out=true
 
+# Ignore SampleResults generated by TransactionControllers
+# defaults to true 
+#summariser.ignore_transaction_controller_sample_result=true
+
 
 #---------------------------------------------------------------------------
 # Aggregate Report and Aggregate Graph - configuration

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=1760277&r1=1760276&r2=1760277&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java Sun Sep 11 20:08:53 2016
@@ -25,6 +25,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.jmeter.control.TransactionController;
 import org.apache.jmeter.engine.util.NoThreadClone;
 import org.apache.jmeter.samplers.Remoteable;
 import org.apache.jmeter.samplers.SampleEvent;
@@ -79,6 +80,9 @@ public class Summariser extends Abstract
 
     /** Write messages to System.out ? */
     private static final boolean TOOUT = JMeterUtils.getPropDefault("summariser.out", true); //$NON-NLS-1$
+    
+    /** Ignore TC generated SampleResult in summary */
+    private static final boolean IGNORE_TC_GENERATED_SAMPLERESULT = JMeterUtils.getPropDefault("summariser.ignore_transaction_controller_sample_result", true); //$NON-NLS-1$
 
     /*
      * Ensure that a report is not skipped if we are slightly late in checking
@@ -168,6 +172,9 @@ public class Summariser extends Abstract
     @Override
     public void sampleOccurred(SampleEvent e) {
         SampleResult s = e.getResult();
+        if(IGNORE_TC_GENERATED_SAMPLERESULT && TransactionController.isFromTransactionController(s)) {
+            return;
+        }
 
         long now = System.currentTimeMillis() / 1000;// in seconds
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1760277&r1=1760276&r2=1760277&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Sep 11 20:08:53 2016
@@ -67,7 +67,8 @@ Summary
 <ul>
     <li>A cache for CSS Parsing of URLs has been introduced in this version, it is enabled by default. It is controlled by property <code>css.parser.cache.size</code>. It can be disabled by setting its value to 0. See <bugzilla>59885</bugzilla></li>
     <li>ThroughputController defaults have changed. Now defaults are Percent Executions which is global and no more per user. See <bugzilla>60023</bugzilla></li>
-    <li>Since 3.1 version, HTML ignores Empty Transaction controller (possibly generated by If Controller or Throughput Controller) when computing metrics. This provides more accurate metrics</li>
+    <li>Since 3.1 version, HTML report ignores Empty Transaction controller (possibly generated by If Controller or Throughput Controller) when computing metrics. This provides more accurate metrics</li>
+    <li>Since 3.1 version, Summariser ignores SampleResults generated by TransactionController when computing the live statistics, see <bugzilla>60109</bugzilla></li>
 </ul>
 
 <h3>Deprecated and removed elements</h3>
@@ -101,6 +102,7 @@ Summary
 <ul>
     <li><bug>59953</bug>GraphiteBackendListener : Add Average metric. Partly contributed by Maxime Chassagneux (maxime.chassagneux at gmail.com)</li>
     <li><bug>59975</bug>View Results Tree : Text renderer annoyingly scrolls down when content is bulky. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+    <li><bug>60109</bug>Summariser : Make it ignore TC generated SampleResult in its summary computations</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1760277&r1=1760276&r2=1760277&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sun Sep 11 20:08:53 2016
@@ -515,6 +515,7 @@ Other parsers:<br/>
 <property name="summariser.interval"><br/> interval between summaries (in seconds) default 30 seconds<br/>, defaults to:30</property>
 <property name="summariser.log"><br/> Write messages to log file<br/>, defaults to:true</property>
 <property name="summariser.out"><br/> Write messages to System.out<br/>, defaults to:true</property>
+<property name="summariser.ignore_transaction_controller_sample_result"><br/> Ignore SampleResults generated by TransactionControllers<br/>, defaults to true</property>
 </properties>
 </section>
 <section name="&sect-num;.30 Aggregate Report and Aggregate Graph - configuration" anchor="aggregate_report_graph">