From 5cd7b362cb735b00d40ab7151d558be92c3c2d06 Mon Sep 17 00:00:00 2001
From: Philippe Mouawad <pmouawad@apache.org>
Date: Sat, 24 Mar 2018 11:24:46 +0000
Subject: [PATCH] Bug 62203 - Influxdb BackendListener client: store user tags
 to annotation and internal transaction Contributed by Sergey Batalin Bugzilla
 Id: 62203

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1827633 13f79535-47bb-0310-9956-ffa450edef68
---
 .../backend/influxdb/InfluxdbBackendListenerClient.java      | 5 +++--
 xdocs/changes.xml                                            | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java b/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
index 6496026a46..e6437f17f3 100644
--- a/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
+++ b/src/components/org/apache/jmeter/visualizers/backend/influxdb/InfluxdbBackendListenerClient.java
@@ -152,9 +152,10 @@ public class InfluxdbBackendListenerClient extends AbstractBackendListenerClient
 
         UserMetric userMetrics = getUserMetrics();
         // For JMETER context
-        StringBuilder tag = new StringBuilder(60);
+        StringBuilder tag = new StringBuilder(80);
         tag.append(TAG_APPLICATION).append(application);
         tag.append(TAG_TRANSACTION).append("internal");
+        tag.append(userTag);
         StringBuilder field = new StringBuilder(80);
         field.append(METRIC_MIN_ACTIVE_THREADS).append(userMetrics.getMinActiveThreads()).append(',');
         field.append(METRIC_MAX_ACTIVE_THREADS).append(userMetrics.getMaxActiveThreads()).append(',');
@@ -414,7 +415,7 @@ public class InfluxdbBackendListenerClient extends AbstractBackendListenerClient
      */
     private void addAnnotation(boolean startOrEnd) {
         influxdbMetricsManager.addMetric(EVENTS_FOR_ANNOTATION, 
-                TAG_APPLICATION + application + ",title=ApacheJMeter"+
+                TAG_APPLICATION + application + ",title=ApacheJMeter"+ userTag +
                 (StringUtils.isNotEmpty(testTags) ? TAGS+ testTags : ""), 
                 TEXT +  
                         AbstractInfluxdbMetricsSender.fieldToStringValue(testTitle +
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index d87363873a..c58944c029 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -161,6 +161,7 @@ this behaviour, set <code>httpclient.reset_state_on_thread_group_iteration=false
 <h3>Listeners</h3>
 <ul>
   <li><bug>62097</bug>Update JTable in Aggregate Report only when new data has arrived. That way selections of rows will be kept longer around.</li>
+  <li><bug>62203</bug>Influxdb BackendListener client: store user tags to annotation and internal transaction. Contributed by Sergey Batalin (sergey_batalin at mail.ru)</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
@@ -207,6 +208,7 @@ this behaviour, set <code>httpclient.reset_state_on_thread_group_iteration=false
     <li>Olaf Flebbe (oflebbe at apache.org)</li>
     <li>Peter Doornbosch (peter.doornbosch at luminis.eu)</li>
     <li>logox01 (logox01 at gmx.at)</li>
+    <li>Sergey Batalin (sergey_batalin at mail.ru)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter.</p>
 <p>