From commits-return-10448-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Wed Feb 26 20:40:27 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id DFB9D19C9B for ; Wed, 26 Feb 2020 20:40:26 +0000 (UTC) Received: (qmail 18230 invoked by uid 500); 26 Feb 2020 20:40:26 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 18209 invoked by uid 500); 26 Feb 2020 20:40:26 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 18199 invoked by uid 99); 26 Feb 2020 20:40:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Feb 2020 20:40:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id DC1138DACA; Wed, 26 Feb 2020 20:40:25 +0000 (UTC) Date: Wed, 26 Feb 2020 20:40:25 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: Calculate connectTime for parent sampler in transaction controller MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158274962577.9374.10414952845263272551@gitbox.apache.org> From: fschumacher@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: jmeter X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 948e1768b3fc2338500f530e973715d1136c72d9 X-Git-Newrev: 06a7522d6c5de0d099bb5e8641a763b28041187d X-Git-Rev: 06a7522d6c5de0d099bb5e8641a763b28041187d X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. fschumacher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git The following commit(s) were added to refs/heads/master by this push: new 06a7522 Calculate connectTime for parent sampler in transaction controller 06a7522 is described below commit 06a7522d6c5de0d099bb5e8641a763b28041187d Author: Felix Schumacher AuthorDate: Mon Feb 24 14:36:53 2020 +0100 Calculate connectTime for parent sampler in transaction controller Bugzulla Id: 63856 --- .../src/main/java/org/apache/jmeter/control/TransactionSampler.java | 4 ++++ xdocs/changes.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java b/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java index 504dfe9..b8ee999 100644 --- a/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java +++ b/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java @@ -53,6 +53,8 @@ public class TransactionSampler extends AbstractSampler { private long totalTime = 0; + private long totalConnectTime = 0; + /** * @deprecated only for use by test code */ @@ -114,6 +116,7 @@ public class TransactionSampler extends AbstractSampler { transactionSampleResult.addSubResult(res, false); // Add current time to total for later use (exclude pause time) totalTime += res.getTime(); + totalConnectTime += res.getConnectTime(); } protected void setTransactionDone() { @@ -133,6 +136,7 @@ public class TransactionSampler extends AbstractSampler { - transactionSampleResult.getStartTime() - totalTime); transactionSampleResult.setEndTime(end); } + transactionSampleResult.setConnectTime(totalConnectTime); } protected void setSubSampler(Sampler subSampler) { diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 4d8a389..7fa166a 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -203,6 +203,7 @@ to view the last release notes of version 5.2.1.
  • 63945NPE when opening a file after file system change
  • 64034Shell scripts fail if space in JAVA_HOME path. Contributed by ray7219 (ray7219 at hotmail.com)
    • +
  • 63856Set connectTime on parent samples when using a transaction controller
@@ -224,6 +225,7 @@ to view the last release notes of version 5.2.1.
  • Michael McDermott (mcdermott.michaelj at gmail.com)
  • yangxiaofei77 (yangxiaofei77 at gmail.com)
  • Markus Wolf (wolfm at t-systems.com)
    • +
  • Pierre Astruc (pierre.astruc at evertest.com)

    • Apologies if we have omitted anyone else.