diff --git a/.travis.yml b/.travis.yml
index 87cb20673..0fb948de8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,24 +11,26 @@ matrix:
   fast_finish: true
   include:
     - jdk: oraclejdk8
-      env: 
+      env:
        - DESC="Oracle JDK8 linting"
-       - CMD="mvn verify -B -Dhttps.protocols=TLSv1.2 -DskipTests -Dlog4j.configuration=log4j.travis.properties"
+       - CMD="mvn verify -B -Dhttps.protocols=TLSv1.2 -DskipTests -Dlog4j.configuration=log4j2.travis.properties"
 
     - jdk: oraclejdk8
-      env: 
+      env:
        - DESC="Oracle JDK8 testing"
-       - CMD="mvn test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dlog4j.configuration=log4j.travis.properties"
+       - CMD="mvn test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dlog4j.configurationFile=log4j2.travis.properties"
 
     - jdk: oraclejdk7
-      env: 
+      env:
        - DESC="Oracle JDK7 testing"
-       - CMD="mvn test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dlog4j.configuration=log4j.travis.properties"
+       - CMD="mvn test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dlog4j.configurationFile=log4j2.travis.properties"
 
     - jdk: openjdk7
-      env: 
+      env:
        - DESC="OpenJDK7 testing"
-       - CMD="mvn test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dlog4j.configuration=log4j.travis.properties"
+       - CMD="mvn test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dlog4j.configurationFile=log4j2.travis.properties"
 
-script: echo "Running $DESC..." && (eval $CMD) 
+script: echo "Running $DESC..." && (eval $CMD)
 
+after_failure:
+  - for log in target/surefire-reports/*.txt; do  echo "$log ========================" ; cat $log ; done
diff --git a/README.md b/README.md
index bec9b8aec..c2fd28cd6 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,11 @@ mvn checkstyle::check
 
 `Checkstyle` analysis is automatically executed prior to compiling the code, testing.
 
+# Generated code
+
+JMXFetch uses [Lombok](https://projectlombok.org/) to modify classes and generate additional code at runtime.
+You may need to [enable annotation processors](https://projectlombok.org/setup/overview) to compile in your IDE.
+
 # Testing
 
 To run unit test, issue the following command:
diff --git a/log4j.travis.properties b/log4j.travis.properties
deleted file mode 100644
index 0641702ac..000000000
--- a/log4j.travis.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-log4j.rootLogger=INFO,stdout
-log4j.logger.com.endeca=INFO
-# Logger for crawl metrics
-log4j.logger.com.endeca.itl.web.metrics=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n
diff --git a/log4j2.travis.properties b/log4j2.travis.properties
new file mode 100644
index 000000000..3c926875d
--- /dev/null
+++ b/log4j2.travis.properties
@@ -0,0 +1,9 @@
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = CONSOLE
+
+appender.console.type = Console
+appender.console.name = CONSOLE
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = info
diff --git a/pom.xml b/pom.xml
index b7d6823b3..ac20025de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,8 @@
         <guava.version>17.0</guava.version>
         <java-dogstatsd-client.version>2.1.0</java-dogstatsd-client.version>
         <jcommander.version>1.35</jcommander.version>
-        <log4j.version>1.2.17</log4j.version>
+        <log4j.version>2.12.1</log4j.version>
+        <slf4j.version>1.7.26</slf4j.version>
         <jackson.version>2.10.0</jackson.version>
         <snakeyaml.version>1.13</snakeyaml.version>
         <!-- Note: using project checkstyle with AOSP style
@@ -121,8 +122,19 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
             <exclusions>
                 <exclusion>
@@ -139,6 +151,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
diff --git a/src/main/java/org/datadog/jmxfetch/App.java b/src/main/java/org/datadog/jmxfetch/App.java
index 47573a319..1e54dce5b 100644
--- a/src/main/java/org/datadog/jmxfetch/App.java
+++ b/src/main/java/org/datadog/jmxfetch/App.java
@@ -5,10 +5,10 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
 
 import org.datadog.jmxfetch.reporter.Reporter;
 import org.datadog.jmxfetch.tasks.TaskMethod;
@@ -17,6 +17,8 @@
 import org.datadog.jmxfetch.tasks.TaskStatusHandler;
 import org.datadog.jmxfetch.util.CustomLogger;
 import org.datadog.jmxfetch.util.FileHelper;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -29,7 +31,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -52,8 +53,8 @@
 
 
 @SuppressWarnings("unchecked")
+@Slf4j
 public class App {
-    private static final Logger LOGGER = Logger.getLogger(App.class.getName());
     private static final String AUTO_DISCOVERY_PREFIX = "AD-";
     private static final String AD_CONFIG_SEP = "#### AUTO-DISCOVERY ####";
     private static final String AD_LEGACY_CONFIG_SEP = "#### SERVICE-DISCOVERY ####";
@@ -124,6 +125,16 @@ public static void main(String[] args) {
             System.exit(0);
         }
 
+        {
+            // Running these commands here because they are logging specific,
+            // not needed in dd-java-agent, which calls run directly.
+
+            // Set up the logger to add file handler
+            CustomLogger.setup(Level.toLevel(config.getLogLevel()), config.getLogLocation());
+
+            // Set up the shutdown hook to properly close resources
+            attachShutdownHook();
+        }
         System.exit(run(config));
     }
 
@@ -132,18 +143,18 @@ public static void main(String[] args) {
      * System#exit}.
      */
     public static int run(AppConfig config) {
-        // Set up the logger to add file handler
-        CustomLogger.setup(Level.toLevel(config.getLogLevel()), config.getLogLocation());
+        Marker fatal = MarkerFactory.getMarker("FATAL");
 
         // The specified action is unknown
         if (!AppConfig.ACTIONS.contains(config.getAction())) {
-            LOGGER.fatal(config.getAction() + " is not in " + AppConfig.ACTIONS + ". Exiting.");
+            log.error(fatal,
+                    config.getAction() + " is not in " + AppConfig.ACTIONS + ". Exiting.");
             return 1;
         }
 
         // The "list_*" actions can only be used with the reporter
         if (!config.getAction().equals(AppConfig.ACTION_COLLECT) && !config.isConsoleReporter()) {
-            LOGGER.fatal(
+            log.error(fatal,
                     config.getAction()
                             + " argument can only be used with the console reporter. Exiting.");
             return 1;
@@ -164,7 +175,7 @@ public static int run(AppConfig config) {
         // Set up the shutdown hook to properly close resources
         attachShutdownHook();
 
-        LOGGER.info("JMX Fetch has started");
+        log.info("JMX Fetch has started");
 
         // set up the config status
         config.updateStatus();
@@ -193,27 +204,16 @@ public static int run(AppConfig config) {
 
     /** Attach a Shutdown Hook that will be called when SIGTERM is sent to JMXFetch. */
     private static void attachShutdownHook() {
-        class ShutdownHook {
-            public void attachShutDownHook() {
-                Runtime.getRuntime()
-                        .addShutdownHook(
-                                new Thread() {
-                                    @Override
-                                    public void run() {
-                                        LOGGER.info("JMXFetch is closing");
-                                        // Properly close log handlers
-                                        Enumeration<Appender> enume =
-                                                (Enumeration<Appender>) LOGGER.getAllAppenders();
-                                        while (enume.hasMoreElements()) {
-                                            Appender appender = enume.nextElement();
-                                            appender.close();
-                                        }
-                                    }
-                                });
+        Runtime.getRuntime().addShutdownHook(
+            new Thread() {
+                @Override
+                public void run() {
+                    log.info("JMXFetch is closing");
+                    // Properly close log handlers
+                    LogManager.shutdown();
+                }
             }
-        }
-
-        new ShutdownHook().attachShutDownHook();
+        );
     }
 
     /** Sets reinitialization flag. */
@@ -239,7 +239,7 @@ private void clearInstances(Collection<Instance> instances) {
 
         try {
             if (!recoveryProcessor.ready()) {
-                LOGGER.warn(
+                log.warn(
                         "Executor has to be replaced for recovery processor, "
                         + "previous one hogging threads");
                 recoveryProcessor.stop();
@@ -261,7 +261,7 @@ public TaskStatusHandler invoke(
                             });
 
         } catch (Exception e) {
-            LOGGER.warn(
+            log.warn(
                     "Unable to terminate all connections gracefully "
                     + "- possible network connectivity issues.");
         } finally {
@@ -282,9 +282,9 @@ private FileInputStream newAutoDiscoveryPipe() {
         String pipeName = appConfig.getAutoDiscoveryPipe();
         try {
             adPipe = new FileInputStream(pipeName);
-            LOGGER.info("Named pipe for Auto-Discovery opened: " + pipeName);
+            log.info("Named pipe for Auto-Discovery opened: " + pipeName);
         } catch (FileNotFoundException e) {
-            LOGGER.info("Unable to open named pipe for Auto-Discovery: " + pipeName);
+            log.info("Unable to open named pipe for Auto-Discovery: " + pipeName);
         }
 
         return adPipe;
@@ -309,15 +309,15 @@ public boolean processAutoDiscovery(byte[] buffer) {
             }
 
             String name = getAutoDiscoveryName(config);
-            LOGGER.debug("Attempting to apply config. Name: " + name);
+            log.debug("Attempting to apply config. Name: " + name + "\nconfig: \n" + config);
             InputStream stream = new ByteArrayInputStream(config.getBytes(UTF_8));
             YamlParser yaml = new YamlParser(stream);
 
             if (this.addConfig(name, yaml)) {
                 reinit = true;
-                LOGGER.debug("Configuration added succesfully reinit in order");
+                log.debug("Configuration added succesfully reinit in order");
             } else {
-                LOGGER.debug("Unable to apply configuration.");
+                log.debug("Unable to apply configuration.");
             }
         }
 
@@ -333,12 +333,12 @@ void start() {
         FileInputStream adPipe = null;
 
         if (appConfig.getAutoDiscoveryPipeEnabled()) {
-            LOGGER.info("Auto Discovery enabled");
+            log.info("Auto Discovery enabled");
             adPipe = newAutoDiscoveryPipe();
             try {
                 FileHelper.touch(new File(appConfig.getJmxLaunchFile()));
             } catch (IOException e) {
-                LOGGER.warn(
+                log.warn(
                         "Unable to create launch file"
                         + " - Auto-Discovery configs will not be automatically resubmitted.");
             }
@@ -347,7 +347,7 @@ void start() {
         while (true) {
             // Exit on exit file trigger...
             if (appConfig.getExitWatcher().shouldExit()) {
-                LOGGER.info("Exit file detected: stopping JMXFetch.");
+                log.info("Exit file detected: stopping JMXFetch.");
                 return;
             }
 
@@ -388,38 +388,38 @@ void start() {
                     setReinit(getJsonConfigs());
                 }
             } catch (IOException e) {
-                LOGGER.warn(
+                log.warn(
                         "Unable to read from pipe"
                                 + "- Service Discovery configuration may have been skipped.");
             } catch (Exception e) {
-                LOGGER.warn("Problem parsing auto-discovery configuration: " + e);
+                log.warn("Problem parsing auto-discovery configuration: " + e);
             }
 
             long start = System.currentTimeMillis();
             if (this.reinit.get()) {
-                LOGGER.info("Reinitializing...");
+                log.info("Reinitializing...");
                 init(true);
             }
 
             if (instances.size() > 0) {
                 doIteration();
             } else {
-                LOGGER.warn("No instance could be initiated. Retrying initialization.");
+                log.warn("No instance could be initiated. Retrying initialization.");
                 lastJsonConfigTs = 0; // reset TS to get AC instances
                 appConfig.getStatus().flush();
                 configs = getConfigs(appConfig);
                 init(true);
             }
             long duration = System.currentTimeMillis() - start;
-            LOGGER.debug("Iteration ran in " + duration + " ms");
+            log.debug("Iteration ran in " + duration + " ms");
             // Sleep until next collection
             try {
                 long loopPeriod = appConfig.getCheckPeriod();
                 long sleepPeriod = (duration > loopPeriod) ? loopPeriod : loopPeriod - duration;
-                LOGGER.debug("Sleeping for " + loopPeriod + " ms.");
+                log.debug("Sleeping for " + loopPeriod + " ms.");
                 Thread.sleep(loopPeriod);
             } catch (InterruptedException e) {
-                LOGGER.warn(e.getMessage(), e);
+                log.warn(e.getMessage(), e);
             }
         }
     }
@@ -446,7 +446,7 @@ public void doIteration() {
             }
 
             if (!collectionProcessor.ready()) {
-                LOGGER.warn(
+                log.warn(
                         "Executor has to be replaced for collection processor, "
                         + "previous one hogging threads");
                 collectionProcessor.stop();
@@ -479,7 +479,7 @@ public TaskStatusHandler invoke(
             String instanceStatus = Status.STATUS_ERROR;
             String scStatus = Status.STATUS_ERROR;
 
-            LOGGER.warn("JMXFetch internal error invoking concurrent tasks: ", e);
+            log.warn("JMXFetch internal error invoking concurrent tasks: ", e);
 
             for (Instance instance : instances) {
                 // don't add instances to broken instances, issue was internal
@@ -492,14 +492,14 @@ public TaskStatusHandler invoke(
         }
 
         // Attempt to fix broken instances
-        LOGGER.debug("Trying to recover broken instances...");
+        log.debug("Trying to recover broken instances...");
         fixBrokenInstances(reporter);
-        LOGGER.debug("Done trying to recover broken instances.");
+        log.debug("Done trying to recover broken instances.");
 
         try {
             appConfig.getStatus().flush();
         } catch (Exception e) {
-            LOGGER.error("Unable to flush stats.", e);
+            log.error("Unable to flush stats.", e);
         }
     }
 
@@ -511,7 +511,7 @@ private void fixBrokenInstances(Reporter reporter) {
             reporter.clearRatesAggregator(instance.getName());
             reporter.clearCountersAggregator(instance.getName());
 
-            LOGGER.warn(
+            log.warn(
                     "Instance "
                             + instance
                             + " didn't return any metrics. "
@@ -532,7 +532,7 @@ private void fixBrokenInstances(Reporter reporter) {
 
         try {
             if (!recoveryProcessor.ready()) {
-                LOGGER.warn(
+                log.warn(
                         "Executor has to be replaced for recovery processor, "
                         + "previous one hogging threads");
                 recoveryProcessor.stop();
@@ -575,7 +575,7 @@ public boolean addConfig(String name, YamlParser config) {
         // + 2 cause of underscores.
         if (name.length()
                 > AUTO_DISCOVERY_PREFIX.length() + AD_MAX_NAME_LEN + AD_MAX_MAG_INSTANCES + 2) {
-            LOGGER.debug("Name too long - skipping: " + name);
+            log.debug("Name too long - skipping: " + name);
             return false;
         }
         String patternText =
@@ -591,7 +591,7 @@ public boolean addConfig(String name, YamlParser config) {
         Matcher matcher = pattern.matcher(name);
         if (!matcher.find()) {
             // bad name.
-            LOGGER.debug("Cannot match instance name: " + name);
+            log.debug("Cannot match instance name: " + name);
             return false;
         }
 
@@ -599,7 +599,7 @@ public boolean addConfig(String name, YamlParser config) {
         String check = matcher.group(1);
         if (this.configs.containsKey(check)) {
             // there was already a file config for the check.
-            LOGGER.debug("Key already present - skipping: " + name);
+            log.debug("Key already present - skipping: " + name);
             return false;
         }
 
@@ -620,7 +620,7 @@ private ConcurrentHashMap<String, YamlParser> getConfigs(AppConfig config) {
         loadFileConfigs(config, configs);
         loadResourceConfigs(config, configs);
 
-        LOGGER.info("Found " + configs.size() + " config files");
+        log.info("Found " + configs.size() + " config files");
         return configs;
     }
 
@@ -632,14 +632,14 @@ private void loadFileConfigs(AppConfig config, ConcurrentHashMap<String, YamlPar
                 String name = file.getName().replace(".yaml", "");
                 String yamlPath = file.getAbsolutePath();
                 FileInputStream yamlInputStream = null;
-                LOGGER.info("Reading " + yamlPath);
+                log.info("Reading " + yamlPath);
                 try {
                     yamlInputStream = new FileInputStream(yamlPath);
                     configs.put(name, new YamlParser(yamlInputStream));
                 } catch (FileNotFoundException e) {
-                    LOGGER.warn("Cannot find " + yamlPath);
+                    log.warn("Cannot find " + yamlPath);
                 } catch (Exception e) {
-                    LOGGER.warn("Cannot parse yaml file " + yamlPath, e);
+                    log.warn("Cannot parse yaml file " + yamlPath, e);
                 } finally {
                     if (yamlInputStream != null) {
                         try {
@@ -660,15 +660,15 @@ private void loadResourceConfigs(
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             for (String resourceName : resourceConfigList) {
                 String name = resourceName.replace(".yaml", "");
-                LOGGER.info("Reading " + resourceName);
+                log.info("Reading " + resourceName);
                 InputStream inputStream = classLoader.getResourceAsStream(resourceName);
                 if (inputStream == null) {
-                    LOGGER.warn("Cannot find " + resourceName);
+                    log.warn("Cannot find " + resourceName);
                 } else {
                     try {
                         configs.put(name, new YamlParser(inputStream));
                     } catch (Exception e) {
-                        LOGGER.warn("Cannot parse yaml file " + resourceName, e);
+                        log.warn("Cannot parse yaml file " + resourceName, e);
                     } finally {
                         try {
                             inputStream.close();
@@ -693,17 +693,19 @@ private boolean getJsonConfigs() {
             String uripath = "agent/jmx/configs?timestamp=" + lastJsonConfigTs;
             response = client.request("GET", "", uripath);
             if (!response.isResponse2xx()) {
-                LOGGER.warn(
+                log.warn(
                         "Failed collecting JSON configs: ["
                                 + response.getResponseCode()
                                 + "] "
                                 + response.getResponseBody());
                 return update;
             } else if (response.getResponseCode() == 204) {
-                LOGGER.debug("No configuration changes...");
+                log.debug("No configuration changes...");
                 return update;
             }
 
+            log.debug("Received the following JSON configs: " + response.getResponseBody());
+
             InputStream jsonInputStream = IOUtils.toInputStream(response.getResponseBody(), UTF_8);
             JsonParser parser = new JsonParser(jsonInputStream);
             int timestamp = ((Integer) parser.getJsonTimestamp()).intValue();
@@ -711,15 +713,12 @@ private boolean getJsonConfigs() {
                 adJsonConfigs = (HashMap<String, Object>) parser.getJsonConfigs();
                 lastJsonConfigTs = timestamp;
                 update = true;
-                LOGGER.info("update is in order - updating timestamp: " + lastJsonConfigTs);
-                for (String checkName : adJsonConfigs.keySet()) {
-                    LOGGER.debug("received config for check '" + checkName + "'");
-                }
+                log.info("update is in order - updating timestamp: " + lastJsonConfigTs);
             }
         } catch (JsonProcessingException e) {
-            LOGGER.error("error processing JSON response: " + e);
+            log.error("error processing JSON response: " + e);
         } catch (IOException e) {
-            LOGGER.error("unable to collect remote JMX configs: " + e);
+            log.error("unable to collect remote JMX configs: " + e);
         }
 
         return update;
@@ -764,7 +763,7 @@ private Instance instantiate(
         } catch (Exception e) {
             String warning = "Unable to create instance. Please check your yaml file";
             appConfig.getStatus().addInitFailedCheck(checkName, warning, Status.STATUS_ERROR);
-            LOGGER.error(warning, e);
+            log.error(warning, e);
             return null;
         }
 
@@ -773,7 +772,7 @@ private Instance instantiate(
 
     /** Initializes instances and metric collection. */
     public void init(boolean forceNewConnection) {
-        LOGGER.info("Cleaning up instances...");
+        log.info("Cleaning up instances...");
         clearInstances(instances);
         clearInstances(brokenInstanceMap.values());
         brokenInstanceMap.clear();
@@ -781,7 +780,7 @@ public void init(boolean forceNewConnection) {
         List<InstanceTask<Void>> instanceInitTasks = new ArrayList<InstanceTask<Void>>();
         List<Instance> newInstances = new ArrayList<Instance>();
 
-        LOGGER.info("Dealing with YAML config instances...");
+        log.info("Dealing with YAML config instances...");
         Iterator<Entry<String, YamlParser>> it = configs.entrySet().iterator();
         Iterator<Entry<String, YamlParser>> itPipeConfigs = adPipeConfigs.entrySet().iterator();
         while (it.hasNext() || itPipeConfigs.hasNext()) {
@@ -805,14 +804,14 @@ public void init(boolean forceNewConnection) {
                     ((ArrayList<LinkedHashMap<String, Object>>) yamlConfig.getYamlInstances());
             if (configInstances == null || configInstances.size() == 0) {
                 String warning = "No instance found in :" + name;
-                LOGGER.warn(warning);
+                log.warn(warning);
                 appConfig.getStatus().addInitFailedCheck(name, warning, Status.STATUS_ERROR);
                 continue;
             }
 
             for (LinkedHashMap<String, Object> configInstance : configInstances) {
                 // Create a new Instance object
-                LOGGER.info("Instantiating instance for: " + name);
+                log.info("Instantiating instance for: " + name);
                 Instance instance =
                         instantiate(
                                 configInstance,
@@ -824,7 +823,7 @@ public void init(boolean forceNewConnection) {
         }
 
         // Process JSON configurations
-        LOGGER.info("Dealing with Auto-Config instances collected...");
+        log.info("Dealing with Auto-Config instances collected...");
         if (adJsonConfigs != null) {
             for (String check : adJsonConfigs.keySet()) {
                 HashMap<String, Object> checkConfig =
@@ -835,7 +834,7 @@ public void init(boolean forceNewConnection) {
                         (ArrayList<LinkedHashMap<String, Object>>) checkConfig.get("instances");
                 String checkName = (String) checkConfig.get("check_name");
                 for (LinkedHashMap<String, Object> configInstance : configInstances) {
-                    LOGGER.info("Instantiating instance for: " + checkName);
+                    log.info("Instantiating instance for: " + checkName);
                     Instance instance =
                             instantiate(configInstance, initConfig, checkName, appConfig);
                     newInstances.add(instance);
@@ -849,11 +848,11 @@ public void init(boolean forceNewConnection) {
         }
 
         // Initialize the instances
-        LOGGER.info("Started instance initialization...");
+        log.info("Started instance initialization...");
 
         try {
             if (!recoveryProcessor.ready()) {
-                LOGGER.warn(
+                log.warn(
                         "Executor has to be replaced for recovery processor, "
                         + "previous one hogging threads");
                 recoveryProcessor.stop();
@@ -874,7 +873,7 @@ public TaskStatusHandler invoke(
                                 }
                             });
 
-            LOGGER.info("Completed instance initialization...");
+            log.info("Completed instance initialization...");
 
             processInstantiationStatus(instanceInitTasks, statuses);
 
@@ -882,7 +881,7 @@ public TaskStatusHandler invoke(
             processStatus(instanceInitTasks, statuses);
         } catch (Exception e) {
             // NADA
-            LOGGER.warn("Critical issue initializing instances: " + e);
+            log.warn("Critical issue initializing instances: " + e);
         }
     }
 
@@ -971,9 +970,9 @@ private <T> void processInstantiationStatus(
 
                 // All was good, add instance
                 instances.add(instance);
-                LOGGER.info("Successfully initialized instance: " + instance.getName());
+                log.info("Successfully initialized instance: " + instance.getName());
             } catch (Throwable e) {
-                LOGGER.info(
+                log.info(
                     "Could not initialize instance: " + instance.getName()
                     + ": " + e.toString());
                 instance.cleanUpAsync();
@@ -1043,7 +1042,7 @@ private <T> void processStatus(List<InstanceTask<T>> tasks, List<TaskStatusHandl
                 warning += " There was an unexpected exception: " + e.getMessage();
             } finally {
                 if (warning != null) {
-                    LOGGER.warn(warning);
+                    log.warn(warning);
 
                     this.reportStatus(
                             appConfig, reporter, instance, 0, warning, Status.STATUS_ERROR);
@@ -1085,7 +1084,7 @@ private <T> void processCollectionStatus(
                                     + " metrics.";
 
                     instanceStatus = Status.STATUS_WARNING;
-                    CustomLogger.laconic(LOGGER, Level.WARN, instanceMessage, 0);
+                    CustomLogger.laconic(log, Level.WARN, instanceMessage, 0);
                 }
 
                 if (numberOfMetrics > 0) {
@@ -1100,24 +1099,24 @@ private <T> void processCollectionStatus(
 
                 instanceMessage = te.toString();
 
-                LOGGER.warn(instanceMessage);
+                log.warn(instanceMessage);
             } catch (ExecutionException ee) {
                 instanceMessage = task.getWarning();
                 instanceStatus = Status.STATUS_ERROR;
 
                 brokenInstanceMap.put(instance.toString(), instance);
-                LOGGER.debug("Adding broken instance to list: " + instance.getName());
+                log.debug("Adding broken instance to list: " + instance.getName());
 
-                LOGGER.warn(instanceMessage, ee.getCause());
+                log.warn(instanceMessage, ee.getCause());
             } catch (Throwable t) {
                 // Legit exception during task - eviction necessary
-                LOGGER.debug("Adding broken instance to list: " + instance.getName());
+                log.debug("Adding broken instance to list: " + instance.getName());
                 brokenInstanceMap.put(instance.toString(), instance);
 
                 instanceStatus = Status.STATUS_ERROR;
                 instanceMessage = task.getWarning() + ": " + t.toString();
 
-                LOGGER.warn(instanceMessage);
+                log.warn(instanceMessage);
 
             } finally {
 
diff --git a/src/main/java/org/datadog/jmxfetch/AttachApiConnection.java b/src/main/java/org/datadog/jmxfetch/AttachApiConnection.java
index 60d63ba93..6f6ecfa28 100644
--- a/src/main/java/org/datadog/jmxfetch/AttachApiConnection.java
+++ b/src/main/java/org/datadog/jmxfetch/AttachApiConnection.java
@@ -1,6 +1,6 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,10 +8,10 @@
 import java.util.LinkedHashMap;
 import javax.management.remote.JMXServiceURL;
 
+@Slf4j
 public class AttachApiConnection extends Connection {
     private static final String CONNECTOR_ADDRESS =
             "com.sun.management.jmxremote.localConnectorAddress";
-    private static final Logger LOGGER = Logger.getLogger(Connection.class.getName());
     private String processRegex;
 
     /** AttachApiConnection constructor for specified connection parameters. */
@@ -67,7 +67,7 @@ private void loadJmxAgent(com.sun.tools.attach.VirtualMachine vm) throws IOExcep
         try {
             vm.loadAgent(agent);
         } catch (Exception e) {
-            LOGGER.warn("Error initializing JMX agent", e);
+            log.warn("Error initializing JMX agent", e);
         }
     }
 }
diff --git a/src/main/java/org/datadog/jmxfetch/Connection.java b/src/main/java/org/datadog/jmxfetch/Connection.java
index 37ea9636a..fa1ced60b 100644
--- a/src/main/java/org/datadog/jmxfetch/Connection.java
+++ b/src/main/java/org/datadog/jmxfetch/Connection.java
@@ -1,6 +1,6 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -27,11 +27,11 @@
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 
+@Slf4j
 public class Connection {
     private static final long CONNECTION_TIMEOUT = 10000;
     private static final long JMX_TIMEOUT = 20;
     public static final String CLOSED_CLIENT_CAUSE = "The client has been closed";
-    private static final Logger LOGGER = Logger.getLogger(Connection.class.getName());
     private static final ThreadFactory daemonThreadFactory = new DaemonThreadFactory();
     private JMXConnector connector;
     protected MBeanServerConnection mbs;
@@ -53,14 +53,14 @@ public MBeanAttributeInfo[] getAttributesForBean(ObjectName beanName)
     /** Queries beans on specific scope. Returns set of matching query names.. */
     public Set<ObjectName> queryNames(ObjectName name) throws IOException {
         String scope = (name != null) ? name.toString() : "*:*";
-        LOGGER.debug("Querying bean names on scope: " + scope);
+        log.debug("Querying bean names on scope: " + scope);
         return mbs.queryNames(name, null);
     }
 
     protected void createConnection() throws IOException {
         this.env.put("attribute.remote.x.request.waiting.timeout", CONNECTION_TIMEOUT);
         closeConnector();
-        LOGGER.info("Connecting to: " + this.address);
+        log.info("Connecting to: " + this.address);
         connector = connectWithTimeout(this.address, this.env);
         mbs = connector.getMBeanServerConnection();
     }
@@ -113,7 +113,7 @@ public void run() {
             executor.shutdown();
         }
         if (result == null) {
-            LOGGER.warn("Connection timed out: " + url);
+            log.warn("Connection timed out: " + url);
             throw new SocketTimeoutException("Connection timed out: " + url);
         }
         if (result instanceof JMXConnector) {
diff --git a/src/main/java/org/datadog/jmxfetch/ConnectionFactory.java b/src/main/java/org/datadog/jmxfetch/ConnectionFactory.java
index 2484218a0..00bd3545f 100644
--- a/src/main/java/org/datadog/jmxfetch/ConnectionFactory.java
+++ b/src/main/java/org/datadog/jmxfetch/ConnectionFactory.java
@@ -1,13 +1,13 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.util.LinkedHashMap;
 
 /** Singleton used to create connections to the MBeanServer. */
+@Slf4j
 public class ConnectionFactory {
-    private static final Logger LOGGER = Logger.getLogger(ConnectionFactory.class.getName());
     public static final String PROCESS_NAME_REGEX = "process_name_regex";
     private static ConnectionFactory connectionFactory = null;
 
@@ -22,18 +22,18 @@ public static Connection createConnection(LinkedHashMap<String, Object> connecti
                         "Unable to find tools.jar."
                                 + " Are you using a JDK and did you set the pass to tools.jar ?");
             }
-            LOGGER.info("Connecting using Attach API");
+            log.info("Connecting using Attach API");
             return new AttachApiConnection(connectionParams);
         }
 
         // This is used by dd-java-agent to enable directly connecting to the mbean server.
         // This works because jmxfetch is being run as a library inside the process.
         if ("service:jmx:local:///".equals(connectionParams.get("jmx_url"))) {
-            LOGGER.info("Connecting using JMX Local");
+            log.info("Connecting using JMX Local");
             return new LocalConnection();
         }
 
-        LOGGER.info("Connecting using JMX Remote");
+        log.info("Connecting using JMX Remote");
         return new RemoteConnection(connectionParams);
     }
 }
diff --git a/src/main/java/org/datadog/jmxfetch/HttpClient.java b/src/main/java/org/datadog/jmxfetch/HttpClient.java
index a2de5c38b..23a53d522 100644
--- a/src/main/java/org/datadog/jmxfetch/HttpClient.java
+++ b/src/main/java/org/datadog/jmxfetch/HttpClient.java
@@ -1,6 +1,6 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -12,6 +12,7 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+@Slf4j
 public class HttpClient {
     private String token;
     private TrustManager[] dummyTrustManager;
@@ -20,7 +21,6 @@ public class HttpClient {
     private int port;
 
     private static final String USER_AGENT = "Datadog/JMXFetch";
-    private static final Logger LOGGER = Logger.getLogger(Status.class.getName());
 
     public static class HttpResponse {
         private int responseCode;
@@ -92,7 +92,7 @@ public void checkServerTrusted(
                 sc.init(null, this.dummyTrustManager, new java.security.SecureRandom());
                 HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
             } catch (Exception e) {
-                LOGGER.debug("session token unavailable - not setting");
+                log.debug("session token unavailable - not setting");
                 this.token = "";
             }
         }
@@ -103,8 +103,8 @@ public HttpResponse request(String method, String body, String path) {
         HttpClient.HttpResponse response = new HttpClient.HttpResponse(0, "");
         try {
             String url = "https://" + host + ":" + port + "/" + path;
-            LOGGER.debug("attempting to connect to: " + url);
-            LOGGER.debug("with body: " + body);
+            log.debug("attempting to connect to: " + url);
+            log.debug("with body: " + body);
 
             URL uri = new URL(url);
             HttpsURLConnection con = (HttpsURLConnection) uri.openConnection();
@@ -126,7 +126,7 @@ public HttpResponse request(String method, String body, String path) {
 
             int responseCode = con.getResponseCode();
             if (responseCode < 200 || responseCode >= 300) {
-                LOGGER.debug("HTTP error stream: " + con.getErrorStream());
+                log.debug("HTTP error stream: " + con.getErrorStream());
                 response.setResponseCode(responseCode);
             } else {
                 response =
@@ -135,7 +135,7 @@ public HttpResponse request(String method, String body, String path) {
             }
 
         } catch (Exception e) {
-            LOGGER.info("problem creating http request: " + e.toString());
+            log.info("problem creating http request: " + e.toString());
         }
 
         return response;
diff --git a/src/main/java/org/datadog/jmxfetch/Instance.java b/src/main/java/org/datadog/jmxfetch/Instance.java
index 971d68377..3cb76943f 100644
--- a/src/main/java/org/datadog/jmxfetch/Instance.java
+++ b/src/main/java/org/datadog/jmxfetch/Instance.java
@@ -2,7 +2,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import org.datadog.jmxfetch.reporter.Reporter;
 import org.yaml.snakeyaml.Yaml;
@@ -27,8 +27,8 @@
 import javax.management.ObjectName;
 import javax.security.auth.login.FailedLoginException;
 
+@Slf4j
 public class Instance {
-    private static final Logger LOGGER = Logger.getLogger(Instance.class.getName());
     private static final List<String> SIMPLE_TYPES =
             Arrays.asList(
                     "long",
@@ -163,7 +163,7 @@ public Instance(
                                 + "-"
                                 + this.instanceMap.get("port");
             } else {
-                LOGGER.warn(
+                log.warn(
                         "Cannot determine a unique instance name. "
                                 + "Please define a name in your instance configuration");
                 this.instanceName = this.checkName;
@@ -185,7 +185,7 @@ public Instance(
         }
 
         if (instanceConf == null) {
-            LOGGER.warn("Cannot find a \"conf\" section in " + this.instanceName);
+            log.warn("Cannot find a \"conf\" section in " + this.instanceName);
         } else {
             for (LinkedHashMap<String, Object> conf :
                     (ArrayList<LinkedHashMap<String, Object>>) (instanceConf)) {
@@ -225,7 +225,7 @@ static void loadMetricConfigFiles(
             for (String fileName : appConfig.getMetricConfigFiles()) {
                 String yamlPath = new File(fileName).getAbsolutePath();
                 FileInputStream yamlInputStream = null;
-                LOGGER.info("Reading metric config file " + yamlPath);
+                log.info("Reading metric config file " + yamlPath);
                 try {
                     yamlInputStream = new FileInputStream(yamlPath);
                     ArrayList<LinkedHashMap<String, Object>> confs =
@@ -235,9 +235,9 @@ static void loadMetricConfigFiles(
                         configurationList.add(new Configuration(conf));
                     }
                 } catch (FileNotFoundException e) {
-                    LOGGER.warn("Cannot find metric config file " + yamlPath);
+                    log.warn("Cannot find metric config file " + yamlPath);
                 } catch (Exception e) {
-                    LOGGER.warn("Cannot parse yaml file " + yamlPath, e);
+                    log.warn("Cannot parse yaml file " + yamlPath, e);
                 } finally {
                     if (yamlInputStream != null) {
                         try {
@@ -258,10 +258,10 @@ static void loadMetricConfigResources(
         if (resourceConfigList != null) {
             ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
             for (String resourceName : resourceConfigList) {
-                LOGGER.info("Reading metric config resource " + resourceName);
+                log.info("Reading metric config resource " + resourceName);
                 InputStream inputStream = classLoader.getResourceAsStream(resourceName);
                 if (inputStream == null) {
-                    LOGGER.warn("Cannot find metric config resource" + resourceName);
+                    log.warn("Cannot find metric config resource" + resourceName);
                 } else {
                     try {
                         LinkedHashMap<String, ArrayList<LinkedHashMap<String, Object>>> topYaml =
@@ -274,10 +274,10 @@ static void loadMetricConfigResources(
                                 configurationList.add(new Configuration(conf));
                             }
                         } else {
-                            LOGGER.warn("jmx_metrics block not found in resource " + resourceName);
+                            log.warn("jmx_metrics block not found in resource " + resourceName);
                         }
                     } catch (Exception e) {
-                        LOGGER.warn("Cannot parse yaml resource " + resourceName, e);
+                        log.warn("Cannot parse yaml resource " + resourceName, e);
                     } finally {
                         try {
                             inputStream.close();
@@ -336,12 +336,12 @@ public Connection getConnection(
             LinkedHashMap<String, Object> connectionParams, boolean forceNewConnection)
             throws IOException {
         if (connection == null || !connection.isAlive()) {
-            LOGGER.info(
+            log.info(
                     "Connection closed or does not exist. "
                     + "Attempting to create a new connection...");
             return ConnectionFactory.createConnection(connectionParams);
         } else if (forceNewConnection) {
-            LOGGER.info("Forcing a new connection, attempting to create...");
+            log.info("Forcing a new connection, attempting to create...");
             connection.closeConnector();
             return ConnectionFactory.createConnection(connectionParams);
         }
@@ -351,15 +351,15 @@ public Connection getConnection(
     /** Initializes the instance. May force a new connection.. */
     public void init(boolean forceNewConnection)
             throws IOException, FailedLoginException, SecurityException {
-        LOGGER.info("Trying to connect to JMX Server at " + this.toString());
+        log.info("Trying to connect to JMX Server at " + this.toString());
         connection = getConnection(instanceMap, forceNewConnection);
-        LOGGER.info(
+        log.info(
                 "Trying to collect bean list for the first time for JMX Server at "
                         + this.toString());
         this.refreshBeansList();
-        LOGGER.info("Connected to JMX Server at " + this.toString());
+        log.info("Connected to JMX Server at " + this.toString());
         this.getMatchingAttributes();
-        LOGGER.info("Done initializing JMX Server at " + this.toString());
+        log.info("Done initializing JMX Server at " + this.toString());
     }
 
     /** Returns a string representation for the instance. */
@@ -382,7 +382,7 @@ public LinkedList<HashMap<String, Object>> getMetrics() throws IOException {
         if (this.refreshBeansPeriod != null
                 && (System.currentTimeMillis() - this.lastRefreshTime) / 1000
                         > this.refreshBeansPeriod) {
-            LOGGER.info("Refreshing bean list");
+            log.info("Refreshing bean list");
             this.refreshBeansList();
             this.getMatchingAttributes();
         }
@@ -408,9 +408,9 @@ public LinkedList<HashMap<String, Object>> getMetrics() throws IOException {
             } catch (IOException e) {
                 throw e;
             } catch (Exception e) {
-                LOGGER.debug("Cannot get metrics for attribute: " + jmxAttr, e);
+                log.debug("Cannot get metrics for attribute: " + jmxAttr, e);
                 if (this.failingAttributes.contains(jmxAttr)) {
-                    LOGGER.debug(
+                    log.debug(
                             "Cannot generate metrics for attribute: "
                                     + jmxAttr
                                     + " twice in a row. Removing it from the attribute list");
@@ -451,7 +451,7 @@ private void getMatchingAttributes() throws IOException {
 
         for (ObjectName beanName : beans) {
             if (limitReached) {
-                LOGGER.debug("Limit reached");
+                log.debug("Limit reached");
                 if (action.equals(AppConfig.ACTION_COLLECT)) {
                     break;
                 }
@@ -460,17 +460,17 @@ private void getMatchingAttributes() throws IOException {
 
             try {
                 // Get all the attributes for bean_name
-                LOGGER.debug("Getting attributes for bean: " + beanName);
+                log.debug("Getting attributes for bean: " + beanName);
                 attributeInfos = connection.getAttributesForBean(beanName);
             } catch (IOException e) {
                 // we should not continue
-                LOGGER.warn("Cannot get bean attributes " + e.getMessage());
+                log.warn("Cannot get bean attributes " + e.getMessage());
                 if (e.getMessage() == connection.CLOSED_CLIENT_CAUSE) {
                     throw e;
                 }
                 continue;
             } catch (Exception e) {
-                LOGGER.warn("Cannot get bean attributes " + e.getMessage());
+                log.warn("Cannot get bean attributes " + e.getMessage());
                 continue;
             }
 
@@ -479,7 +479,7 @@ private void getMatchingAttributes() throws IOException {
                 if (metricsCount >= maxReturnedMetrics) {
                     limitReached = true;
                     if (action.equals(AppConfig.ACTION_COLLECT)) {
-                        LOGGER.warn("Maximum number of metrics reached.");
+                        log.warn("Maximum number of metrics reached.");
                         break;
                     } else if (!metricReachedDisplayed
                             && !action.equals(AppConfig.ACTION_LIST_COLLECTED)
@@ -491,7 +491,7 @@ private void getMatchingAttributes() throws IOException {
                 JmxAttribute jmxAttribute;
                 String attributeType = attributeInfo.getType();
                 if (SIMPLE_TYPES.contains(attributeType)) {
-                    LOGGER.debug(
+                    log.debug(
                             ATTRIBUTE
                                     + beanName
                                     + " : "
@@ -507,7 +507,7 @@ private void getMatchingAttributes() throws IOException {
                                     cassandraAliasing,
                                     emptyDefaultHostname);
                 } else if (COMPOSED_TYPES.contains(attributeType)) {
-                    LOGGER.debug(
+                    log.debug(
                             ATTRIBUTE
                                     + beanName
                                     + " : "
@@ -522,7 +522,7 @@ private void getMatchingAttributes() throws IOException {
                                     tags,
                                     emptyDefaultHostname);
                 } else if (MULTI_TYPES.contains(attributeType)) {
-                    LOGGER.debug(
+                    log.debug(
                             ATTRIBUTE
                                     + beanName
                                     + " : "
@@ -538,7 +538,7 @@ private void getMatchingAttributes() throws IOException {
                                     emptyDefaultHostname);
                 } else {
                     try {
-                        LOGGER.debug(
+                        log.debug(
                                 ATTRIBUTE
                                         + beanName
                                         + " : "
@@ -546,7 +546,7 @@ private void getMatchingAttributes() throws IOException {
                                         + " has an unsupported type: "
                                         + attributeType);
                     } catch (NullPointerException e) {
-                        LOGGER.warn("Caught unexpected NullPointerException");
+                        log.warn("Caught unexpected NullPointerException");
                     }
                     continue;
                 }
@@ -574,7 +574,7 @@ private void getMatchingAttributes() throws IOException {
                             break;
                         }
                     } catch (Exception e) {
-                        LOGGER.error(
+                        log.error(
                                 "Error while trying to match attributeInfo configuration "
                                         + "with the Attribute: "
                                         + beanName
@@ -590,7 +590,7 @@ private void getMatchingAttributes() throws IOException {
                 }
             }
         }
-        LOGGER.info("Found " + matchingAttributes.size() + " matching attributes");
+        log.info("Found " + matchingAttributes.size() + " matching attributes");
     }
 
     /** Returns a list of strings listing the bean scopes. */
@@ -620,7 +620,7 @@ private void refreshBeansList() throws IOException {
                     this.beans.addAll(connection.queryNames(name));
                 }
             } catch (Exception e) {
-                LOGGER.error(
+                log.error(
                         "Unable to compute a common bean scope, querying all beans as a fallback",
                         e);
             }
diff --git a/src/main/java/org/datadog/jmxfetch/InstanceCleanupTask.java b/src/main/java/org/datadog/jmxfetch/InstanceCleanupTask.java
index d2970c1fe..71d3a8edd 100644
--- a/src/main/java/org/datadog/jmxfetch/InstanceCleanupTask.java
+++ b/src/main/java/org/datadog/jmxfetch/InstanceCleanupTask.java
@@ -1,5 +1,8 @@
 package org.datadog.jmxfetch;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 class InstanceCleanupTask extends InstanceTask<Void> {
 
     InstanceCleanupTask(Instance instance) {
@@ -9,7 +12,7 @@ class InstanceCleanupTask extends InstanceTask<Void> {
 
     @Override
     public Void call() throws Exception {
-        LOGGER.info("Trying to cleanup: " + instance);
+        log.info("Trying to cleanup: " + instance);
 
         instance.cleanUp();
         return null;
diff --git a/src/main/java/org/datadog/jmxfetch/InstanceTask.java b/src/main/java/org/datadog/jmxfetch/InstanceTask.java
index 2b09900e4..a712ad93f 100644
--- a/src/main/java/org/datadog/jmxfetch/InstanceTask.java
+++ b/src/main/java/org/datadog/jmxfetch/InstanceTask.java
@@ -1,11 +1,11 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.concurrent.Callable;
 
+@Slf4j
 public abstract class InstanceTask<T> implements Callable<T> {
-    protected static final Logger LOGGER = Logger.getLogger(InstanceTask.class.getName());
     protected Instance instance;
     protected String warning;
 
diff --git a/src/main/java/org/datadog/jmxfetch/JmxAttribute.java b/src/main/java/org/datadog/jmxfetch/JmxAttribute.java
index 15d41bae5..dbfa0428b 100644
--- a/src/main/java/org/datadog/jmxfetch/JmxAttribute.java
+++ b/src/main/java/org/datadog/jmxfetch/JmxAttribute.java
@@ -1,6 +1,6 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,11 +24,11 @@
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
 
+@Slf4j
 public abstract class JmxAttribute {
 
     protected static final String ALIAS = "alias";
     protected static final String METRIC_TYPE = "metric_type";
-    protected static final Logger LOGGER = Logger.getLogger(JmxAttribute.class.getName());
     private static final List<String> EXCLUDED_BEAN_PARAMS =
             Arrays.asList(
                     "domain",
@@ -120,7 +120,7 @@ private void addAdditionalTags() {
                 if ((alias.trim().length() > 0) && alias != null) {
                     this.defaultTagsList.add(tag.getKey() + ":" + alias);
                 } else {
-                    LOGGER.warn("Unable to apply tag " + tag.getKey() + " - with unknown alias");
+                    log.warn("Unable to apply tag " + tag.getKey() + " - with unknown alias");
                 }
             }
         }
@@ -253,7 +253,8 @@ public int getMetricsCount() {
         try {
             return this.getMetrics().size();
         } catch (Exception e) {
-            LOGGER.warn("Unable to get metrics from " + beanStringName + " - " + attributeName, e);
+            log.warn("Unable to get metrics from " + beanStringName + " - "
+                                                + attributeName + ": " + e.toString());
             return 0;
         }
     }
@@ -545,14 +546,18 @@ private String getUserAlias(
         // Attribute & domain
         alias = alias.replace("$attribute", fullAttributeName);
         alias = alias.replace("$domain", domain);
-        try {
-            alias = alias.replace("$value", getJmxValue().toString());
-        } catch (JMException e) {
-            // If we haven't been able to get the value, it wasn't replaced.
-            LOGGER.warn("Unable to replace $value for attribute " + fullAttributeName, e);
-        } catch (IOException e) {
-            // Same as above
-            LOGGER.warn("Unable to replace $value for attribute " + fullAttributeName, e);
+        if (alias.contains("$value")) {
+            // getJmxValue() hits the JMX target (potentially through remote network connection),
+            // so only call it if needed.
+            try {
+                alias = alias.replace("$value", getJmxValue().toString());
+            } catch (JMException e) {
+                // If we haven't been able to get the value, it wasn't replaced.
+                log.warn("Unable to replace $value for attribute " + fullAttributeName, e);
+            } catch (IOException e) {
+                // Same as above
+                log.warn("Unable to replace $value for attribute " + fullAttributeName, e);
+            }
         }
 
         return alias;
diff --git a/src/main/java/org/datadog/jmxfetch/JmxTabularAttribute.java b/src/main/java/org/datadog/jmxfetch/JmxTabularAttribute.java
index 768054c94..bd6ebea2d 100644
--- a/src/main/java/org/datadog/jmxfetch/JmxTabularAttribute.java
+++ b/src/main/java/org/datadog/jmxfetch/JmxTabularAttribute.java
@@ -1,5 +1,7 @@
 package org.datadog.jmxfetch;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,6 +24,7 @@
 import javax.management.openmbean.InvalidKeyException;
 import javax.management.openmbean.TabularData;
 
+@Slf4j
 public class JmxTabularAttribute extends JmxAttribute {
     private String instanceName;
     private HashMap<String, HashMap<String, HashMap<String, Object>>> subAttributeList;
@@ -228,7 +231,7 @@ private Object getValue(String key, String subAttribute)
                 }
             }
         } catch (InvalidKeyException e) {
-            LOGGER.warn(
+            log.warn(
                     "`"
                             + getAttribute().getName()
                             + "` attribute does not have a `"
diff --git a/src/main/java/org/datadog/jmxfetch/LocalConnection.java b/src/main/java/org/datadog/jmxfetch/LocalConnection.java
index 259fda484..841f042ce 100644
--- a/src/main/java/org/datadog/jmxfetch/LocalConnection.java
+++ b/src/main/java/org/datadog/jmxfetch/LocalConnection.java
@@ -1,12 +1,12 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 
+@Slf4j
 public class LocalConnection extends Connection {
-    private static final Logger LOGGER = Logger.getLogger(LocalConnection.class.getName());
 
     public LocalConnection() throws IOException {
         createConnection();
diff --git a/src/main/java/org/datadog/jmxfetch/MetricCollectionTask.java b/src/main/java/org/datadog/jmxfetch/MetricCollectionTask.java
index adccd0548..12dd8b75d 100644
--- a/src/main/java/org/datadog/jmxfetch/MetricCollectionTask.java
+++ b/src/main/java/org/datadog/jmxfetch/MetricCollectionTask.java
@@ -1,8 +1,11 @@
 package org.datadog.jmxfetch;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 
+@Slf4j
 class MetricCollectionTask extends InstanceTask<LinkedList<HashMap<String, Object>>> {
     MetricCollectionTask(Instance instance) {
         super(instance);
@@ -13,7 +16,7 @@ class MetricCollectionTask extends InstanceTask<LinkedList<HashMap<String, Objec
     public LinkedList<HashMap<String, Object>> call() throws Exception {
 
         if (!instance.timeToCollect()) {
-            LOGGER.debug(
+            log.debug(
                     "it is not time to collect, skipping run for instance: " + instance.getName());
 
             // Maybe raise an exception here instead...
diff --git a/src/main/java/org/datadog/jmxfetch/RemoteConnection.java b/src/main/java/org/datadog/jmxfetch/RemoteConnection.java
index 70bc5b7bd..5c3fa81f0 100644
--- a/src/main/java/org/datadog/jmxfetch/RemoteConnection.java
+++ b/src/main/java/org/datadog/jmxfetch/RemoteConnection.java
@@ -1,6 +1,6 @@
 package org.datadog.jmxfetch;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -11,6 +11,7 @@
 import javax.management.remote.rmi.RMIConnectorServer;
 import javax.rmi.ssl.SslRMIClientSocketFactory;
 
+@Slf4j
 public class RemoteConnection extends Connection {
 
     private String host;
@@ -26,7 +27,6 @@ public class RemoteConnection extends Connection {
     private static final String KEY_STORE_PASSWORD_KEY = "key_store_password";
     private static final String DEFAULT_RMI_RESPONSE_TIMEOUT =
             "15000"; // Match the collection period default
-    private static final Logger LOGGER = Logger.getLogger(Connection.class.getName());
 
     /** RemoteConnection constructor for specified remote connection parameters. */
     public RemoteConnection(LinkedHashMap<String, Object> connectionParams) throws IOException {
@@ -67,7 +67,7 @@ public RemoteConnection(LinkedHashMap<String, Object> connectionParams) throws I
                 System.setProperty("javax.net.ssl.trustStore", trustStorePath);
                 System.setProperty("javax.net.ssl.trustStorePassword", trustStorePassword);
 
-                LOGGER.info(
+                log.info(
                         "Setting trustStore path: " + trustStorePath + " and trustStorePassword");
             }
         }
@@ -82,7 +82,7 @@ public RemoteConnection(LinkedHashMap<String, Object> connectionParams) throws I
                 System.setProperty("javax.net.ssl.keyStore", keyStorePath);
                 System.setProperty("javax.net.ssl.keyStorePassword", keyStorePassword);
 
-                LOGGER.info("Setting keyStore path: " + keyStorePath + " and keyStorePassword");
+                log.info("Setting keyStore path: " + keyStorePath + " and keyStorePassword");
             }
         }
 
diff --git a/src/main/java/org/datadog/jmxfetch/Status.java b/src/main/java/org/datadog/jmxfetch/Status.java
index 657b02aa1..84e74495f 100644
--- a/src/main/java/org/datadog/jmxfetch/Status.java
+++ b/src/main/java/org/datadog/jmxfetch/Status.java
@@ -2,20 +2,20 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.LinkedList;
 
+@Slf4j
 public class Status {
 
     public static final String STATUS_WARNING = "WARNING";
     public static final String STATUS_OK = "OK";
     public static final String STATUS_ERROR = "ERROR";
-    private static final Logger LOGGER = Logger.getLogger(Status.class.getName());
     private static final String INITIALIZED_CHECKS = "initialized_checks";
     private static final String FAILED_CHECKS = "failed_checks";
     private static final String API_STATUS_PATH = "agent/jmx/status";
@@ -136,20 +136,20 @@ public void flush() {
                     HttpClient.HttpResponse response =
                             this.client.request("POST", json, API_STATUS_PATH);
                     if (!response.isResponse2xx()) {
-                        LOGGER.debug("Problem submitting JSON status: " + json);
+                        log.debug("Problem submitting JSON status: " + json);
                     }
                 } catch (Exception e) {
-                    LOGGER.warn("Could not post status: " + e.getMessage());
+                    log.warn("Could not post status: " + e.getMessage());
                 }
             } else {
                 String yaml = generateYaml();
                 try {
                     File statusFile = new File(this.statusFileLocation);
-                    LOGGER.debug(
+                    log.debug(
                             "Writing status to temp yaml file: " + statusFile.getAbsolutePath());
                     FileUtils.writeStringToFile(statusFile, yaml);
                 } catch (Exception e) {
-                    LOGGER.warn("Cannot write status to temp file: " + e.getMessage());
+                    log.warn("Cannot write status to temp file: " + e.getMessage());
                 }
             }
         }
diff --git a/src/main/java/org/datadog/jmxfetch/reporter/ConsoleReporter.java b/src/main/java/org/datadog/jmxfetch/reporter/ConsoleReporter.java
index 7814d42ef..75bdd8b96 100644
--- a/src/main/java/org/datadog/jmxfetch/reporter/ConsoleReporter.java
+++ b/src/main/java/org/datadog/jmxfetch/reporter/ConsoleReporter.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Joiner;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
 import org.datadog.jmxfetch.Instance;
 import org.datadog.jmxfetch.JmxAttribute;
@@ -10,10 +10,9 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 
+@Slf4j
 public class ConsoleReporter extends Reporter {
 
-    private static final Logger LOGGER = Logger.getLogger(ConsoleReporter.class.getName());
-
     private LinkedList<HashMap<String, Object>> metrics = new LinkedList<HashMap<String, Object>>();
     private LinkedList<HashMap<String, Object>> serviceChecks =
             new LinkedList<HashMap<String, Object>>();
@@ -22,7 +21,7 @@ public class ConsoleReporter extends Reporter {
     protected void sendMetricPoint(
             String metricType, String metricName, double value, String[] tags) {
         String tagString = "[" + Joiner.on(",").join(tags) + "]";
-        LOGGER.info(
+        log.info(
                 metricName + tagString + " - " + System.currentTimeMillis() / 1000 + " = " + value);
 
         HashMap<String, Object> metric = new HashMap<String, Object>();
@@ -50,7 +49,7 @@ public void doSendServiceCheck(String checkName, String status, String message,
         if (tags != null && tags.length > 0) {
             tagString = "[" + Joiner.on(",").join(tags) + "]";
         }
-        LOGGER.info(
+        log.info(
                 checkName + tagString + " - " + System.currentTimeMillis() / 1000 + " = " + status);
 
         HashMap<String, Object> sc = new HashMap<String, Object>();
@@ -74,24 +73,24 @@ public LinkedList<HashMap<String, Object>> getServiceChecks() {
 
     @Override
     public void displayMetricReached() {
-        LOGGER.info(
+        log.info(
                 "       ------- METRIC LIMIT REACHED: ATTRIBUTES BELOW WON'T BE COLLECTED -------");
     }
 
     @Override
     public void displayMatchingAttributeName(JmxAttribute jmxAttribute, int rank, int limit) {
-        LOGGER.info("       Matching: " + rank + "/" + limit + ". " + jmxAttribute);
+        log.info("       Matching: " + rank + "/" + limit + ". " + jmxAttribute);
     }
 
     @Override
     public void displayNonMatchingAttributeName(JmxAttribute jmxAttribute) {
-        LOGGER.info("       Not Matching: " + jmxAttribute);
+        log.info("       Not Matching: " + jmxAttribute);
     }
 
     @Override
     public void displayInstanceName(Instance instance) {
-        LOGGER.info("#####################################");
-        LOGGER.info("Instance: " + instance);
-        LOGGER.info("#####################################");
+        log.info("#####################################");
+        log.info("Instance: " + instance);
+        log.info("#####################################");
     }
 }
diff --git a/src/main/java/org/datadog/jmxfetch/reporter/Reporter.java b/src/main/java/org/datadog/jmxfetch/reporter/Reporter.java
index 315f775a2..e97bbf087 100644
--- a/src/main/java/org/datadog/jmxfetch/reporter/Reporter.java
+++ b/src/main/java/org/datadog/jmxfetch/reporter/Reporter.java
@@ -1,7 +1,7 @@
 package org.datadog.jmxfetch.reporter;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
 
 import org.datadog.jmxfetch.App;
 import org.datadog.jmxfetch.Instance;
@@ -11,9 +11,9 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 
+@Slf4j
 public abstract class Reporter {
 
-    private static final Logger LOGGER = Logger.getLogger(App.class.getName());
     public static final String VALUE = "value";
 
     private HashMap<String, Integer> serviceCheckCount;
@@ -75,12 +75,12 @@ public void sendMetrics(
                         + " metrics to the metrics reporter during collection #"
                         + loopCounter;
         if (loopCounter <= 5 || loopCounter % 10 == 0) {
-            LOGGER.info(sendingMessage);
+            log.info(sendingMessage);
             if (loopCounter == 5) {
-                LOGGER.info("Next collections will be logged only every 10 collections.");
+                log.info("Next collections will be logged only every 10 collections.");
             }
         } else {
-            LOGGER.debug(sendingMessage);
+            log.debug(sendingMessage);
         }
 
         for (HashMap<String, Object> m : metrics) {
@@ -117,7 +117,7 @@ public void sendMetrics(
                 instanceCountersAggregator.put(key, currentValue.longValue());
 
                 if (delta < 0) {
-                    LOGGER.info("Counter " + metricName + " has been reset - not submitting.");
+                    log.info("Counter " + metricName + " has been reset - not submitting.");
                     continue;
                 }
                 sendMetricPoint(metricType, metricName, delta, tags);
@@ -144,7 +144,7 @@ public void sendMetrics(
                 if (sane && submit) {
                     sendMetricPoint(metricType, metricName, rate, tags);
                 } else if (sane) {
-                    LOGGER.info(
+                    log.info(
                             "Canonical rate option set, and negative rate (counter reset)"
                                     + "not submitting.");
                 }
diff --git a/src/main/java/org/datadog/jmxfetch/reporter/StatsdReporter.java b/src/main/java/org/datadog/jmxfetch/reporter/StatsdReporter.java
index c6e01fe78..2697e1066 100644
--- a/src/main/java/org/datadog/jmxfetch/reporter/StatsdReporter.java
+++ b/src/main/java/org/datadog/jmxfetch/reporter/StatsdReporter.java
@@ -3,11 +3,14 @@
 import com.timgroup.statsd.NonBlockingStatsDClient;
 import com.timgroup.statsd.ServiceCheck;
 import com.timgroup.statsd.StatsDClient;
+import com.timgroup.statsd.StatsDClientErrorHandler;
+import lombok.extern.slf4j.Slf4j;
 import org.datadog.jmxfetch.Instance;
 import org.datadog.jmxfetch.JmxAttribute;
 import org.datadog.jmxfetch.Status;
 
 /** A reporter class to submit metrics via statsd. */
+@Slf4j
 public class StatsdReporter extends Reporter {
 
     private StatsDClient statsDClient;
@@ -15,6 +18,14 @@ public class StatsdReporter extends Reporter {
     private int statsdPort;
     private long initializationTime;
 
+    private class LoggingErrorHandler implements StatsDClientErrorHandler {
+
+        @Override
+        public void handle(Exception exception) {
+            log.error("statsd client error:", exception);
+        }
+    }
+
     /** Constructor, instantiates statsd reported to provided host and port. */
     public StatsdReporter(String statsdHost, int statsdPort) {
         this.statsdHost = statsdHost;
diff --git a/src/main/java/org/datadog/jmxfetch/tasks/TaskProcessor.java b/src/main/java/org/datadog/jmxfetch/tasks/TaskProcessor.java
index d07ae12ea..ad57573ee 100644
--- a/src/main/java/org/datadog/jmxfetch/tasks/TaskProcessor.java
+++ b/src/main/java/org/datadog/jmxfetch/tasks/TaskProcessor.java
@@ -1,8 +1,7 @@
 package org.datadog.jmxfetch.tasks;
 
-import org.apache.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
 
-import org.datadog.jmxfetch.App;
 import org.datadog.jmxfetch.Instance;
 import org.datadog.jmxfetch.InstanceTask;
 import org.datadog.jmxfetch.reporter.Reporter;
@@ -15,8 +14,8 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+@Slf4j
 public class TaskProcessor {
-    private static final Logger LOGGER = Logger.getLogger(App.class.getName());
     private Reporter reporter;
     private ExecutorService threadPoolExecutor;
 
@@ -66,7 +65,7 @@ public <T> List<TaskStatusHandler> processTasks(
                     statuses.add(processor.invoke(instance, future, reporter));
 
                 } catch (Exception e) {
-                    LOGGER.warn(
+                    log.warn(
                             "There was an error processing concurrent instance: " + instance, e);
 
                     statuses.add(new TaskStatusHandler(e));
@@ -74,7 +73,7 @@ public <T> List<TaskStatusHandler> processTasks(
             }
         } catch (Exception e) {
             // Should we do anything else here?
-            LOGGER.warn("JMXFetch internal TaskProcessor error invoking concurrent tasks: ", e);
+            log.warn("JMXFetch internal TaskProcessor error invoking concurrent tasks: ", e);
             throw e;
         }
 
diff --git a/src/main/java/org/datadog/jmxfetch/util/CustomLogger.java b/src/main/java/org/datadog/jmxfetch/util/CustomLogger.java
index ae29ae0b7..422308466 100644
--- a/src/main/java/org/datadog/jmxfetch/util/CustomLogger.java
+++ b/src/main/java/org/datadog/jmxfetch/util/CustomLogger.java
@@ -3,47 +3,110 @@
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
 
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.RollingFileAppender;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Filter.Result;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.appender.RollingFileAppender;
+import org.apache.logging.log4j.core.appender.rolling.DefaultRolloverStrategy;
+import org.apache.logging.log4j.core.appender.rolling.SizeBasedTriggeringPolicy;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.core.filter.ThresholdFilter;
+import org.apache.logging.log4j.core.layout.PatternLayout;
 
+@Slf4j
 public class CustomLogger {
-    private static final Logger LOGGER = Logger.getLogger(CustomLogger.class.getName());
     private static final Multiset<String> messageCount = HashMultiset.create();
     private static final String LOGGER_LAYOUT = "%d | %-5p| %c{1} | %m%n";
+    // log4j2 uses SYSTEM_OUT and SYSTEM_ERR - support both
+    private static final String SYSTEM_OUT_ALT = "STDOUT";
+    private static final String SYSTEM_ERR_ALT = "STDERR";
 
     /** Sets up the custom logger to the specified level and location. */
     public static void setup(Level level, String logLocation) {
+        final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+        final Configuration config = ctx.getConfiguration();
+        String target = "CONSOLE";
+
         if (logLocation != null
-                && !ConsoleAppender.SYSTEM_ERR.equals(logLocation)
-                && !ConsoleAppender.SYSTEM_OUT.equals(logLocation)) {
-            RollingFileAppender fa = new RollingFileAppender();
-            fa.setName("FileLogger");
-            fa.setFile(logLocation);
-            fa.setMaxFileSize("5MB");
-            fa.setMaxBackupIndex(1);
-            fa.setLayout(new PatternLayout(LOGGER_LAYOUT));
-            fa.setThreshold(level);
-            fa.setAppend(true);
-            fa.activateOptions();
-            Logger.getRootLogger().addAppender(fa);
-            LOGGER.info("File Handler set");
+                && !ConsoleAppender.Target.SYSTEM_ERR.toString().equals(logLocation)
+                && !SYSTEM_ERR_ALT.equals(logLocation)
+                && !ConsoleAppender.Target.SYSTEM_OUT.toString().equals(logLocation)
+                && !SYSTEM_OUT_ALT.equals(logLocation)) {
+
+            target = "FileLogger";
+
+            PatternLayout layout = PatternLayout.newBuilder()
+                .withConfiguration(config)
+                .withPattern(LOGGER_LAYOUT)
+                .build();
+
+            RollingFileAppender fa = RollingFileAppender.newBuilder()
+                .setConfiguration(config)
+                .withName(target)
+                .withLayout(layout)
+                .withFileName(logLocation)
+                .withFilePattern(logLocation + ".%d")
+                .withPolicy(SizeBasedTriggeringPolicy.createPolicy("5MB"))
+                .withStrategy(DefaultRolloverStrategy.newBuilder().withMax("1").build())
+                .build();
+
+            fa.start();
+            config.addAppender(fa);
+            ctx.getRootLogger().addAppender(config.getAppender(fa.getName()));
+
+            log.info("File Handler set");
         } else {
-            ConsoleAppender consoleAppender = new ConsoleAppender(new PatternLayout(LOGGER_LAYOUT));
-            if (logLocation != null) {
-                consoleAppender.setTarget(logLocation);
+
+            if (logLocation != null
+                    && (ConsoleAppender.Target.SYSTEM_ERR.toString().equals(logLocation)
+                        || SYSTEM_ERR_ALT.equals(logLocation))) {
+
+                ConsoleAppender console = (ConsoleAppender)config.getAppender("CONSOLE");
+                console.stop();
+                config.getRootLogger().removeAppender("CONSOLE");
+                ctx.updateLoggers();
+
+                PatternLayout layout = PatternLayout.newBuilder()
+                    .withConfiguration(config)
+                    .withPattern(LOGGER_LAYOUT)
+                    .build();
+
+                ConsoleAppender ca = ConsoleAppender.newBuilder()
+                    .setConfiguration(config)
+                    .withName(logLocation)
+                    .setTarget(ConsoleAppender.Target.SYSTEM_ERR)
+                    .withLayout(layout)
+                    .build();
+
+                ca.start();
+                config.addAppender(ca);
+                ctx.getRootLogger().addAppender(config.getAppender(ca.getName()));
             }
-            consoleAppender.setThreshold(level);
-            Logger.getRootLogger().addAppender(consoleAppender);
         }
+
+        LoggerConfig loggerConfig = config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME);
+        loggerConfig.setLevel(level);
+        ctx.updateLoggers();
     }
 
     /** Laconic logging for reduced verbosity. */
-    public static void laconic(Logger logger, Level level, String message, int max) {
+    public static void laconic(org.slf4j.Logger logger, Level level, String message, int max) {
         if (messageCount.count(message) <= max) {
-            logger.log(level, message);
+            if (level.isInRange(Level.ERROR, Level.ALL)) {
+                logger.error(message);
+            } else if (level == Level.WARN) {
+                logger.warn(message);
+            } else if (level == Level.INFO) {
+                logger.info(message);
+            } else if (level == Level.DEBUG) {
+                logger.debug(message);
+            }
+
             messageCount.add(message);
         }
     }
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index d7a95c9c2..000000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootLogger=all, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.Threshold=ERROR
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d | %-5p | %c{1} | %m%n
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
new file mode 100644
index 000000000..b056a4f08
--- /dev/null
+++ b/src/main/resources/log4j2.properties
@@ -0,0 +1,10 @@
+rootLogger.level = all
+rootLogger.appenderRef.stdout.ref = CONSOLE
+
+appender.console.type = Console
+appender.console.name = CONSOLE
+appender.console.target = SYSTEM_OUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d | %-5p | %c{1} | %m%n
+appender.console.filter.threshold.type = ThresholdFilter
+appender.console.filter.threshold.level = all
diff --git a/src/test/java/org/datadog/jmxfetch/TestCommon.java b/src/test/java/org/datadog/jmxfetch/TestCommon.java
index 7e15c9f1a..42c83dba6 100644
--- a/src/test/java/org/datadog/jmxfetch/TestCommon.java
+++ b/src/test/java/org/datadog/jmxfetch/TestCommon.java
@@ -24,7 +24,7 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
-import org.apache.log4j.Level;
+import org.apache.logging.log4j.Level;
 import org.datadog.jmxfetch.reporter.ConsoleReporter;
 import org.datadog.jmxfetch.reporter.Reporter;
 import org.datadog.jmxfetch.util.CustomLogger;
diff --git a/src/test/java/org/datadog/jmxfetch/TestInstance.java b/src/test/java/org/datadog/jmxfetch/TestInstance.java
index a06376f11..22f36f0d1 100644
--- a/src/test/java/org/datadog/jmxfetch/TestInstance.java
+++ b/src/test/java/org/datadog/jmxfetch/TestInstance.java
@@ -13,11 +13,12 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.Test;
 
 public class TestInstance extends TestCommon {
-    private static final Logger LOGGER = Logger.getLogger("Test Instance");
+    private static final Logger log = LogManager.getLogger("Test Instance");
 
     @Test
     public void testMinCollectionInterval() throws Exception {
@@ -32,7 +33,7 @@ public void testMinCollectionInterval() throws Exception {
         metrics = getMetrics();
         assertEquals(0, metrics.size());
 
-        LOGGER.info("sleeping before the next collection");
+        log.info("sleeping before the next collection");
         Thread.sleep(5000);
         run();
         metrics = getMetrics();
diff --git a/src/test/java/org/datadog/jmxfetch/TestLogInitialization.java b/src/test/java/org/datadog/jmxfetch/TestLogInitialization.java
deleted file mode 100644
index b967f88fd..000000000
--- a/src/test/java/org/datadog/jmxfetch/TestLogInitialization.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.datadog.jmxfetch;
-
-import static com.google.common.base.StandardSystemProperty.JAVA_CLASS_PATH;
-import static com.google.common.base.StandardSystemProperty.PATH_SEPARATOR;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Sets;
-import java.io.File;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.management.ObjectName;
-import javax.management.remote.JMXServiceURL;
-import org.junit.After;
-import org.junit.Test;
-
-public class TestLogInitialization {
-    public static final Callable<AppConfig> LOCAL_CONFIG =
-            new Callable<AppConfig>() {
-                public AppConfig call() throws Exception {
-                    return AppConfig.create(
-                            ImmutableList.of("org/datadog/jmxfetch/dd-java-agent-jmx.yaml"),
-                            Collections.<String>emptyList(),
-                            Collections.<String>emptyList(),
-                            (int) TimeUnit.SECONDS.toMillis(30),
-                            (int) TimeUnit.SECONDS.toMillis(30),
-                            Collections.<String, String>emptyMap(),
-                            "console",
-                            "System.err",
-                            "DEBUG");
-                }
-            };
-
-    public static final Callable<AppConfig> REMOTE_CONFIG =
-            new Callable<AppConfig>() {
-                public AppConfig call() throws Exception {
-                    return AppConfig.create(
-                            ImmutableList.of("org/datadog/jmxfetch/remote-jmx.yaml"),
-                            Collections.<String>emptyList(),
-                            Collections.<String>emptyList(),
-                            (int) TimeUnit.SECONDS.toMillis(30),
-                            (int) TimeUnit.SECONDS.toMillis(30),
-                            Collections.<String, String>emptyMap(),
-                            "console",
-                            "System.err",
-                            "DEBUG");
-                }
-            };
-
-    @After
-    public void unregisterLockingMBean() {
-        try {
-            ManagementFactory.getPlatformMBeanServer()
-                    .unregisterMBean(
-                            new ObjectName(
-                                    "org.datadog.jmxfetch.log_init_test:type=TriggeringMBean"));
-
-        } catch (Exception e) {
-            // Ignore
-        }
-    }
-
-    @Test
-    public void testLocalUsageDoesNotInitalizeLogManager() throws Exception {
-        CountDownLatch latch = registerLockingMBean();
-
-        TrackingClassLoader classLoader = new TrackingClassLoader();
-
-        final AtomicReference<Exception> errored = runInThread(classLoader, "LOCAL_CONFIG");
-
-        latch.await(15, TimeUnit.SECONDS);
-
-        assertNull(errored.get());
-        assertTrue(classLoader.classLoaded(LocalConnection.class.getName()));
-        assertFalse(classLoader.classLoaded(JMXServiceURL.class.getName()));
-    }
-
-    @Test
-    public void testRemoteUsageDoesInitalizeLogManager() throws Exception {
-        registerLockingMBean();
-
-        TrackingClassLoader classLoader = new TrackingClassLoader();
-
-        runInThread(classLoader, "REMOTE_CONFIG");
-
-        // We don't know how long until the error triggers.  No good way to verify.
-        Thread.sleep(TimeUnit.SECONDS.toMillis(1));
-
-        assertTrue(classLoader.classLoaded(RemoteConnection.class.getName()));
-        assertTrue(classLoader.classLoaded(JMXServiceURL.class.getName()));
-    }
-
-    private AtomicReference<Exception> runInThread(
-            final TrackingClassLoader classLoader, String configName) throws Exception {
-        final AtomicReference<Exception> errored = new AtomicReference<Exception>();
-
-        Class<?> appClass = classLoader.loadClass(App.class.getName());
-        Class<?> appConfigClass = classLoader.loadClass(AppConfig.class.getName());
-        assertTrue(classLoader.classLoaded(App.class.getName()));
-        assertTrue(classLoader.classLoaded(AppConfig.class.getName()));
-        final Method runMethod = appClass.getMethod("run", appConfigClass);
-
-        Class<?> thisClass = classLoader.loadClass(getClass().getName());
-        Field appConfigField = thisClass.getField(configName);
-        final Callable config = (Callable) appConfigField.get(null);
-
-        Thread task =
-                new Thread(
-                        new Runnable() {
-                            public void run() {
-                                // This will run forever, so we need to run in a different thread.
-                                try {
-                                    // App.run(appConfig);
-                                    runMethod.invoke(null, config.call());
-                                } catch (Exception e) {
-                                    errored.set(e);
-                                    e.printStackTrace();
-                                }
-                            }
-                        });
-        task.start();
-
-        return errored;
-    }
-
-    private CountDownLatch registerLockingMBean() throws Exception {
-        CountDownLatch latch = new CountDownLatch(1);
-        TriggeringMBean bean = new Triggering(latch);
-        ManagementFactory.getPlatformMBeanServer()
-                .registerMBean(
-                        bean,
-                        new ObjectName("org.datadog.jmxfetch.log_init_test:type=TriggeringMBean"));
-        return latch;
-    }
-
-    public interface TriggeringMBean {
-        boolean isTriggered();
-    }
-
-    class Triggering implements TriggeringMBean {
-        private final CountDownLatch latch;
-
-        Triggering(CountDownLatch latch) {
-            this.latch = latch;
-        }
-
-        public boolean isTriggered() {
-            System.out.println("Triggering!");
-            latch.countDown();
-            return true;
-        }
-    }
-
-    static class TrackingClassLoader extends URLClassLoader {
-        private final Set<String> loadedClasses = Sets.newConcurrentHashSet();
-
-        TrackingClassLoader() throws MalformedURLException {
-            // Don't delegate to the parent as that already has the classes loaded.
-            super(getClasspathUrls(), null);
-        }
-
-        public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-            loadedClasses.add(name);
-            if (name.startsWith("org.apache.log4j")) {
-                return getSystemClassLoader().loadClass(name);
-            }
-            return super.loadClass(name, resolve);
-        }
-
-        boolean classLoaded(String name) {
-            return loadedClasses.contains(name);
-        }
-
-        private static URL[] getClasspathUrls() throws MalformedURLException {
-
-            ImmutableList.Builder<URL> urls = ImmutableList.builder();
-            for (String entry :
-                    Splitter.on(PATH_SEPARATOR.value()).split(JAVA_CLASS_PATH.value())) {
-                try {
-                    urls.add(new File(entry).toURI().toURL());
-                } catch (
-                        SecurityException
-                                e) { // File.toURI checks to see if the file is a directory
-                    urls.add(new URL("file", null, new File(entry).getAbsolutePath()));
-                }
-            }
-            return urls.build().toArray(new URL[0]);
-        }
-    }
-}
diff --git a/src/test/java/org/datadog/jmxfetch/tasks/TestTaskProcessor.java b/src/test/java/org/datadog/jmxfetch/tasks/TestTaskProcessor.java
index 26a05275c..7bad41c4c 100644
--- a/src/test/java/org/datadog/jmxfetch/tasks/TestTaskProcessor.java
+++ b/src/test/java/org/datadog/jmxfetch/tasks/TestTaskProcessor.java
@@ -1,6 +1,5 @@
 package org.datadog.jmxfetch.tasks;
 
-import  org.mockito.Spy;
 import static org.mockito.Mockito.*;
 
 import org.datadog.jmxfetch.Instance;
@@ -8,30 +7,24 @@
 import org.datadog.jmxfetch.reporter.Reporter;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 import java.util.ArrayList;
 
-import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
-
 import org.junit.Test;
 import org.junit.BeforeClass;
 
 public class TestTaskProcessor {
     private static List<Instance> instances = null;
 
-	private final static Logger LOGGER = Logger.getLogger("Test Task Processor");
-
-    class TestSimpleTask extends InstanceTask<Boolean> {
+	class TestSimpleTask extends InstanceTask<Boolean> {
          TestSimpleTask(Instance instance) {
              super(instance);
         }