Version 2.6.5

Author: anthonygauthier

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetric.java

@@ -71,8 +71,9 @@ public Map<String, Object> getMetric(BackendListenerContext context) throws Exce
         addFilteredJSON("ThreadName", this.sampleResult.getThreadName());
         addFilteredJSON("URL", this.sampleResult.getURL());
         addFilteredJSON("ResponseCode", this.sampleResult.getResponseCode());
-        addFilteredJSON("StartTime", sdf.format(new Date(this.sampleResult.getStartTime())));
-        addFilteredJSON("EndTime", sdf.format(new Date(this.sampleResult.getEndTime())));
+        addFilteredJSON("TestStartTime", JMeterContextService.getTestStartTime());
+        addFilteredJSON("SampleStartTime", sdf.format(new Date(this.sampleResult.getStartTime())));
+        addFilteredJSON("SampleEndTime", sdf.format(new Date(this.sampleResult.getEndTime())));
         addFilteredJSON("Timestamp", sdf.format(new Date(this.sampleResult.getTimeStamp())));
         addFilteredJSON("InjectorHostname", InetAddress.getLocalHost().getHostName());
 

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java

@@ -89,17 +89,10 @@ private Request setAuthorizationHeader(Request request) {
      * @throws IOException
      */
     public void createIndex() throws IOException {
-        Response response = null;
         try {
-            response = this.client.performRequest(setAuthorizationHeader(new Request("PUT", "/" + this.esIndex)));
-            if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK && logger.isErrorEnabled()) {
-                logger.error("ElasticSearch Backend Listener failed to create index {}", this.esIndex);
-            }
+            this.client.performRequest(setAuthorizationHeader(new Request("PUT", "/" + this.esIndex)));
         } catch (Exception e) {
-            logger.info("ElasticSearch Backend Listener failed to create index {}", this.esIndex);
-            if (logger.isErrorEnabled()) {
-                logger.error("Exception" + e);
-            }
+            logger.info("Index already exists!");
         }
     }
 

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticsearchBackendClient.java

@@ -61,6 +61,7 @@ public class ElasticsearchBackendClient extends AbstractBackendListenerClient {
         DEFAULT_ARGS.put(ES_BULK_SIZE, "100");
         DEFAULT_ARGS.put(ES_TIMEOUT_MS, Long.toString(DEFAULT_TIMEOUT_MS));
         DEFAULT_ARGS.put(ES_SAMPLE_FILTER, null);
+        DEFAULT_ARGS.put(ES_FIELDS, null);
         DEFAULT_ARGS.put(ES_TEST_MODE, "info");
         DEFAULT_ARGS.put(ES_AUTH_USER, "");
         DEFAULT_ARGS.put(ES_AUTH_PWD, "");