Merge pull request #61 from Coppernut/master

Fixed issue with sending JMeter vars via X-es-backend header prefix

Author: anthonygauthier

.travis.yml

@@ -1,3 +1,8 @@
 language: java
 jdk:
-- oraclejdk9
+  - openjdk10
+
+sudo: true
+cache:
+  directories:
+    - $HOME/.m2

pom.xml

@@ -199,7 +199,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.8</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>
@@ -223,6 +223,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration> 
+					<source>8</source> 
+				</configuration> 
 				<version>2.9.1</version>
 				<executions>
 					<execution>

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 {
@@ -79,18 +78,18 @@ public Map<String, Object> getMetric(BackendListenerContext context) throws Exce
 
         // 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();
@@ -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,7 +131,6 @@ 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
-     *
      */
     private void addElapsedTime() {
         Date elapsedTime;
@@ -154,8 +151,7 @@ private void addElapsedTime() {
     /**
      * 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();
@@ -178,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());
@@ -193,14 +188,12 @@ 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[]>();
@@ -213,23 +206,32 @@ private void parseHeadersAsJsonProps(boolean allReqHeaders, boolean allResHeader
             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);
+        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);
 
-                // if not all req headers and header contains special X-tag
-                if (header.length > 1) {
-                    if (!this.allReqHeaders && header[0].startsWith("X-es-backend") || this.allReqHeaders) {
+                // 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());
+                }
             }
         }
     }
 
     /**
      * 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
      */
@@ -244,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) {