SUMOK-21 Logging using Log4j

Author: Juan Pablo Diaz-Vaz

build.xml

@@ -34,6 +34,7 @@
     	<get src= "http://central.maven.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
     	<get src= "http://central.maven.org/maven2/com/ning/async-http-client/1.9.30/async-http-client-1.9.30.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
     	<get src= "http://central.maven.org/maven2/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
+    	<get src= "http://central.maven.org/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
 
         <get src= "https://hamcrest.googlecode.com/files/hamcrest-core-1.3.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
 

log4j.properties

@@ -1,16 +1,6 @@
 # Root logger option
 log4j.rootLogger=INFO, stdout
-log4j.logger.sumologic = TRACE, sumo
-
-# Direct log messages to sumo
-log4j.appender.sumo=com.sumologic.log4j.BufferedSumoLogicAppender
-log4j.appender.sumo.url=https://collectors.us2.sumologic.com/receiver/v1/http/ZaVnC4dhaV0GzIY4tZaKLL26afV52gXBvSFc3jG1eLc2lKINzS2doZdRjUMQMb2CXK8r6fdmHoUazJiHjJ-2OygApoWFaxCTkWFrzAiraCc5i411pkio-g==
-log4j.appender.sumo.layout=org.apache.log4j.PatternLayout
-log4j.appender.sumo.layout.ConversionPattern=%d{DATE} %5p %c{1}:%L - %m%n
-log4j.additivity.sumo = false
-log4j.appender.sumo.Threshold = TRACE
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{DATE} %5p %c{1}:%L - %m%n
-log4j.appender.stdout.Threshold = INFO

src/main/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformer.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 
-import com.amazonaws.services.kinesis.connectors.BasicJsonTransformer;
 import com.amazonaws.services.kinesis.model.Record;
 import com.amazonaws.util.json.JSONArray;
 import com.amazonaws.util.json.JSONException;
@@ -11,34 +10,25 @@
 import com.sumologic.client.model.CloudWatchLogsMessageModel;
 import com.sumologic.client.model.LogEvent;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 
-import java.io.ByteArrayInputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import java.util.List;
-import java.util.zip.GZIPInputStream;
 
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 
 /**
  * A custom transfomer for {@link CloudWatchLogsMessageModel} records in JSON format. The output is in a format
  * usable for insertions to Sumologic.
  */
 public class CloudWatchMessageModelSumologicTransformer 
   implements SumologicTransformer<CloudWatchLogsMessageModel> {
-
-  private static final Log LOG = LogFactory.getLog(CloudWatchMessageModelSumologicTransformer.class);
-
+  private static final Logger LOG = Logger.getLogger(CloudWatchMessageModelSumologicTransformer.class.getName());
+  
   private static CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
 
     /**

src/main/java/com/sumologic/client/DefaultKinesisMessageModelSumologicTransformer.java

@@ -2,34 +2,16 @@
 
 import java.io.IOException;
 
-import com.amazonaws.services.kinesis.connectors.BasicJsonTransformer;
 import com.amazonaws.services.kinesis.model.Record;
-import com.sumologic.client.implementations.SumologicEmitter;
 import com.sumologic.client.implementations.SumologicTransformer;
 import com.sumologic.client.model.SimpleKinesisMessageModel;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.ByteArrayInputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
-import org.apache.commons.codec.binary.Base64;
-
-
 /**
  * A custom transfomer for {@link SimpleKinesisMessageModel} records in JSON format. The output is in a format
  * usable for insertions to Sumologic.
  */
 public class DefaultKinesisMessageModelSumologicTransformer implements
         SumologicTransformer<SimpleKinesisMessageModel> {
-
-  private static final Log LOG = LogFactory.getLog(DefaultKinesisMessageModelSumologicTransformer.class);
-  
     /**
      * Creates a new KinesisMessageModelSumologicTransformer.
      */

src/main/java/com/sumologic/client/SumologicExecutor.java

@@ -6,7 +6,6 @@
 import com.sumologic.client.model.SimpleKinesisMessageModel;
 
 public class SumologicExecutor extends KinesisConnectorExecutor<SimpleKinesisMessageModel, String> {
-
     private static String configFile = "SumologicConnector.properties";
 
     /**

src/main/java/com/sumologic/client/SumologicKinesisUtils.java

@@ -11,14 +11,13 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 
 import com.google.gson.Gson;
 
 public class SumologicKinesisUtils {
-  private static final Log LOG = LogFactory.getLog(SumologicKinesisUtils.class);
-  
+  private static final Logger LOG = Logger.getLogger(SumologicKinesisUtils.class.getName());
+
   public static byte[] compressGzip(String data) {
     if (data == null || data.length() == 0) {
       return null;

src/main/java/com/sumologic/client/SumologicMessageModelPipeline.java

@@ -1,7 +1,6 @@
 package com.sumologic.client;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 
 import com.sumologic.client.implementations.SumologicEmitter;
 import com.sumologic.client.model.SimpleKinesisMessageModel;
@@ -27,9 +26,8 @@
  */
 public class SumologicMessageModelPipeline implements
         IKinesisConnectorPipeline<SimpleKinesisMessageModel, String> {
+    private static final Logger LOG = Logger.getLogger(SumologicMessageModelPipeline.class.getName());
 
-  private static final Log LOG = LogFactory.getLog(SumologicMessageModelPipeline.class);
-  
     @Override
     public IEmitter<String> getEmitter(KinesisConnectorConfiguration configuration) {
         return new SumologicEmitter(configuration);

src/main/java/com/sumologic/client/implementations/SumologicEmitter.java

@@ -2,16 +2,12 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 
 import com.sumologic.client.SumologicSender;
 import com.sumologic.client.KinesisConnectorForSumologicConfiguration;
-
 import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration;
 import com.amazonaws.services.kinesis.connectors.UnmodifiableBuffer;
 import com.amazonaws.services.kinesis.connectors.interfaces.IEmitter;
@@ -22,7 +18,7 @@
  * Sumologic.
  */
 public class SumologicEmitter implements IEmitter<String> {
-    private static final Log LOG = LogFactory.getLog(SumologicEmitter.class);
+    private static final Logger LOG = Logger.getLogger(SumologicEmitter.class.getName());
 
     private SumologicSender sender;
     private KinesisConnectorForSumologicConfiguration config;
@@ -67,9 +63,7 @@ public List<String> sendBatchConcatenating(List<String> records) {
       if (success)
         return new ArrayList<String>();
       else {
-        ArrayList<String> failedRecords = new ArrayList<String>(records);
-        records = new ArrayList<String>();
-        return failedRecords;
+        return records;
       }
     }
 

src/main/java/com/sumologic/kinesis/BatchedStreamSource.java

@@ -11,8 +11,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 
 import com.sumologic.client.model.SimpleKinesisMessageModel;
 import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration;
@@ -23,7 +22,7 @@
  * input file specified in the constructor and batches up records before emitting them.
  */
 public class BatchedStreamSource extends StreamSource {
-    private static Log LOG = LogFactory.getLog(BatchedStreamSource.class);
+    private static final Logger LOG = Logger.getLogger(BatchedStreamSource.class.getName());
 
     private static int NUM_BYTES_PER_PUT_REQUEST = 50000;
     List<SimpleKinesisMessageModel> buffer;

src/main/java/com/sumologic/kinesis/KinesisConnectorExecutor.java

@@ -4,8 +4,7 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 
 import com.sumologic.client.KinesisConnectorForSumologicConfiguration;
 import com.sumologic.kinesis.KinesisConnectorExecutorBase;
@@ -18,8 +17,7 @@
  * 
  */
 public abstract class KinesisConnectorExecutor<T, U> extends KinesisConnectorExecutorBase<T, U> {
-
-    private static final Log LOG = LogFactory.getLog(KinesisConnectorExecutor.class);
+    private static final Logger LOG = Logger.getLogger(KinesisConnectorExecutor.class.getName());
 
     // Create Stream Source constants
     private static final String CREATE_STREAM_SOURCE = "createStreamSource";