Merge branch 'dev' into dev-proxy2

# Conflicts:
#	pkg/etc/init.d/wavefront-proxy
#	proxy/pom.xml
#	proxy/src/main/java/com/wavefront/agent/AbstractAgent.java
#	proxy/src/main/java/com/wavefront/agent/ProxyConfig.java
#	proxy/src/main/java/com/wavefront/agent/PushAgent.java
#	proxy/src/main/java/com/wavefront/agent/data/LogDataSubmissionTask.java
#	proxy/src/main/java/com/wavefront/agent/listeners/WavefrontPortUnificationHandler.java
#	proxy/src/main/java/com/wavefront/common/Utils.java
#	proxy/src/test/java/com/wavefront/agent/HttpEndToEndTest.java

Author: laullon

Makefile

@@ -24,7 +24,6 @@ jenkins: .info build-jar build-linux push-linux docker-multi-arch clean
 build-jar: .info
 	mvn -f proxy --batch-mode clean package ${MVN_ARGS}
 	cp proxy/target/${ARTIFACT_ID}-${VERSION}-spring-boot.jar ${out}
-	cp proxy/target/${ARTIFACT_ID}-${VERSION}-jar-with-dependencies.jar ${out}
 
 #####
 # Build single docker image

proxy/pom.xml

@@ -67,25 +67,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <!-- need it for linux //TODO: review-->
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.3.0</version>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id> <!-- this is used for inheritance merges -->
-            <phase>package</phase> <!-- bind to the packaging phase -->
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.cosium.code</groupId>
         <artifactId>git-code-format-maven-plugin</artifactId>
@@ -397,14 +378,14 @@
   </dependencyManagement>
 
   <dependencies>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-core</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j2-impl</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>artemis-server</artifactId>

proxy/src/main/java/com/wavefront/agent/AbstractAgent.java

@@ -109,7 +109,8 @@ private void initPreprocessors() {
     }
 
     // convert block/allow list fields to filters for full backwards compatibility.
-    // "block" and "allow" regexes are applied to pushListenerPorts, graphitePorts and
+    // "block" and "allow" regexes are applied to pushListenerPorts, graphitePorts
+    // and
     // picklePorts
     String allPorts =
         StringUtils.join(
@@ -140,15 +141,19 @@ protected LogsIngestionConfig loadLogsIngestionConfig() {
   }
 
   private void postProcessConfig() {
-    // disable useless info messages when httpClient has to retry a request due to a stale
-    // connection. the alternative is to always validate connections before reuse, but since
-    // it happens fairly infrequently, and connection re-validation performance penalty is
-    // incurred every time, suppressing that message seems to be a more reasonable approach.
+    // disable useless info messages when httpClient has to retry a request due to a
+    // stale
+    // connection. the alternative is to always validate connections before reuse,
+    // but since
+    // it happens fairly infrequently, and connection re-validation performance
+    // penalty is
+    // incurred every time, suppressing that message seems to be a more reasonable
+    // approach.
     // org.apache.log4j.LoggerFactory.getLogger("org.apache.http.impl.execchain.RetryExec").
-    //     setLevel(org.apache.log4j.Level.WARN);
+    // setLevel(org.apache.log4j.Level.WARN);
     // LoggerFactory.getLogger("org.apache.http.impl.execchain.RetryExec").setLevel(Level.WARNING);
 
-    if (StringUtils.isBlank(proxyConfig.getHostname().trim())) {
+    if (StringUtils.isBlank(proxyConfig.getHostname())) {
       throw new IllegalArgumentException(
           "hostname cannot be blank! Please correct your configuration settings.");
     }
@@ -157,24 +162,14 @@ private void postProcessConfig() {
   @VisibleForTesting
   void parseArguments(String[] args) {
     // read build information and print version.
-    String versionStr =
-        "Wavefront Proxy version "
-            + getBuildVersion()
-            + " (pkg:"
-            + getPackage()
-            + ")"
-            + ", runtime: "
-            + getJavaVersion();
     try {
       if (!proxyConfig.parseArguments(args, this.getClass().getCanonicalName())) {
         System.exit(0);
       }
     } catch (ParameterException e) {
-      logger.info(versionStr);
       logger.error("Parameter exception: " + e.getMessage());
       System.exit(1);
     }
-    logger.info(versionStr);
     logger.info(
         "Arguments: "
             + IntStream.range(0, args.length)
@@ -192,9 +187,13 @@ void parseArguments(String[] args) {
   public void start(String[] args) {
     try {
 
-      /* ------------------------------------------------------------------------------------
+      /*
+       * -----------------------------------------------------------------------------
+       * -------
        * Configuration Setup.
-       * ------------------------------------------------------------------------------------ */
+       * -----------------------------------------------------------------------------
+       * -------
+       */
 
       // Parse commandline arguments and load configuration file
       parseArguments(args);
@@ -229,7 +228,7 @@ public void start(String[] args) {
         } else {
           throw new IllegalStateException();
         }
-        //noinspection StatementWithEmptyBody
+        // noinspection StatementWithEmptyBody
         while (interactiveTester.interactiveTest()) {
           // empty
         }
@@ -295,7 +294,7 @@ public void run() {
           5000);
     } catch (Exception e) {
       logger.error(e.getMessage(), e);
-      //      logger.error(e.getMessage());
+      // logger.error(e.getMessage());
       System.exit(1);
     }
   }

proxy/src/main/java/com/wavefront/agent/ProxyConfig.java

@@ -749,13 +749,13 @@ public class ProxyConfig extends Configuration {
   @Parameter(
       names = {"--hostname"},
       description = "Hostname for the proxy. Defaults to FQDN of machine.")
-  String hostname = getLocalHostName();
+  String hostname = null;
 
   /** This property holds the proxy name. Default proxyname to FQDN of machine. */
   @Parameter(
       names = {"--proxyname"},
       description = "Name for the proxy. Defaults to hostname.")
-  String proxyname = getLocalHostName();
+  String proxyname = null;
 
   @Parameter(
       names = {"--idFile"},
@@ -2035,15 +2035,21 @@ public void verifyAndInit() {
       token = ObjectUtils.firstNonNull(config.getRawProperty("token", token), "undefined").trim();
       server = config.getString("server", server);
 
-      String FQDN = getLocalHostName();
-      hostname = config.getString("hostname", hostname);
-      proxyname = config.getString("proxyname", proxyname);
-      if (!hostname.equals(FQDN)) {
+      String _hostname = config.getString("hostname", hostname);
+      if (!Strings.isNullOrEmpty(_hostname)) {
         logger.warn(
             "Deprecated field hostname specified in config setting. Please use "
                 + "proxyname config field to set proxy name.");
-        if (proxyname.equals(FQDN)) proxyname = hostname;
+        hostname = _hostname;
+      } else {
+        hostname = getLocalHostName();
+      }
+
+      proxyname = config.getString("proxyname", proxyname);
+      if (Strings.isNullOrEmpty(proxyname)) {
+        proxyname = hostname;
       }
+
       logger.info("Using proxyname:'" + proxyname + "' hostname:'" + hostname + "'");
 
       idFile = config.getString("idFile", idFile);
@@ -2492,7 +2498,6 @@ public void verifyAndInit() {
    * @throws ParameterException if configuration parsing failed
    */
   public boolean parseArguments(String[] args, String programName) throws ParameterException {
-    String versionStr = "Wavefront Proxy version " + getBuildVersion();
     JCommander jCommander =
         JCommander.newBuilder()
             .programName(programName)
@@ -2501,11 +2506,9 @@ public boolean parseArguments(String[] args, String programName) throws Paramete
             .build();
     jCommander.parse(args);
     if (this.isVersion()) {
-      System.out.println(versionStr);
       return false;
     }
     if (this.isHelp()) {
-      System.out.println(versionStr);
       jCommander.usage();
       return false;
     }

proxy/src/main/java/com/wavefront/agent/PushAgent.java

@@ -6,8 +6,7 @@
 import static com.wavefront.agent.ProxyUtil.createInitializer;
 import static com.wavefront.agent.api.APIContainer.CENTRAL_TENANT_NAME;
 import static com.wavefront.agent.data.EntityProperties.NO_RATE_LIMIT;
-import static com.wavefront.common.Utils.csvToList;
-import static com.wavefront.common.Utils.lazySupplier;
+import static com.wavefront.common.Utils.*;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -160,6 +159,15 @@ public class PushAgent extends AbstractAgent {
 
   public static void main(String[] args) {
     // Start the ssh daemon
+    String versionStr =
+        "Wavefront Proxy version "
+            + getBuildVersion()
+            + " (pkg:"
+            + getPackage()
+            + ")"
+            + ", runtime: "
+            + getJavaVersion();
+    logger.info(versionStr);
     new PushAgent().start(args);
   }
 

proxy/src/main/java/com/wavefront/agent/core/senders/LogSenderTask.java

@@ -10,9 +10,12 @@
 import java.util.List;
 import java.util.UUID;
 import javax.ws.rs.core.Response;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** This class is responsible for accumulating logs and uploading them in batches. */
 public class LogSenderTask extends SenderTask {
+  private static final Logger LOGGER = LoggerFactory.getLogger("LogDataSubmission");
   public static final String AGENT_PREFIX = "WF-PROXY-AGENT-";
 
   private final QueueInfo queue;
@@ -40,6 +43,11 @@ public class LogSenderTask extends SenderTask {
   }
 
   protected Response submit(List<String> logs) {
+    if (LOGGER.isDebugEnabled()) {
+      for (String log : logs) {
+        LOGGER.debug("Sending a log to the backend: " + log);
+      }
+    }
     return logAPI.proxyLogsStr(
         AGENT_PREFIX + proxyId.toString(), "[" + String.join(",", logs) + "]");
   }

proxy/src/main/java/com/wavefront/agent/formatter/DataFormat.java

@@ -13,7 +13,8 @@ public enum DataFormat {
   EVENT,
   SPAN,
   SPAN_LOG,
-  LOGS_JSON_ARR;
+  LOGS_JSON_ARR,
+  LOGS_JSON_LINES;
 
   public static DataFormat autodetect(final String input) {
     if (input.length() < 2) return DEFAULT;
@@ -56,6 +57,8 @@ public static DataFormat parse(String format) {
         return DataFormat.SPAN_LOG;
       case Constants.PUSH_FORMAT_LOGS_JSON_ARR:
         return DataFormat.LOGS_JSON_ARR;
+      case Constants.PUSH_FORMAT_LOGS_JSON_LINES:
+        return DataFormat.LOGS_JSON_LINES;
       default:
         return null;
     }