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 2019/09/17 21:21:05 UTC
[jmeter] branch master updated (0928222 -> 7b05a9c)
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 0928222 Correct a typo in Chinese translations
add 403d00a Formatting & whitespace
add 8b5fc9a Used Map.forEach and added guard clause
add 5ec8e85 Inlined vars
add beef64f Used Array.stream and extracted method.
add 19f970e Build string outside of sync block.
add 9565649 Rename var and extracted method and remove clear
add 075432d Formatting/Reordering
add 7762594 Added TextGraphiteMetricsSenderSpec and test setup code in TextGraphiteMetricsSender
add 34d7a51 Added PickleGraphiteMetricsSenderSpec and test setup code in PickleGraphiteMetricsSender
add ac7d2b3 Corrected link and added extra tests for convertMetricsToPickleFormat
new 6e166dd Merge branch 'graphite-metrics-coverage' of https://github.com/ham1/jmeter into ham1-graphite-metrics-coverage
new 027b3ce Replace forEarch by regular map iteration, mention pr in changes.xml
new 7b05a9c Merge branch 'ham1-graphite-metrics-coverage'
The 3 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:
.../graphite/AbstractGraphiteMetricsSender.java | 4 +-
.../graphite/GraphiteBackendListenerClient.java | 205 ++++++++++-----------
.../backend/graphite/GraphiteMetricsSender.java | 24 +--
.../graphite/PickleGraphiteMetricsSender.java | 155 ++++++++--------
.../graphite/TextGraphiteMetricsSender.java | 112 +++++------
.../PickleGraphiteMetricsSenderSpec.groovy | 122 ++++++++++++
.../graphite/TextGraphiteMetricsSenderSpec.groovy | 89 +++++++++
xdocs/changes.xml | 1 +
8 files changed, 459 insertions(+), 253 deletions(-)
create mode 100644 src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/graphite/PickleGraphiteMetricsSenderSpec.groovy
create mode 100644 src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/graphite/TextGraphiteMetricsSenderSpec.groovy
[jmeter] 02/03: Replace forEarch by regular map iteration,
mention pr in changes.xml
Posted by pm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 027b3ce15d30dd6a5aedee84b8efb638ef21bddf
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Tue Sep 17 23:20:10 2019 +0200
Replace forEarch by regular map iteration, mention pr in changes.xml
---
.../graphite/GraphiteBackendListenerClient.java | 33 +++++++++++++---------
xdocs/changes.xml | 1 +
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
index 4ee0442..615d29e 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
@@ -151,7 +151,9 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient
// Need to convert millis to seconds for Graphite
long timestampInSeconds = TimeUnit.SECONDS.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
synchronized (LOCK) {
- getMetricsPerSampler().forEach((key, metric) -> {
+ for (Map.Entry<String, SamplerMetric> entry : getMetricsPerSampler().entrySet()) {
+ final String key = entry.getKey();
+ final SamplerMetric metric = entry.getValue();
if (key.equals(CUMULATED_METRICS)) {
addMetrics(timestampInSeconds, ALL_CONTEXT_NAME, metric);
} else {
@@ -159,7 +161,7 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient
}
// We are computing on interval basis so cleanup
metric.resetForTimeInterval();
- });
+ }
}
UserMetric userMetric = getUserMetrics();
graphiteMetricsManager.addMetric(timestampInSeconds, TEST_CONTEXT_NAME,
@@ -219,10 +221,11 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient
graphiteMetricsManager.addMetric(timestampInSeconds,
contextName, METRIC_OK_AVG_RESPONSE_TIME,
Double.toString(metric.getOkMean()));
- okPercentiles.forEach((key, value) ->
- graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
- key,
- Double.toString(metric.getOkPercentile(value.floatValue()))));
+ for (Map.Entry<String, Float> entry : okPercentiles.entrySet()) {
+ graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+ entry.getKey(),
+ Double.toString(metric.getOkPercentile(entry.getValue().floatValue())));
+ }
}
if (metric.getFailures() > 0) {
graphiteMetricsManager.addMetric(timestampInSeconds,
@@ -234,10 +237,11 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient
graphiteMetricsManager.addMetric(timestampInSeconds,
contextName, METRIC_KO_AVG_RESPONSE_TIME,
Double.toString(metric.getKoMean()));
- koPercentiles.forEach((key, value) ->
- graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
- key,
- Double.toString(metric.getKoPercentile(value.floatValue()))));
+ for (Map.Entry<String, Float> entry : koPercentiles.entrySet()) {
+ graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+ entry.getKey(),
+ Double.toString(metric.getKoPercentile(entry.getValue().floatValue())));
+ }
}
graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
METRIC_ALL_MIN_RESPONSE_TIME,
@@ -248,10 +252,11 @@ public class GraphiteBackendListenerClient extends AbstractBackendListenerClient
graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
METRIC_ALL_AVG_RESPONSE_TIME,
Double.toString(metric.getAllMean()));
- allPercentiles.forEach((key, value) ->
- graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
- key,
- Double.toString(metric.getAllPercentile(value.floatValue()))));
+ for (Map.Entry<String, Float> entry : allPercentiles.entrySet()) {
+ graphiteMetricsManager.addMetric(timestampInSeconds, contextName,
+ entry.getKey(),
+ Double.toString(metric.getAllPercentile(entry.getValue().floatValue())));
+ }
}
/** @return the samplersList */
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 4969c6c..ceeb021 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -143,6 +143,7 @@ to view the last release notes of version 5.1.1.
<li><bug>63529</bug>Add more unit tests for org.apache.jorphan.util.JOrphanUtils. Contributed by John Bergqvist(John.Bergqvist at diffblue.com)</li>
<li>Updated to latest checkstyle (version 8.22)</li>
<li>Clean-up of code in <code>CompareAssertion</code> and other locations. Based on patch by Graham Russell (graham at ham1.co.uk)</li>
+ <li><pr>491</pr>Increase Graphite metrics coverage. Contributed by Graham Russell (graham at ham1.co.uk)</li>
</ul>
<!-- =================== Bug fixes =================== -->
[jmeter] 03/03: Merge branch 'ham1-graphite-metrics-coverage'
Posted by pm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 7b05a9c98edeb35172c6136eb0a30e8020c43ea9
Merge: 0928222 027b3ce
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Tue Sep 17 23:20:20 2019 +0200
Merge branch 'ham1-graphite-metrics-coverage'
.../graphite/AbstractGraphiteMetricsSender.java | 4 +-
.../graphite/GraphiteBackendListenerClient.java | 205 ++++++++++-----------
.../backend/graphite/GraphiteMetricsSender.java | 24 +--
.../graphite/PickleGraphiteMetricsSender.java | 155 ++++++++--------
.../graphite/TextGraphiteMetricsSender.java | 112 +++++------
.../PickleGraphiteMetricsSenderSpec.groovy | 122 ++++++++++++
.../graphite/TextGraphiteMetricsSenderSpec.groovy | 89 +++++++++
xdocs/changes.xml | 1 +
8 files changed, 459 insertions(+), 253 deletions(-)
[jmeter] 01/03: Merge branch 'graphite-metrics-coverage' of
https://github.com/ham1/jmeter into ham1-graphite-metrics-coverage
Posted by pm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 6e166dd561d72bed269143fbd7a33b08ec295856
Merge: 0928222 ac7d2b3
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Tue Sep 17 23:12:52 2019 +0200
Merge branch 'graphite-metrics-coverage' of https://github.com/ham1/jmeter into ham1-graphite-metrics-coverage
.../graphite/AbstractGraphiteMetricsSender.java | 4 +-
.../graphite/GraphiteBackendListenerClient.java | 212 ++++++++++-----------
.../backend/graphite/GraphiteMetricsSender.java | 24 +--
.../graphite/PickleGraphiteMetricsSender.java | 155 ++++++++-------
.../graphite/TextGraphiteMetricsSender.java | 112 +++++------
.../PickleGraphiteMetricsSenderSpec.groovy | 122 ++++++++++++
.../graphite/TextGraphiteMetricsSenderSpec.groovy | 89 +++++++++
7 files changed, 459 insertions(+), 259 deletions(-)