RANGER-3498: removed log4j-1.x dependency, replaced references to org…

….apache.log4j and org.apache.commons.logging with org.slf4j
apache · Jan 17, 2022 · 7180910 · 7180910
1 parent 1bef752
commit 7180910
Show file tree

Hide file tree

Showing 572 changed files with 3,630 additions and 2,661 deletions.
diff --git a/agents-audit/pom.xml b/agents-audit/pom.xml
@@ -53,11 +53,6 @@
             <artifactId>commons-lang</artifactId>
             <version>${commons.lang.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons.logging.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
@@ -79,13 +74,16 @@
                    <groupId>io.netty</groupId>
                    <artifactId>netty-transport-native-epoll</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_${scala.binary.version}</artifactId>
@@ -99,6 +97,10 @@
                     <groupId>org.lz4</groupId>
                     <artifactId>lz4-java</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -138,8 +140,17 @@
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
@@ -357,5 +368,11 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-logs</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+	    <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...t/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java b/...t/src/main/java/org/apache/ranger/audit/destination/AmazonCloudWatchAuditDestination.java
@@ -34,10 +34,10 @@
 import com.amazonaws.services.logs.model.ResourceNotFoundException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
 import org.apache.ranger.audit.provider.MiscUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -59,7 +59,7 @@
 @ThreadSafe
 public class AmazonCloudWatchAuditDestination extends AuditDestination {
 
-    private static Log LOG = LogFactory.getLog(AmazonCloudWatchAuditDestination.class);
+    private static Logger LOG = LoggerFactory.getLogger(AmazonCloudWatchAuditDestination.class);
 
     public static final String PROP_LOG_GROUP_NAME = "log_group";
     public static final String PROP_LOG_STREAM_PREFIX = "log_stream_prefix";

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/AuditDestination.java
@@ -21,16 +21,16 @@
 
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.provider.BaseAuditHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class needs to be extended by anyone who wants to build custom
  * destination
  */
 public abstract class AuditDestination extends BaseAuditHandler {
-	private static final Log logger = LogFactory.getLog(AuditDestination.class);
+	private static final Logger logger = LoggerFactory.getLogger(AuditDestination.class);
 
 	public AuditDestination() {
 		logger.info("AuditDestination() enter");

diff --git a/...udit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java b/...udit/src/main/java/org/apache/ranger/audit/destination/ElasticSearchAuditDestination.java
@@ -32,8 +32,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthSchemeProvider;
 import org.apache.http.client.CredentialsProvider;
@@ -55,12 +53,14 @@
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosTicket;
 
 public class ElasticSearchAuditDestination extends AuditDestination {
-    private static final Log LOG = LogFactory.getLog(ElasticSearchAuditDestination.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ElasticSearchAuditDestination.class);
 
     public static final String CONFIG_URLS = "urls";
     public static final String CONFIG_PORT = "port";
@@ -267,7 +267,7 @@ private RestHighLevelClient newClient() {
                 long now = System.currentTimeMillis();
                 long elapsed = now - lastLoggedAt;
                 if (elapsed > TimeUnit.MINUTES.toMillis(1)) {
-                    LOG.fatal("Can't connect to ElasticSearch server: " + connectionString(), t);
+                    LOG.error("Can't connect to ElasticSearch server: " + connectionString(), t);
                     return now;
                 } else {
                     return lastLoggedAt;

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/FileAuditDestination.java
@@ -29,17 +29,17 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
 import org.apache.ranger.audit.provider.MiscUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class write the logs to local file
  */
 public class FileAuditDestination extends AuditDestination {
-	private static final Log logger = LogFactory
-			.getLog(FileAuditDestination.class);
+	private static final Logger logger = LoggerFactory
+			.getLogger(FileAuditDestination.class);
 
 	public static final String PROP_FILE_LOCAL_DIR = "dir";
 	public static final String PROP_FILE_LOCAL_FILE_NAME_FORMAT = "filename.format";

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/HDFSAuditDestination.java
@@ -27,19 +27,19 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
 import org.apache.ranger.audit.provider.AuditWriterFactory;
 import org.apache.ranger.audit.provider.MiscUtil;
 import org.apache.ranger.audit.utils.RangerAuditWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class write the logs to local file
  */
 public class HDFSAuditDestination extends AuditDestination {
-	private static final Log logger = LogFactory
-			.getLog(HDFSAuditDestination.class);
+	private static final Logger logger = LoggerFactory
+			.getLogger(HDFSAuditDestination.class);
 
 	private Map<String, String> auditConfigs            = null;
 	private String              auditProviderName       = null;

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/Log4JAuditDestination.java
@@ -22,16 +22,16 @@
 import java.util.Collection;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
 import org.apache.ranger.audit.provider.MiscUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Log4JAuditDestination extends AuditDestination {
-	private static final Log logger = LogFactory
-			.getLog(Log4JAuditDestination.class);
+	private static final Logger logger = LoggerFactory
+			.getLogger(Log4JAuditDestination.class);
 
-	private static Log auditLogger = null;
+	private static Logger auditLogger = null;
 
 	public static final String PROP_LOG4J_LOGGER = "logger";
 	public static final String DEFAULT_LOGGER_PREFIX = "ranger.audit";
@@ -54,7 +54,7 @@ public void init(Properties prop, String propPrefix) {
 					+ loggerName);
 		}
 		logger.info("Logger name for " + getName() + " is " + loggerName);
-		auditLogger = LogFactory.getLog(loggerName);
+		auditLogger = LoggerFactory.getLogger(loggerName);
 		logger.info("Done initializing logger for audit. name=" + getName()
 				+ ", loggerName=" + loggerName);
 	}

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
@@ -20,8 +20,6 @@
 package org.apache.ranger.audit.destination;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
 import org.apache.ranger.audit.model.AuthzAuditEvent;
 import org.apache.ranger.audit.provider.MiscUtil;
@@ -38,6 +36,8 @@
 import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrInputDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -71,8 +71,8 @@
 
 
 public class SolrAuditDestination extends AuditDestination {
-	private static final Log LOG = LogFactory
-			.getLog(SolrAuditDestination.class);
+	private static final Logger LOG = LoggerFactory
+			.getLogger(SolrAuditDestination.class);
 
 	public static final String PROP_SOLR_URLS = "urls";
 	public static final String PROP_SOLR_ZK = "zookeepers";
@@ -181,7 +181,7 @@ public CloudSolrClient run()  throws Exception {
 							solrCloudClient.setDefaultCollection(collectionName);
 							me = solrClient = solrCloudClient;
 						} catch (Throwable t) {
-							LOG.fatal("Can't connect to Solr server. ZooKeepers="
+							LOG.error("Can't connect to Solr server. ZooKeepers="
 									+ zkHosts, t);
 						}
 					} else if (solrURLs != null && !solrURLs.isEmpty()) {
@@ -207,7 +207,7 @@ public LBHttpSolrClient run()  throws Exception {
 							}
 							me = solrClient = lbSolrClient;
 						} catch (Throwable t) {
-							LOG.fatal("Can't connect to Solr server. URL="
+							LOG.error("Can't connect to Solr server. URL="
 									+ solrURLs, t);
 						}
 					}

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AsyncAuditProvider.java
@@ -25,14 +25,14 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AsyncAuditProvider extends MultiDestAuditProvider implements
 		Runnable {
 
-	private static final Log LOG = LogFactory.getLog(AsyncAuditProvider.class);
+	private static final Logger LOG = LoggerFactory.getLogger(AsyncAuditProvider.class);
 
 	private static int sThreadCount = 0;
 

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditFileCacheProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditFileCacheProvider.java
@@ -18,10 +18,10 @@
  */
 package org.apache.ranger.audit.provider;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.model.AuditEventBase;
 import org.apache.ranger.audit.queue.AuditFileCacheProviderSpool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 import java.util.Properties;
@@ -31,7 +31,7 @@
 */
 
 public class AuditFileCacheProvider extends BaseAuditHandler {
-    private static final Log    logger = LogFactory.getLog(AuditFileCacheProvider.class);
+    private static final Logger    logger = LoggerFactory.getLogger(AuditFileCacheProvider.class);
 
     AuditFileCacheProviderSpool fileSpooler = null;
     AuditHandler                consumer    = null;

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java
@@ -26,8 +26,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.ranger.audit.destination.*;
 import org.apache.ranger.audit.provider.hdfs.HdfsAuditProvider;
@@ -38,6 +36,8 @@
 import org.apache.ranger.audit.queue.AuditFileQueue;
 import org.apache.ranger.audit.queue.AuditQueue;
 import org.apache.ranger.audit.queue.AuditSummaryQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * TODO:
@@ -47,8 +47,8 @@
  */
 
 public class AuditProviderFactory {
-	private static final Log LOG = LogFactory
-			.getLog(AuditProviderFactory.class);
+	private static final Logger LOG = LoggerFactory
+			.getLogger(AuditProviderFactory.class);
 
 	public static final String AUDIT_IS_ENABLED_PROP = "xasecure.audit.is.enabled";
 	public static final String AUDIT_HDFS_IS_ENABLED_PROP = "xasecure.audit.hdfs.is.enabled";
@@ -202,13 +202,13 @@ public synchronized void init(Properties props, String appType) {
 							qProvider.init(props, queuePropPrefix);
 							providers.add(queueProvider);
 						} else {
-							LOG.fatal("Provider queue doesn't extend AuditQueue. Destination="
+							LOG.error("Provider queue doesn't extend AuditQueue. Destination="
 									+ destName
 									+ " can't be created. queueName="
 									+ queueName);
 						}
 					} else {
-						LOG.fatal("Queue provider for destination " + destName
+						LOG.error("Queue provider for destination " + destName
 								+ " can't be created. queueName=" + queueName);
 					}
 				} else {
@@ -408,7 +408,7 @@ private AuditHandler getProviderFromConfig(Properties props,
 							.newInstance();
 				}
 			} catch (Exception e) {
-				LOG.fatal("Can't instantiate audit class for providerName="
+				LOG.error("Can't instantiate audit class for providerName="
 						+ providerName + ", className=" + className
 						+ ", propertyPrefix=" + propPrefix, e);
 			}
@@ -438,7 +438,7 @@ private AuditHandler getProviderFromConfig(Properties props,
 		}
 		if (provider != null && provider instanceof AuditQueue) {
 			if (consumer == null) {
-				LOG.fatal("consumer can't be null for AuditQueue. queue="
+				LOG.error("consumer can't be null for AuditQueue. queue="
 						+ provider.getName() + ", propertyPrefix=" + propPrefix);
 				provider = null;
 			}

diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditWriterFactory.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditWriterFactory.java
@@ -20,15 +20,15 @@
  */
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.ranger.audit.utils.RangerAuditWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Map;
 import java.util.Properties;
 
 public class AuditWriterFactory {
-    private static final Log    logger                     = LogFactory.getLog(AuditWriterFactory.class);
+    private static final Logger logger                     = LoggerFactory.getLogger(AuditWriterFactory.class);
     public static  final String AUDIT_FILETYPE_DEFAULT     = "json";
     public static  final String AUDIT_JSON_FILEWRITER_IMPL = "org.apache.ranger.audit.utils.RangerJSONAuditWriter";
     public static  final String AUDIT_ORC_FILEWRITER_IMPL  = "org.apache.ranger.audit.utils.RangerORCAuditWriter";