2.5.2 - Fixed #36

Author: anthonygauthier

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.delirius325</groupId>
 	<artifactId>jmeter.backendlistener.elasticsearch</artifactId>
-	<version>2.5.1</version>
+	<version>2.5.2</version>
 	<packaging>jar</packaging>
 
 	<name>jmeter.backendlistener.elasticsearch</name>
@@ -42,11 +42,16 @@
 		<junit.vintage.version>${junit.version}.0</junit.vintage.version>
 		<junit.jupiter.version>5.0.0</junit.jupiter.version>
 		<junit.platform.version>1.0.0</junit.platform.version>
-		<org.apache.jmeter.version>4.0</org.apache.jmeter.version>
+		<org.apache.jmeter.version>5.0</org.apache.jmeter.version>
 		<org.apache.commons>3.7</org.apache.commons>
 		<org.elasticsearch.client>6.4.0</org.elasticsearch.client>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20180813</version>
+		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>

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

@@ -197,6 +197,7 @@ private void parseHeadersAsJsonProps(boolean allReqHeaders, boolean allResHeader
         for(String[] lines : headersArrayList) {
             for(int i=0; i < lines.length; i++) {
                 String[] header = lines[i].split(":");
+
                 // if not all req headers and header contains special X-tag
                 if(!this.allReqHeaders && header[0].startsWith("X-es-backend")) {
                     this.json.put(header[0].replaceAll("es-", "").trim(), header[1].trim());

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

@@ -3,17 +3,24 @@
 import org.apache.http.HttpStatus;
 import org.apache.http.entity.ContentType;
 import org.apache.http.nio.entity.NStringEntity;
+import org.apache.http.util.EntityUtils;
+import org.apache.jmeter.threads.JMeterContextService;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 import java.util.*;
 
+import static io.github.delirius325.jmeter.backendlistener.elasticsearch.ElasticSearchRequests.SEND_BULK_REQUEST;
+
 public class ElasticSearchMetricSender {
     private static final Logger logger = LoggerFactory.getLogger(ElasticSearchMetricSender.class);
 
@@ -59,7 +66,7 @@ public ElasticSearchMetricSender(RestClient cli, String index, String user, Stri
      */
     public void createIndex() {
         try {
-            this.client.performRequest("PUT", "/"+ this.esIndex);
+            this.client.performRequest(new Request("PUT", "/" + this.esIndex));
         } catch (Exception e) {
             logger.info("Index already exists!");
         }
@@ -72,7 +79,7 @@ public void createIndex() {
     public void sendRequest() {
         Request request = new Request("POST", "/" + this.esIndex + "/SampleResult/_bulk");
         StringBuilder bulkRequestBody = new StringBuilder();
-        String actionMetaData = String.format("{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", this.esIndex, "SampleResult");
+        String actionMetaData = String.format(SEND_BULK_REQUEST, this.esIndex, "SampleResult");
 
         for (String metric : this.metricList) {
             bulkRequestBody.append(actionMetaData);

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

@@ -0,0 +1,8 @@
+package io.github.delirius325.jmeter.backendlistener.elasticsearch;
+
+public class ElasticSearchRequests {
+    /**
+     * Request to send metrics (JMeter/Percentiles) as ElasticSearch documents
+     */
+    public static String SEND_BULK_REQUEST = "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n";
+}

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

@@ -87,6 +87,7 @@ public void onFailure(Node node) {
             if(filterArray.length >= 1 && !filterArray[0].trim().equals("")) {
                 for (String filter : filterArray) {
                     this.filters.add(filter.toLowerCase().trim());
+                    logger.info("Added filter: " + filter.toLowerCase().trim());
                 }
             }
 
@@ -157,7 +158,7 @@ private boolean validateSample(BackendListenerContext context, SampleResult sr)
         String sampleLabel = sr.getSampleLabel().toLowerCase().trim();
 
         if(this.filters.size() == 0 || this.filters.contains(sampleLabel)) {
-            validSample = (context.getParameter(ES_TEST_MODE).trim().equals("error") && sr.isSuccessful()) ? false : true;
+            validSample = !(context.getParameter(ES_TEST_MODE).trim().equals("error") && sr.isSuccessful());
         }
 
         return validSample;