From dce9d6db473fe7fb83b751226496c222488f7008 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Mon, 3 Aug 2020 19:04:27 -0700
Subject: [PATCH] Remove ExceptionLogger refs from instrumentation (#883)

---
 .../instrumentation/jdbc/JDBCConnectionUrlParser.java | 11 +++++++----
 .../auto/instrumentation/jdbc/JDBCUtils.java          | 10 +++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
index b5f34b86ed..eae8705262 100644
--- a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
+++ b/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/jdbc/JDBCConnectionUrlParser.java
@@ -18,7 +18,6 @@ package io.opentelemetry.auto.bootstrap.instrumentation.jdbc;
 
 import static io.opentelemetry.auto.bootstrap.instrumentation.jdbc.DBInfo.DEFAULT;
 
-import io.opentelemetry.auto.bootstrap.ExceptionLogger;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
@@ -29,6 +28,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Structured as an enum instead of a class hierarchy to allow iterating through the parsers
@@ -742,6 +743,8 @@ public enum JDBCConnectionUrlParser {
     }
   };
 
+  private static final Logger log = LoggerFactory.getLogger(JDBCConnectionUrlParser.class);
+
   private static final Map<String, JDBCConnectionUrlParser> typeParsers = new HashMap<>();
 
   static {
@@ -791,7 +794,7 @@ public enum JDBCConnectionUrlParser {
       }
       return withUrl(GENERIC_URL_LIKE.doParse(jdbcUrl, parsedProps), type);
     } catch (final Exception e) {
-      ExceptionLogger.LOGGER.debug("Error parsing URL", e);
+      log.debug("Error parsing URL", e);
       return parsedProps.build();
     }
   }
@@ -870,7 +873,7 @@ public enum JDBCConnectionUrlParser {
         try {
           builder.port(Integer.parseInt(portNumber));
         } catch (final NumberFormatException e) {
-          ExceptionLogger.LOGGER.debug("Error parsing portnumber property: " + portNumber, e);
+          log.debug("Error parsing portnumber property: " + portNumber, e);
         }
       }
 
@@ -879,7 +882,7 @@ public enum JDBCConnectionUrlParser {
         try {
           builder.port(Integer.parseInt(portNumber));
         } catch (final NumberFormatException e) {
-          ExceptionLogger.LOGGER.debug("Error parsing portNumber property: " + portNumber, e);
+          log.debug("Error parsing portNumber property: " + portNumber, e);
         }
       }
     }
diff --git a/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCUtils.java b/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCUtils.java
index f518291ff4..3920e70cca 100644
--- a/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCUtils.java
+++ b/instrumentation/jdbc/src/main/java/io/opentelemetry/auto/instrumentation/jdbc/JDBCUtils.java
@@ -16,14 +16,18 @@
 
 package io.opentelemetry.auto.instrumentation.jdbc;
 
-import io.opentelemetry.auto.bootstrap.ExceptionLogger;
 import io.opentelemetry.auto.config.Config;
 import io.opentelemetry.auto.instrumentation.jdbc.normalizer.SqlNormalizer;
 import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.Statement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class JDBCUtils {
+
+  private static final Logger log = LoggerFactory.getLogger(JDBCUtils.class);
+
   private static Field c3poField = null;
 
   /**
@@ -67,7 +71,7 @@ public abstract class JDBCUtils {
       }
     } catch (final Throwable e) {
       // Had some problem getting the connection.
-      ExceptionLogger.LOGGER.debug("Could not get connection for StatementAdvice", e);
+      log.debug("Could not get connection for StatementAdvice", e);
       return null;
     }
     return connection;
@@ -81,7 +85,7 @@ public abstract class JDBCUtils {
     try {
       return SqlNormalizer.normalize(sql);
     } catch (Exception e) {
-      ExceptionLogger.LOGGER.debug("Could not normalize sql", e);
+      log.debug("Could not normalize sql", e);
       return null;
     }
   }