Merge branch 'master' into master

Author: anthonygauthier

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [delirius325]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.travis.yml

@@ -1,3 +1,3 @@
 language: java
 jdk:
-- oraclejdk8
+- oraclejdk9

README.md

@@ -46,7 +46,7 @@ JMeter ElasticSearch Backend Listener is a JMeter plugin enabling you to send te
   * __quiet__ : Only sends the response time, bytes, and other metrics
   * __error__ : Only sends the failing samplers to the ElasticSearch engine (Along with their headers and body information).
 * Use either Kibana or Grafana to vizualize your results!
-  * [Click here to get a sample Grafana dashboard!](https://github.com/delirius325/jmeter-elasticsearch-backend-listener/wiki/JMeter-Generic-Dashboard) - All you need to do is import it into Grafana and change de data source!
+  * [Click here to get a sample Grafana dashboard!](https://github.com/delirius325/jmeter-elasticsearch-backend-listener/wiki/JMeter-Generic-Dashboard) - All you need to do is import it into Grafana and change the data source!
 * Continuous Integration support - [Build comparison!](https://github.com/delirius325/jmeter-elasticsearch-backend-listener/wiki/Continuous-Integration---Build-Comparison)
 * Send JMeter variables to ElasticSearch! [Refer to this for more info!](https://github.com/delirius325/jmeter-elasticsearch-backend-listener/wiki/Sending-JMeter-variables) 
 * New AWS ES parameters introducted in 2.6.0 version which leverage Role based authentication to access Elastic Search managed hosting on AWS
@@ -56,7 +56,8 @@ JMeter ElasticSearch Backend Listener is a JMeter plugin enabling you to send te
 <dependency>
   <groupId>io.github.delirius325</groupId>
   <artifactId>jmeter.backendlistener.elasticsearch</artifactId>
-  <version>2.6.7</version>
+  <version>2.6.9</version>
+</dependency>
 ```
 
 ## Contributing

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.delirius325</groupId>
 	<artifactId>jmeter.backendlistener.elasticsearch</artifactId>
-	<version>2.6.7</version>
+	<version>2.6.9</version>
 	<packaging>jar</packaging>
 
 	<name>jmeter.backendlistener.elasticsearch</name>

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

@@ -32,7 +32,7 @@ public class ElasticSearchMetric {
     private boolean allResHeaders;
 
     public ElasticSearchMetric(SampleResult sr, String testMode, String timeStamp, int buildNumber,
-            boolean parseReqHeaders, boolean parseResHeaders, Set<String> fields) {
+                               boolean parseReqHeaders, boolean parseResHeaders, Set<String> fields) {
         this.sampleResult = sr;
         this.esTestMode = testMode.trim();
         this.esTimestamp = timeStamp.trim();
@@ -45,9 +45,8 @@ public ElasticSearchMetric(SampleResult sr, String testMode, String timeStamp, i
 
     /**
      * This method returns the current metric as a Map(String, Object) for the provided sampleResult
-     * 
-     * @param context
-     *            BackendListenerContext
+     *
+     * @param context BackendListenerContext
      * @return a JSON Object as Map(String, Object)
      */
     public Map<String, Object> getMetric(BackendListenerContext context) throws Exception {
@@ -74,27 +73,27 @@ public Map<String, Object> getMetric(BackendListenerContext context) throws Exce
         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("Timestamp", this.sampleResult.getTimeStamp());
         addFilteredJSON("InjectorHostname", InetAddress.getLocalHost().getHostName());
 
         // Add the details according to the mode that is set
         switch (this.esTestMode) {
-        case "debug":
-            addDetails();
-            break;
-        case "error":
-            addDetails();
-            break;
-        case "info":
-            if (!this.sampleResult.isSuccessful())
+            case "debug":
+                addDetails();
+                break;
+            case "error":
                 addDetails();
-            break;
-        default:
-            break;
+                break;
+            case "info":
+                if (!this.sampleResult.isSuccessful())
+                    addDetails();
+                break;
+            default:
+                break;
         }
 
         addAssertions();
-        addElapsedTime(sdf);
+        addElapsedTime();
         addCustomFields(context);
         parseHeadersAsJsonProps(this.allReqHeaders, this.allResHeaders);
 
@@ -103,7 +102,6 @@ public Map<String, Object> getMetric(BackendListenerContext context) throws Exce
 
     /**
      * This method adds all the assertions for the current sampleResult
-     *
      */
     private void addAssertions() {
         AssertionResult[] assertionResults = this.sampleResult.getAssertionResults();
@@ -133,31 +131,27 @@ private void addAssertions() {
      * This method adds the ElapsedTime as a key:value pair in the JSON object. Also, depending on whether or not the
      * tests were launched from a CI tool (i.e Jenkins), it will add a hard-coded version of the ElapsedTime for results
      * comparison purposes
-     *
-     * @param sdf
-     *            SimpleDateFormat
      */
-    private void addElapsedTime(SimpleDateFormat sdf) {
+    private void addElapsedTime() {
         Date elapsedTime;
 
         if (this.ciBuildNumber != 0) {
             elapsedTime = getElapsedTime(true);
             addFilteredJSON("BuildNumber", this.ciBuildNumber);
 
             if (elapsedTime != null)
-                addFilteredJSON("ElapsedTimeComparison", sdf.format(elapsedTime));
+                addFilteredJSON("ElapsedTimeComparison", elapsedTime.getTime());
         }
 
         elapsedTime = getElapsedTime(false);
         if (elapsedTime != null)
-            addFilteredJSON("ElapsedTime", sdf.format(elapsedTime));
+            addFilteredJSON("ElapsedTime", elapsedTime.getTime());
     }
 
     /**
      * Methods that add all custom fields added by the user in the Backend Listener's GUI panel
      *
-     * @param context
-     *            BackendListenerContext
+     * @param context BackendListenerContext
      */
     private void addCustomFields(BackendListenerContext context) {
         Iterator<String> pluginParameters = context.getParameterNamesIterator();
@@ -180,7 +174,6 @@ private void addCustomFields(BackendListenerContext context) {
 
     /**
      * Method that adds the request and response's body/headers
-     *
      */
     private void addDetails() {
         addFilteredJSON("RequestHeaders", this.sampleResult.getRequestHeaders());
@@ -195,52 +188,50 @@ private void addDetails() {
      * all headers into different ElasticSearch document properties by passing "true" This is a work-around the native
      * behaviour of JMeter where variables are not accessible within the backend listener.
      *
-     * @param allReqHeaders
-     *            boolean to determine if the user wants to separate ALL request headers into different ES JSON
-     *            properties.
-     * @param allResHeaders
-     *            boolean to determine if the user wants to separate ALL response headers into different ES JSON
-     *            properties.
-     *
-     *            NOTE: This will be fixed as soon as a patch comes in for JMeter to change the behaviour.
+     * @param allReqHeaders boolean to determine if the user wants to separate ALL request headers into different ES JSON
+     *                      properties.
+     * @param allResHeaders boolean to determine if the user wants to separate ALL response headers into different ES JSON
+     *                      properties.
+     *                      <p>
+     *                      NOTE: This will be fixed as soon as a patch comes in for JMeter to change the behaviour.
      */
     private void parseHeadersAsJsonProps(boolean allReqHeaders, boolean allResHeaders) {
         LinkedList<String[]> headersArrayList = new LinkedList<String[]>();
-		
-		if (allReqHeaders) {
-			headersArrayList.add(this.sampleResult.getRequestHeaders().split("\n"));
-		}
 
-		if (allResHeaders) {
-			headersArrayList.add(this.sampleResult.getResponseHeaders().split("\n"));
-		}
-		
-		if (!allReqHeaders && !allResHeaders) {
-			headersArrayList.add(this.sampleResult.getRequestHeaders().split("\n"));
-			headersArrayList.add(this.sampleResult.getResponseHeaders().split("\n"));
-		}
+        if (allReqHeaders) {
+            headersArrayList.add(this.sampleResult.getRequestHeaders().split("\n"));
+        }
+
+        if (allResHeaders) {
+            headersArrayList.add(this.sampleResult.getResponseHeaders().split("\n"));
+        }
+
+        if (!allReqHeaders && !allResHeaders) {
+            headersArrayList.add(this.sampleResult.getRequestHeaders().split("\n"));
+            headersArrayList.add(this.sampleResult.getResponseHeaders().split("\n"));
+        }
 
-        for(String[] lines : headersArrayList) {
-            for(int i=0; i < lines.length; i++) {
-                String[] header = lines[i].split(":",2);
+        for (String[] lines : headersArrayList) {
+            for (int i = 0; i < lines.length; i++) {
+                String[] header = lines[i].split(":", 2);
 
                 // if not all res/req headers and header contains special X-tag
                 if (!allReqHeaders && !allResHeaders && header.length > 1) {
                     if (header[0].startsWith("X-es-backend")) {
                         this.json.put(header[0].replaceAll("X-es-backend-", "").trim(), header[1].trim());
-					}
-				}
-						
+                    }
+                }
+
                 if ((allReqHeaders || allResHeaders) && header.length > 1) {
-					this.json.put(header[0].trim(), header[1].trim());
-				}
-			}
+                    this.json.put(header[0].trim(), header[1].trim());
+                }
+            }
         }
     }
 
     /**
      * Adds a given key-value pair to JSON if the key is contained in the field filter or in case of empty field filter
-     * 
+     *
      * @param key
      * @param value
      */
@@ -255,8 +246,7 @@ private void addFilteredJSON(String key, Object value) {
      * build comparison in Kibana. By doing this, the user is able to set the X-axis of his graph to this date and split
      * the series by build numbers. It allows him to overlap test results and see if there is regression or not.
      *
-     * @param forBuildComparison
-     *            boolean to determine if there is CI (continuous integration) or not
+     * @param forBuildComparison boolean to determine if there is CI (continuous integration) or not
      * @return The elapsed time in YYYY-MM-dd HH:mm:ss format
      */
     public Date getElapsedTime(boolean forBuildComparison) {

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

@@ -169,17 +169,41 @@ private void convertParameterToSet(BackendListenerContext context, String parame
      * @param context
      */
     private void setSSLConfiguration(BackendListenerContext context) {
-        System.setProperty("javax.net.ssl.keyStore", context.getParameter(ES_SSL_KEYSTORE_PATH));
-        System.setProperty("javax.net.ssl.keyStorePassword", context.getParameter(ES_SSL_KEYSTORE_PW));
-        System.setProperty("javax.net.ssl.keyStoreType",
-                FilenameUtils.getExtension(context.getParameter(ES_SSL_KEYSTORE_PATH)).equals("jks") ? "jks" : "pkcs12");
-        //jks (.jks) or pkcs12 (.p12) 
+        String keyStorePath = context.getParameter(ES_SSL_KEYSTORE_PATH);
+        if (!keyStorePath.equalsIgnoreCase("")) {
+            logger.warn("KeyStore system properties overwritten by ES SSL configuration.");
+            System.setProperty("javax.net.ssl.keyStore", keyStorePath);
+            System.setProperty("javax.net.ssl.keyStorePassword", context.getParameter(ES_SSL_KEYSTORE_PW));
+            switch (FilenameUtils.getExtension(keyStorePath)) {
+                case "jks":
+                    System.setProperty("javax.net.ssl.keyStoreType", "jks");
+                    break;
+                case "p12":
+                    System.setProperty("javax.net.ssl.keyStoreType", "pkcs12");
+                    break;
+                default:
+                    System.setProperty("javax.net.ssl.keyStoreType", "");
+                    break;
+            }
+        }
 
-        System.setProperty("javax.net.ssl.trustStore", context.getParameter(ES_SSL_TRUSTSTORE_PATH));
-        System.setProperty("javax.net.ssl.trustStorePassword", context.getParameter(ES_SSL_TRUSTSTORE_PW));
-        System.setProperty("javax.net.ssl.trustStoreType",
-                FilenameUtils.getExtension(context.getParameter(ES_SSL_TRUSTSTORE_PATH)).equals("jks") ? "jks"
-                        : "pkcs12");
+        String trustStorePath = context.getParameter(ES_SSL_TRUSTSTORE_PATH);
+        if (!trustStorePath.equalsIgnoreCase("")) {
+            logger.warn("TrustStore system properties overwritten by ES SSL configuration.");
+            System.setProperty("javax.net.ssl.trustStore", trustStorePath);
+            System.setProperty("javax.net.ssl.trustStorePassword", context.getParameter(ES_SSL_TRUSTSTORE_PW));
+            switch (FilenameUtils.getExtension(trustStorePath)) {
+                case "jks":
+                    System.setProperty("javax.net.ssl.trustStoreType", "jks");
+                    break;
+                case "p12":
+                    System.setProperty("javax.net.ssl.trustStoreType", "pkcs12");
+                    break;
+                default:
+                    System.setProperty("javax.net.ssl.trustStoreType", "");
+                    break;
+            }
+        }
 
     }