You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2020/05/06 10:57:53 UTC
[jmeter] branch master updated (64718d4 -> 20d3535)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 64718d4 Merge remote-tracking branch 'origin/master'
new de26ecd Markup changes and a tiny bit of rewording in the docs
new 20d3535 Only process events in timer, when proxy recorded samplers
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jmeter/protocol/http/proxy/ProxyControl.java | 4 ++++
xdocs/usermanual/component_reference.xml | 20 ++++++++++----------
2 files changed, 14 insertions(+), 10 deletions(-)
[jmeter] 01/02: Markup changes and a tiny bit of rewording in the
docs
Posted by fs...@apache.org.
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
commit de26ecdea0a77a503451c3ec7e71c2694945afd6
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue May 5 16:30:10 2020 +0200
Markup changes and a tiny bit of rewording in the docs
---
xdocs/usermanual/component_reference.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 153c96a..aed9759 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -3430,19 +3430,19 @@ By default, a Graphite implementation is provided.
<properties>
<property name="influxdbMetricsSender" required="Yes"><code>org.apache.jmeter.visualizers.backend.influxdb.HttpMetricsSender</code></property>
- <property name="influxdbUrl" required="Yes">Influx URL (example : http://influxHost:8086/write?db=jmeter)</property>
- <property name="influxdbToken" required="No">InfluxDB 2 <a href="https://v2.docs.influxdata.com/v2.0/security/">authentication token</a> (example : HE9yIdAPzWJDspH_tCc2UvdKZpX==); since 5.2.</property>
- <property name="application" required="Yes">Name of tested application. This value is stored in the 'events' measurement too as a tag named 'application' </property>
- <property name="measurement" required="Yes">Measurement as per <a href="https://docs.influxdata.com/influxdb/v1.1/write_protocols/line_protocol_reference/">Influx Line Protocol Reference</a>. Defaults to "<code>jmeter</code>."</property>
+ <property name="influxdbUrl" required="Yes">Influx URL (example: <code>http://influxHost:8086/write?db=jmeter</code>)</property>
+ <property name="influxdbToken" required="No">InfluxDB 2 <a href="https://v2.docs.influxdata.com/v2.0/security/">authentication token</a> (example: <code>HE9yIdAPzWJDspH_tCc2UvdKZpX==</code>); since 5.2.</property>
+ <property name="application" required="Yes">Name of tested application. This value is stored in the '<code>events</code>' measurement as a tag named '<code>application</code>' </property>
+ <property name="measurement" required="Yes">Measurement as per <a href="https://docs.influxdata.com/influxdb/v1.1/write_protocols/line_protocol_reference/">Influx Line Protocol Reference</a>. Defaults to "<code>jmeter</code>".</property>
<property name="summaryOnly" required="Yes">Only send a summary with no detail. Defaults to <code>true</code>.</property>
<property name="samplersRegex" required="Yes">Regular expression which will be matched against the names of samples and sent to the back end.</property>
- <property name="testTitle" required="Yes">Test name. Defaults to <code>Test name</code>. This value is stored in the 'events' measurement as a field named 'text'. JMeter generate automatically at the start and the end of the test an annotation with this value ending with ' started' and ' ended'</property>
- <property name="eventTags" required="No">Grafana allow to display tag for each annotation. You can fill them here. This value is stored in the 'events' measurement as a tag named 'tags'.</property>
+ <property name="testTitle" required="Yes">Test name. Defaults to <code>Test name</code>. This value is stored in the '<code>events</code>' measurement as a field named '<code>text</code>'. JMeter generate automatically at the start and the end of the test an annotation with this value ending with ' started' and ' ended'</property>
+ <property name="eventTags" required="No">Grafana allow to display tag for each annotation. You can fill them here. This value is stored in the '<code>events</code>' measurement as a tag named '<code>tags</code>'.</property>
<property name="percentiles" required="Yes">The percentiles you want to send to the backend.
- A percentile may contain a fractional part, for example <code>12.5</code>.
- (The separator is always ".")
- List must be semicolon separated. Generally 3 or 4 values should be sufficient.</property>
- <property name="TAG_WhatEverYouWant" required="No">You can add as many custom tags as you want. For each of them, just create a new line and prefix its name by "<code>TAG_</code>"</property>
+ A percentile may contain a fractional part, for example <code>12.5</code>
+ (The separator is always "<code>.</code>").
+ List must be semicolon separated. Generally three or four values should be sufficient.</property>
+ <property name="TAG_WhatEverYouWant" required="No">You can add as many custom tags as you want. For each of them, create a new line and prefix its name by "<code>TAG_</code>"</property>
</properties>
<p>See also <a href="realtime-results.html" >Real-time results</a> and <a href="http://docs.grafana.org/reference/annotations/#influxdb-annotations">Influxdb annotations in Grafana</a> for more details.
There is also a <a href="realtime-results.html#influxdb_v2">subsection on configuring the listener for InfluxDB v2</a>.
[jmeter] 02/02: Only process events in timer,
when proxy recorded samplers
Posted by fs...@apache.org.
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
commit 20d3535cc0360c9ff539836973daea624ace62bf
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Wed May 6 12:51:30 2020 +0200
Only process events in timer, when proxy recorded samplers
Otherwise we get errors, when the Tree model is not
initialized correctly in ProxyControl instances.
The logic with this change is, that at the stage, when
proxy recorded smaplers, the instance has to be set up
correctly
Follow-up to cee4de981d0165416a0d1783ac5ced84531d47a5
Bugzilla Id: 64400
---
.../main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 4780f3c..9016120 100644
--- a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -1134,6 +1134,10 @@ public class ProxyControl extends GenericController implements NonTestElement {
}
private void putSamplesIntoModel(ActionEvent e) {
+ // return early, as JMeterTreeModel might not been initialized yet
+ if (sampleQueue.isEmpty()) {
+ return;
+ }
final JMeterTreeModel treeModel = getJmeterTreeModel();
while (!sampleQueue.isEmpty()) {
SamplerInfo info = sampleQueue.poll();