Switch a couple of classes from slf4j to logback-steno logging. (#89)

* Switch a couple of classes from slf4j to logback-steno logging.

* Switch statistic logging calls to enhanced logging pattern.

Author: vjkoskela

pom.xml

@@ -81,31 +81,24 @@
     <client.protocol.version>0.10.0</client.protocol.version>
     <commons.codec.version>1.10</commons.codec.version>
     <commons.io.version>2.4</commons.io.version>
-    <commons.math3.version>3.3</commons.math3.version>
     <fastutil.version>8.1.1</fastutil.version>
     <findbugs.annotations.version>3.0.1</findbugs.annotations.version>
     <guava.version>23.4-jre</guava.version>
     <guice.version>4.1.0</guice.version>
-    <hamcrest.version>2.0.0.0</hamcrest.version>
     <jackson.version>2.9.2</jackson.version>
     <javassist.version>3.22.0-GA</javassist.version>
     <javassist.maven.core.version>0.2.1</javassist.maven.core.version>
     <joda.time.version>2.9.9</joda.time.version>
     <jsr305.version>3.0.2</jsr305.version>
-    <junit.benchmarks.version>0.7.2</junit.benchmarks.version>
-    <junit.version>4.12</junit.version>
     <logback.version>1.2.3</logback.version>
     <logback.steno.version>1.18.0</logback.steno.version>
     <log4j.over.slf4j.version>1.7.12</log4j.over.slf4j.version>
     <metrics.aggregator.protocol.version>1.0.3</metrics.aggregator.protocol.version>
     <metrics.client.version>0.10.0</metrics.client.version>
     <metrics.client.http.version>0.9.1</metrics.client.http.version>
     <metrics.client.incubator.version>0.6.0</metrics.client.incubator.version>
-    <metrics.generator.version>1.2.0</metrics.generator.version>
     <metrics.jvm.extra.version>0.9.0</metrics.jvm.extra.version>
-    <mockito.version>2.12.0</mockito.version>
     <oval.version>1.90</oval.version>
-    <performance.test.version>1.1.0</performance.test.version>
     <protobuf.version>3.4.0</protobuf.version>
     <reflections.version>0.9.11</reflections.version>
     <scala.version>2.11</scala.version>
@@ -114,6 +107,15 @@
     <statsd.client.timgroup>3.0.1</statsd.client.timgroup>
     <typesafe.config.version>1.3.1</typesafe.config.version>
     <vertx.core.version>2.1.6</vertx.core.version>
+
+    <!--Test dependency versions-->
+    <commons.math3.version>3.3</commons.math3.version>
+    <hamcrest.version>2.0.0.0</hamcrest.version>
+    <junit.benchmarks.version>0.7.2</junit.benchmarks.version>
+    <junit.version>4.12</junit.version>
+    <metrics.generator.version>1.2.0</metrics.generator.version>
+    <mockito.version>2.12.0</mockito.version>
+    <performance.test.version>1.1.0</performance.test.version>
     <wiremock.version>1.57</wiremock.version>
 
     <!-- Additional Plugins -->

src/main/java/com/arpnetworking/configuration/jackson/JsonNodeDirectorySource.java

@@ -17,13 +17,13 @@
 
 import com.arpnetworking.logback.annotations.LogValue;
 import com.arpnetworking.steno.LogValueMapFactory;
+import com.arpnetworking.steno.Logger;
+import com.arpnetworking.steno.LoggerFactory;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import net.sf.oval.constraint.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collection;
@@ -91,7 +91,10 @@ private JsonNodeDirectorySource(final Builder builder) {
         if (_directory.exists() && _directory.isDirectory() && _directory.canRead()) {
             for (final File file : MoreObjects.firstNonNull(_directory.listFiles(), EMPTY_FILE_ARRAY)) {
                 if (isFileMonitored(file)) {
-                    LOGGER.debug(String.format("Loading configuration file; file=%s", file));
+                    LOGGER.debug()
+                            .setMessage("Loading configuration file")
+                            .addData("file", file)
+                            .log();
                     jsonNodeMergingSourceBuilder.addSource(new JsonNodeFileSource.Builder()
                             .setFile(file)
                             .build());

src/main/java/com/arpnetworking/tsdcore/statistics/StatisticFactory.java

@@ -15,14 +15,14 @@
  */
 package com.arpnetworking.tsdcore.statistics;
 
+import com.arpnetworking.steno.Logger;
+import com.arpnetworking.steno.LoggerFactory;
 import com.arpnetworking.utility.InterfaceDatabase;
 import com.arpnetworking.utility.ReflectionsDatabase;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -88,11 +88,12 @@ private static void checkedPut(final Map<String, Statistic> map, final Statistic
         final Statistic existingStatistic =  map.get(key);
         if (existingStatistic != null) {
             if (!existingStatistic.equals(statistic)) {
-                LOGGER.error(String.format(
-                        "Statistic already registered; key=%s, existing=%s, new=%s",
-                        key,
-                        existingStatistic,
-                        statistic));
+                LOGGER.error()
+                    .setMessage("Statistic already registered")
+                    .addData("key", key)
+                    .addData("existing", existingStatistic)
+                    .addData("new", statistic)
+                    .log();
             }
             return;
         }
@@ -124,7 +125,11 @@ private static void checkedPut(final Map<String, Statistic> map, final Statistic
                     }
                 } catch (final InvocationTargetException | NoSuchMethodException
                         | InstantiationException | IllegalAccessException e) {
-                    LOGGER.warn(String.format("Unable to load statistic; class=%s", statisticClass), e);
+                    LOGGER.warn()
+                        .setMessage("Unable to load statistic")
+                        .addData("class", statisticClass)
+                        .setThrowable(e)
+                        .log();
                 }
             }
         }