Use SLF4J as logger

Author: laullon

proxy/pom.xml

@@ -291,11 +291,6 @@
         <artifactId>gson</artifactId>
         <version>2.9.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>2.0.3</version>
-      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-bom</artifactId>
@@ -377,7 +372,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-bom</artifactId>
-        <version>2.17.2</version>
+        <version>2.19.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -402,12 +397,14 @@
   </dependencyManagement>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-nop</artifactId>
-      <version>2.0.3</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.apache.activemq/artemis-server -->
+      <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>
@@ -607,11 +604,6 @@
       <artifactId>chronicle-map</artifactId>
       <version>3.21.86</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-log4j2</artifactId>
-      <version>2.7.0</version>
-    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-stub</artifactId>

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

@@ -33,17 +33,18 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import javax.net.ssl.SSLException;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Agent that runs remotely on a server collecting metrics. */
 public abstract class AbstractAgent {
-  private static final Logger logger = Logger.getLogger(AbstractAgent.class.getCanonicalName());
+  private static final Logger logger =
+      LoggerFactory.getLogger(AbstractAgent.class.getCanonicalName());
   /** A set of commandline parameters to hide when echoing command line arguments */
   protected static final Set<String> PARAMETERS_TO_HIDE =
       ImmutableSet.of("-t", "--token", "--proxyPassword");
@@ -131,9 +132,9 @@ protected LogsIngestionConfig loadLogsIngestionConfig() {
       return objectMapper.readValue(
           new File(proxyConfig.getLogsIngestionConfigFile()), LogsIngestionConfig.class);
     } catch (UnrecognizedPropertyException e) {
-      logger.severe("Unable to load logs ingestion config: " + e.getMessage());
+      logger.error("Unable to load logs ingestion config: " + e.getMessage());
     } catch (Exception e) {
-      logger.log(Level.SEVERE, "Could not load logs ingestion config", e);
+      logger.error("Could not load logs ingestion config", e);
     }
     return null;
   }
@@ -143,9 +144,9 @@ private void postProcessConfig() {
     // 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.Logger.getLogger("org.apache.http.impl.execchain.RetryExec").
+    // org.apache.log4j.LoggerFactory.getLogger("org.apache.http.impl.execchain.RetryExec").
     //     setLevel(org.apache.log4j.Level.WARN);
-    // Logger.getLogger("org.apache.http.impl.execchain.RetryExec").setLevel(Level.WARNING);
+    // LoggerFactory.getLogger("org.apache.http.impl.execchain.RetryExec").setLevel(Level.WARNING);
 
     if (StringUtils.isBlank(proxyConfig.getHostname().trim())) {
       throw new IllegalArgumentException(
@@ -170,7 +171,7 @@ void parseArguments(String[] args) {
       }
     } catch (ParameterException e) {
       logger.info(versionStr);
-      logger.severe("Parameter exception: " + e.getMessage());
+      logger.error("Parameter exception: " + e.getMessage());
       System.exit(1);
     }
     logger.info(versionStr);
@@ -271,11 +272,11 @@ public void start(String[] args) {
             public void run() {
               // exit if no active listeners
               if (activeListeners.count() == 0) {
-                logger.severe(
+                logger.error(
                     "**** All listener threads failed to start - there is already a "
                         + "running instance listening on configured ports, or no listening ports "
                         + "configured!");
-                logger.severe("Aborting start-up");
+                logger.error("Aborting start-up");
                 System.exit(1);
               }
 
@@ -293,8 +294,8 @@ public void run() {
           },
           5000);
     } catch (Exception e) {
-      logger.log(Level.SEVERE, e.getMessage(), e);
-      //      logger.severe(e.getMessage());
+      logger.error(e.getMessage(), e);
+      //      logger.error(e.getMessage());
       System.exit(1);
     }
   }
@@ -351,7 +352,7 @@ public void shutdown() {
       System.out.println("Shutdown complete.");
     } catch (Throwable t) {
       try {
-        logger.log(Level.SEVERE, "Error during shutdown: ", t);
+        logger.error("Error during shutdown: ", t);
       } catch (Throwable loggingError) {
         t.addSuppressed(loggingError);
         t.printStackTrace();

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

@@ -26,18 +26,18 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.ws.rs.ClientErrorException;
 import javax.ws.rs.ProcessingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Registers the proxy with the back-end, sets up regular "check-ins" (every minute), transmits
  * proxy metrics to the back-end.
  */
 public class ProxyCheckInScheduler {
   private static final Logger logger =
-      Logger.getLogger(ProxyCheckInScheduler.class.getCanonicalName());
+      LoggerFactory.getLogger(ProxyCheckInScheduler.class.getCanonicalName());
   private static final int MAX_CHECKIN_ATTEMPTS = 5;
 
   /**
@@ -315,18 +315,18 @@ void updateConfiguration() {
             continue;
           }
           if (configEntry.getKey().equals(APIContainer.CENTRAL_TENANT_NAME)) {
-            if (logger.isLoggable(Level.FINE)) {
-              logger.fine("Server configuration getShutOffAgents: " + config.getShutOffAgents());
-              logger.fine("Server configuration isTruncateQueue: " + config.isTruncateQueue());
+            if (logger.isDebugEnabled()) {
+              logger.info("Server configuration getShutOffAgents: " + config.getShutOffAgents());
+              logger.info("Server configuration isTruncateQueue: " + config.isTruncateQueue());
             }
             if (config.getShutOffAgents()) {
-              logger.warning(
+              logger.warn(
                   firstNonNull(
                       config.getShutOffMessage(),
                       "Shutting down: Server side flag indicating proxy has to shut down."));
               shutdownHook.run();
             } else if (config.isTruncateQueue()) {
-              logger.warning(
+              logger.warn(
                   "Truncating queue: Server side flag indicating proxy queue has to be truncated.");
               truncateBacklog.run();
             }
@@ -335,7 +335,7 @@ void updateConfiguration() {
         }
       }
     } catch (Exception e) {
-      logger.log(Level.SEVERE, "Exception occurred during configuration update", e);
+      logger.error("Exception occurred during configuration update", e);
     }
   }
 
@@ -353,13 +353,13 @@ void updateProxyMetrics() {
         retries.set(0);
       }
     } catch (Exception ex) {
-      logger.log(Level.SEVERE, "Could not generate proxy metrics", ex);
+      logger.error("Could not generate proxy metrics", ex);
     }
   }
 
   private void checkinError(String errMsg) {
-    if (successfulCheckIns.get() == 0) logger.severe(Strings.repeat("*", errMsg.length()));
-    logger.severe(errMsg);
-    if (successfulCheckIns.get() == 0) logger.severe(Strings.repeat("*", errMsg.length()));
+    if (successfulCheckIns.get() == 0) logger.error(Strings.repeat("*", errMsg.length()));
+    logger.error(errMsg);
+    if (successfulCheckIns.get() == 0) logger.error(Strings.repeat("*", errMsg.length()));
   }
 }

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

@@ -21,13 +21,15 @@
 import com.wavefront.agent.config.ReportableConfig;
 import com.wavefront.common.TimeProvider;
 import java.util.*;
-import java.util.logging.Logger;
 import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Proxy configuration (refactored from {@link AbstractAgent}). */
 @SuppressWarnings("CanBeFinal")
 public class ProxyConfig extends Configuration {
-  private static final Logger logger = Logger.getLogger(ProxyConfig.class.getCanonicalName());
+  private static final Logger logger =
+      LoggerFactory.getLogger(ProxyConfig.class.getCanonicalName());
   private static final double MAX_RETRY_BACKOFF_BASE_SECONDS = 60.0;
   private static final int GRAPHITE_LISTENING_PORT = 2878;
 
@@ -1723,8 +1725,7 @@ public List<String> getCustomSourceTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
-                    "Duplicate tag " + x + " specified in customSourceTags config setting");
+                logger.warn("Duplicate tag " + x + " specified in customSourceTags config setting");
               }
             });
     return new ArrayList<>(tagSet);
@@ -1740,7 +1741,7 @@ public List<String> getCustomTimestampTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
+                logger.warn(
                     "Duplicate tag " + x + " specified in customTimestampTags config setting");
               }
             });
@@ -1757,7 +1758,7 @@ public List<String> getCustomMessageTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
+                logger.warn(
                     "Duplicate tag " + x + " specified in customMessageTags config setting");
               }
             });
@@ -1774,7 +1775,7 @@ public List<String> getCustomApplicationTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
+                logger.warn(
                     "Duplicate tag " + x + " specified in customApplicationTags config setting");
               }
             });
@@ -1791,7 +1792,7 @@ public List<String> getCustomServiceTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
+                logger.warn(
                     "Duplicate tag " + x + " specified in customServiceTags config setting");
               }
             });
@@ -1807,7 +1808,7 @@ public List<String> getCustomExceptionTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
+                logger.warn(
                     "Duplicate tag " + x + " specified in customExceptionTags config setting");
               }
             });
@@ -1824,8 +1825,7 @@ public List<String> getCustomLevelTags() {
         .forEach(
             x -> {
               if (!tagSet.add(x)) {
-                logger.warning(
-                    "Duplicate tag " + x + " specified in customLevelTags config setting");
+                logger.warn("Duplicate tag " + x + " specified in customLevelTags config setting");
               }
             });
     return new ArrayList<>(tagSet);
@@ -2039,7 +2039,7 @@ public void verifyAndInit() {
       hostname = config.getString("hostname", hostname);
       proxyname = config.getString("proxyname", proxyname);
       if (!hostname.equals(FQDN)) {
-        logger.warning(
+        logger.warn(
             "Deprecated field hostname specified in config setting. Please use "
                 + "proxyname config field to set proxy name.");
         if (proxyname.equals(FQDN)) proxyname = hostname;
@@ -2472,7 +2472,7 @@ public void verifyAndInit() {
           config.getInteger("memoryBufferExpirationTime", memoryBufferExpirationTime);
       disableBuffer = config.getBoolean("disable_buffer", disableBuffer);
     } catch (Throwable exception) {
-      logger.severe("Could not load configuration file " + pushConfigFile);
+      logger.error("Could not load configuration file " + pushConfigFile);
       throw new RuntimeException(exception.getMessage());
     }
     if (httpUserAgent == null) {

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

@@ -20,12 +20,14 @@
 import java.util.Objects;
 import java.util.UUID;
 import java.util.function.Supplier;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Miscellaneous support methods for running Wavefront proxy. */
 public abstract class ProxyUtil {
-  protected static final Logger logger = Logger.getLogger(ProxyUtil.class.getCanonicalName());
+  protected static final Logger logger =
+      LoggerFactory.getLogger(ProxyUtil.class.getCanonicalName());
 
   private ProxyUtil() {}