Upgrade log4j from 1.x to 2.x

build.gradle

@@ -135,7 +135,7 @@ project.ext.spec = [
         'protobuf' : "com.google.protobuf:protobuf-java:2.6.1",
         'guava' : "com.google.guava:guava:25.0-jre",
         'xbean' : "org.apache.xbean:xbean-asm6-shaded:4.10",
-        'log4j' : "log4j:log4j:1.2.17",
+        'log4j' : "org.apache.logging.log4j:log4j-core:2.17.2",
         'jetty': "org.eclipse.jetty:jetty-util:9.3.24.v20180605",
         'kafka': "org.apache.kafka:kafka-clients:3.1.0",
 

feathr-config/src/main/java/com/linkedin/feathr/core/config/producer/features/ValueType.java

@@ -1,7 +1,8 @@
 package com.linkedin.feathr.core.config.producer.features;
 
 import java.util.Optional;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
@@ -16,7 +17,7 @@ public enum ValueType {
   BOOLEAN,
   BYTE;
 
-  private static final Logger logger = Logger.getLogger(ValueType.class);
+  private static final Logger logger = LogManager.getLogger(ValueType.class);
 
   public static Optional<ValueType> fromName(String name) {
     ValueType res = null;

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/AbsoluteTimeRangeConfigBuilder.java

@@ -4,7 +4,8 @@
 import com.linkedin.feathr.core.configbuilder.ConfigBuilderException;
 import com.linkedin.feathr.core.utils.ConfigUtils;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.AbsoluteTimeRangeConfig.*;
 
@@ -19,7 +20,7 @@
  * @author rkashyap
  */
 public class AbsoluteTimeRangeConfigBuilder {
-  private final static Logger logger = Logger.getLogger(AbsoluteTimeRangeConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(AbsoluteTimeRangeConfigBuilder.class);
 
   private AbsoluteTimeRangeConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/FeatureBagConfigBuilder.java

@@ -5,14 +5,15 @@
 import com.typesafe.config.Config;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
  * Builds FeatureBagConfig objects. These objects specify the features to be fetched.
  */
 class FeatureBagConfigBuilder {
-  private final static Logger logger = Logger.getLogger(FeatureBagConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(FeatureBagConfigBuilder.class);
 
   private FeatureBagConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/JoinConfigBuilder.java

@@ -10,7 +10,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.JoinConfig.*;
 import static com.linkedin.feathr.core.utils.Utils.*;
@@ -20,7 +21,7 @@
  * Builds a JoinConfig object. It does so by delegating to child builders.
  */
 public class JoinConfigBuilder {
-  private final static Logger logger = Logger.getLogger(JoinConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(JoinConfigBuilder.class);
 
   private JoinConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/JoinTimeSettingsConfigBuilder.java

@@ -5,7 +5,8 @@
 import com.linkedin.feathr.core.configbuilder.ConfigBuilderException;
 import com.typesafe.config.Config;
 import java.time.Duration;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.JoinTimeSettingsConfig.*;
 
@@ -28,7 +29,7 @@
  * @author rkashyap
  */
 class JoinTimeSettingsConfigBuilder {
-  private final static Logger logger = Logger.getLogger(JoinTimeSettingsConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(JoinTimeSettingsConfigBuilder.class);
 
   private JoinTimeSettingsConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/KeyedFeaturesConfigBuilder.java

@@ -12,7 +12,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.KeyedFeatures.*;
 
@@ -21,7 +22,7 @@
  * Builds the KeyedFeatures config object
  */
 class KeyedFeaturesConfigBuilder {
-  private final static Logger logger = Logger.getLogger(KeyedFeaturesConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(KeyedFeaturesConfigBuilder.class);
 
   private static DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(TIMESTAMP_FORMAT);
 

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/ObservationDataTimeSettingsConfigBuilder.java

@@ -5,7 +5,8 @@
 import com.linkedin.feathr.core.config.consumer.RelativeTimeRangeConfig;
 import com.linkedin.feathr.core.configbuilder.ConfigBuilderException;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.ObservationDataTimeSettingsConfig.*;
 
@@ -28,7 +29,7 @@
  * @author rkashyap
  */
 public class ObservationDataTimeSettingsConfigBuilder {
-  private final static Logger logger = Logger.getLogger(ObservationDataTimeSettingsConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(ObservationDataTimeSettingsConfigBuilder.class);
 
   private ObservationDataTimeSettingsConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/RelativeTimeRangeConfigBuilder.java

@@ -4,7 +4,8 @@
 import com.linkedin.feathr.core.configbuilder.ConfigBuilderException;
 import com.typesafe.config.Config;
 import java.time.Duration;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.RelativeTimeRangeConfig.*;
 
@@ -17,7 +18,7 @@
  *   }
  */
 public class RelativeTimeRangeConfigBuilder {
-  private final static Logger logger = Logger.getLogger(RelativeTimeRangeConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(RelativeTimeRangeConfigBuilder.class);
 
   private RelativeTimeRangeConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/SettingsConfigBuilder.java

@@ -4,7 +4,8 @@
 import com.linkedin.feathr.core.config.consumer.ObservationDataTimeSettingsConfig;
 import com.linkedin.feathr.core.config.consumer.SettingsConfig;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.SettingsConfig.*;
 
@@ -13,7 +14,7 @@
  * Builds a {@link SettingsConfig} object
  */
 class SettingsConfigBuilder {
-  private final static Logger logger = Logger.getLogger(SettingsConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(SettingsConfigBuilder.class);
 
   private SettingsConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/consumer/TimestampColumnConfigBuilder.java

@@ -3,7 +3,8 @@
 import com.linkedin.feathr.core.config.consumer.TimestampColumnConfig;
 import com.linkedin.feathr.core.configbuilder.ConfigBuilderException;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.consumer.TimestampColumnConfig.*;
 
@@ -16,7 +17,7 @@
  * @author rkashyap
  */
 public class TimestampColumnConfigBuilder {
-  private final static Logger logger = Logger.getLogger(TimestampColumnConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(TimestampColumnConfigBuilder.class);
 
   private TimestampColumnConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/generation/DateTimeConfigBuilder.java

@@ -6,15 +6,16 @@
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.TimeZone;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
  * Build DateTimeConfig from config
  */
 public class DateTimeConfigBuilder {
 
-  private final static Logger logger = Logger.getLogger(DateTimeConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(DateTimeConfigBuilder.class);
   private static final String DEFAULT_TIME_ZONE = "America/Los_Angeles";
   private static final String END_TIME = "endTime";
   private static final String END_TIME_FORMAT = "endTimeFormat";

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/generation/FeatureGenConfigBuilder.java

@@ -4,14 +4,15 @@
 import com.linkedin.feathr.core.config.generation.OperationalConfig;
 import com.typesafe.config.Config;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
  * Feature generation config builder
  */
 public class FeatureGenConfigBuilder {
-  private final static Logger logger = Logger.getLogger(FeatureGenConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(FeatureGenConfigBuilder.class);
   private final static String OPERATIONAL = "operational";
   private final static String FEATURES = "features";
 

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/generation/OperationalConfigBuilder.java

@@ -10,7 +10,8 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
@@ -19,7 +20,7 @@
 
 public class OperationalConfigBuilder {
 
-  private final static Logger logger = Logger.getLogger(OperationalConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(OperationalConfigBuilder.class);
   private static final String NAME = "name";
   private static final String RETENTION = "retention";
   private static final String OUTPUT = "output";

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/generation/OutputProcessorBuilder.java

@@ -3,14 +3,15 @@
 import com.linkedin.feathr.core.config.common.OutputFormat;
 import com.linkedin.feathr.core.config.generation.OutputProcessorConfig;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
  * Output processor config object builder, e.g., HDFS, VENICE processor
  */
 public class OutputProcessorBuilder {
-  private final static Logger logger = Logger.getLogger(OutputProcessorBuilder.class);
+  private final static Logger logger = LogManager.getLogger(OutputProcessorBuilder.class);
   private static final String OUTPUT_FORMAT = "outputFormat";
   private static final String PARAMS = "params";
   private static final String NAME = "name";

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/producer/FeatureDefConfigBuilder.java

@@ -8,7 +8,8 @@
 import com.linkedin.feathr.core.configbuilder.typesafe.producer.derivations.DerivationsConfigBuilder;
 import com.linkedin.feathr.core.configbuilder.typesafe.producer.sources.SourcesConfigBuilder;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.producer.FeatureDefConfig.*;
 
@@ -17,7 +18,7 @@
  * Builds the complete FeatureDefConfig object by delegating to its children, one per config section.
  */
 public class FeatureDefConfigBuilder {
-  private final static Logger logger = Logger.getLogger(FeatureDefConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(FeatureDefConfigBuilder.class);
 
   public static FeatureDefConfig build(Config config) {
     SourcesConfig sources = null;

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/producer/anchors/AnchorConfigBuilder.java

@@ -2,7 +2,8 @@
 
 import com.linkedin.feathr.core.config.producer.anchors.AnchorConfig;
 import com.typesafe.config.Config;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.producer.anchors.AnchorConfig.*;
 
@@ -11,7 +12,7 @@
  * Build a {@link AnchorConfig} object
  */
 class AnchorConfigBuilder {
-  private final static Logger logger = Logger.getLogger(AnchorConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(AnchorConfigBuilder.class);
 
   private AnchorConfigBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/producer/anchors/AnchorConfigWithExtractorBuilder.java

@@ -10,7 +10,8 @@
 import java.util.List;
 import java.util.Map;
 import javax.lang.model.SourceVersion;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.producer.anchors.AnchorConfig.*;
 
@@ -19,7 +20,7 @@
  * Builds AnchorConfig objects that have features that are extracted via a udf class (an extractor)
  */
 class AnchorConfigWithExtractorBuilder extends BaseAnchorConfigBuilder {
-  private final static Logger logger = Logger.getLogger(AnchorConfigWithExtractorBuilder.class);
+  private final static Logger logger = LogManager.getLogger(AnchorConfigWithExtractorBuilder.class);
 
   private AnchorConfigWithExtractorBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/producer/anchors/AnchorConfigWithKeyBuilder.java

@@ -9,7 +9,8 @@
 import com.typesafe.config.Config;
 import java.util.List;
 import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.producer.anchors.AnchorConfig.*;
 
@@ -18,7 +19,7 @@
  * Builds AnchorConfig objects that have features with keys
  */
 class AnchorConfigWithKeyBuilder extends BaseAnchorConfigBuilder {
-  private final static Logger logger = Logger.getLogger(BaseAnchorConfigBuilder.class);
+  private final static Logger logger = LogManager.getLogger(BaseAnchorConfigBuilder.class);
 
   private AnchorConfigWithKeyBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/producer/anchors/AnchorConfigWithKeyExtractorBuilder.java

@@ -7,7 +7,8 @@
 import com.typesafe.config.Config;
 import java.util.Map;
 import javax.lang.model.SourceVersion;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.producer.anchors.AnchorConfig.*;
 
@@ -16,7 +17,7 @@
  * Builds AnchorConfig objects that have features that are extracted via a udf class (an extractor)
  */
 class AnchorConfigWithKeyExtractorBuilder extends BaseAnchorConfigBuilder {
-  private final static Logger logger = Logger.getLogger(AnchorConfigWithKeyExtractorBuilder.class);
+  private final static Logger logger = LogManager.getLogger(AnchorConfigWithKeyExtractorBuilder.class);
 
   private AnchorConfigWithKeyExtractorBuilder() {
   }

feathr-config/src/main/java/com/linkedin/feathr/core/configbuilder/typesafe/producer/anchors/AnchorConfigWithOnlyMvelBuilder.java

@@ -4,7 +4,8 @@
 import com.linkedin.feathr.core.config.producer.anchors.FeatureConfig;
 import com.typesafe.config.Config;
 import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import static com.linkedin.feathr.core.config.producer.anchors.AnchorConfig.*;
 
@@ -14,7 +15,7 @@
  * key or extractor
  */
 class AnchorConfigWithOnlyMvelBuilder extends BaseAnchorConfigBuilder {
-  private final static Logger logger = Logger.getLogger(AnchorConfigWithOnlyMvelBuilder.class);
+  private final static Logger logger = LogManager.getLogger(AnchorConfigWithOnlyMvelBuilder.class);
 
   private AnchorConfigWithOnlyMvelBuilder() {
   }