Release 2.3.3

* Remove decompress
apache httpclient 4.5.x does it automatically

* thread should end when loops end.

* Enable compression request to tank clients

* AWS X-ray instrumentation

* Reduce pending to running wait from 1min to 30sec

* Enable Referer and Authorization headers, Test and documentation

* trace recent jobs query

* Performance & Size Reduction

* Cache agent-support-files.zip in /tmp

* Replace deprecated hibernate index annotations with JPA index annotations

* Library reorganization saved 43MB off deployment war

* AWS Xray + DBQueries + Performance

* Cleanup

* RequestScoped bean to ApplicationScoped bean

* AWSXray dummy segments to allow jdbc tracing to be enabled

* LazyLoad User Table

* BatchSize

* userAdmin Fix + CriteriaBuilder

* better error handling on UserDao

Author: kevin-mcgoldrick

agent/agent_common/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
   </parent>
 
   <artifactId>agent-common</artifactId>

agent/agent_common/src/main/java/com/intuit/tank/http/BaseResponse.java

@@ -226,11 +226,13 @@ public void logResponse() {
     }
 
     public static final boolean isDataType(String contentType) {
-        boolean ret = false;
         if (!StringUtils.isBlank(contentType)) {
             contentType = contentType.toLowerCase();
-            ret = contentType.contains("html") || contentType.contains("text") || contentType.contains("json") || contentType.contains("xml");
+            return  contentType.contains("html") ||
+                    contentType.contains("text") ||
+                    contentType.contains("json") ||
+                    contentType.contains("xml");
         }
-        return ret;
+        return false;
     }
 }

agent/agent_common/src/main/java/com/intuit/tank/http/TankHttpUtil.java

@@ -5,7 +5,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,6 +21,7 @@
 import com.intuit.tank.http.binary.BinaryResponse;
 import com.intuit.tank.http.json.JsonResponse;
 import com.intuit.tank.http.xml.XMLResponse;
+
 /**
  * utitly methods for tank http clients
  * @author denisa
@@ -177,7 +177,7 @@ public byte[] getBody() {
          * @return the body as a string
          */
         public String getBodyAsString() {
-            return new String(body, Charset.forName("UTF-8"));
+            return new String(body, StandardCharsets.UTF_8);
         }
 
         // Content-Disposition: form-data; name="uploadname1";

agent/agent_standalone/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
   </parent>
 
   <artifactId>agent-standalone</artifactId>

agent/agent_standalone_pkg/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
   </parent>
 
   <artifactId>agent-standalone-pkg</artifactId>

agent/agent_startup/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
   </parent>
 
   <artifactId>agent-startup</artifactId>

agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java

@@ -21,6 +21,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import com.amazonaws.util.StringUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
@@ -32,40 +33,30 @@
 public class AgentStartup implements Runnable {
 
     private static Logger logger = LogManager.getLogger(AgentStartup.class);
-    public static final String SERVICE_RELATIVE_PATH = "/rest/v1/agent-service";
-    public static final String METHOD_SETTINGS = "/settings";
-    private static String API_HARNESS_COMMAND = "./startAgent.sh";
-    public static final String METHOD_SUPPORT = "/supportFiles";
-    private static final long WAIT_FOR_RESTART_TIME = 00000; // zero minute
+    private static final String SERVICE_RELATIVE_PATH = "/rest/v1/agent-service";
+    private static final String METHOD_SETTINGS = "/settings";
+    private static final String API_HARNESS_COMMAND = "./startAgent.sh";
+    private static final String METHOD_SUPPORT = "/supportFiles";
 
-    private String controllerBase;
+    private final String controllerBaseUrl;
+
+    public AgentStartup (String controllerBaseUrl ) {
+        this.controllerBaseUrl = controllerBaseUrl;
+    }
 
     public void run() {
         logger.info("Starting up...");
-        if (AmazonUtil.usingEip()) {
-            try {
-                logger.info("Using EIP. Sleeping for " + WAIT_FOR_RESTART_TIME + " ms.");
-                Thread.sleep(WAIT_FOR_RESTART_TIME);
-            } catch (InterruptedException e1) {
-                logger.info("Exception waiting.");
-                System.exit(0);
-            }
-        }
         try {
-            if (controllerBase == null) {
-                controllerBase = AmazonUtil.getControllerBaseUrl();
-            }
-
-            logger.info("Starting up: ControllerBaseUrl=" + controllerBase);
-            URL url = new URL(controllerBase + SERVICE_RELATIVE_PATH + METHOD_SETTINGS);
+            logger.info("Starting up: ControllerBaseUrl=" + controllerBaseUrl);
+            URL url = new URL(controllerBaseUrl + SERVICE_RELATIVE_PATH + METHOD_SETTINGS);
             logger.info("Starting up: making call to tank service url to get settings.xml "
                     + url.toExternalForm());
             try ( InputStream settingsStream = url.openStream() ) {
                 String settings = IOUtils.toString(settingsStream, StandardCharsets.UTF_8);
                 FileUtils.writeStringToFile(new File("settings.xml"), settings, StandardCharsets.UTF_8);
                 logger.info("got settings file...");
             }
-            url = new URL(controllerBase + SERVICE_RELATIVE_PATH + METHOD_SUPPORT);
+            url = new URL(controllerBaseUrl + SERVICE_RELATIVE_PATH + METHOD_SUPPORT);
             logger.info("Making call to tank service url to get support files " + url.toExternalForm());
             try ( ZipInputStream zip = new ZipInputStream(url.openStream()) ){
                 ZipEntry entry = zip.getNextEntry();
@@ -81,17 +72,16 @@ public void run() {
             }
             // now start the harness
             String jvmArgs = AmazonUtil.getUserDataAsMap().get(TankConstants.KEY_JVM_ARGS);
-            logger.info("Starting apiharness with command: " + API_HARNESS_COMMAND + " -http=" + controllerBase + " "
+            logger.info("Starting apiharness with command: " + API_HARNESS_COMMAND + " -http=" + controllerBaseUrl + " "
                     + jvmArgs);
-            Runtime.getRuntime().exec(API_HARNESS_COMMAND + " -http=" + controllerBase + " " + jvmArgs);
+            Runtime.getRuntime().exec(API_HARNESS_COMMAND + " -http=" + controllerBaseUrl + " " + jvmArgs);
         } catch (Exception e) {
             logger.error("Error in AgentStartup " + e, e);
         }
     }
 
     public static void main(String[] args) {
-        AgentStartup agentStartup = new AgentStartup();
-
+        String controllerBaseUrl = null;
         for (String argument : args) {
             String[] values = argument.split("=");
 
@@ -100,10 +90,13 @@ public static void main(String[] args) {
                     usage();
                     return;
                 }
-                agentStartup.controllerBase = values[1];
+                controllerBaseUrl = values[1];
             }
-
         }
+        if (StringUtils.isNullOrEmpty(controllerBaseUrl)) {
+            controllerBaseUrl = AmazonUtil.getControllerBaseUrl();
+        }
+        AgentStartup agentStartup = new AgentStartup(controllerBaseUrl);
         agentStartup.run();
     }
 

agent/agent_startup_pkg/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
   </parent>
 
   <artifactId>agent-startup-pkg</artifactId>

agent/apiharness/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
   </parent>
 
   <artifactId>agent</artifactId>
@@ -57,12 +57,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>tank-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>agent-common</artifactId>

agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java

@@ -658,7 +658,7 @@ public synchronized void threadComplete() {
         long count = doneSignal.getCount();
         // numCompletedThreads = (int) (agentRunData.getNumUsers() - count);
         if (isDebug() || count < 10) {
-            LOG.info(new ObjectMessage(ImmutableMap.of("Message", "User thread finished... Remaining->" + currentUsers)));
+            LOG.info(new ObjectMessage(ImmutableMap.of("Message", "User thread finished... Remaining = " + currentUsers)));
         }
     }