Merge pull request #16 from awslabs/rajeiyer

Update logging in driver

Author: sethusrinivasan

integrationtest/pom.xml

@@ -16,12 +16,12 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 
   <parent>
     <groupId>software.amazon.timestream</groupId>
     <artifactId>timestream</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>integrationtest</artifactId>

jdbc/pom.xml

@@ -17,7 +17,7 @@
 
     <groupId>software.amazon.timestream</groupId>
     <artifactId>amazon-timestream-jdbc</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
 
     <distributionManagement>

jdbc/src/main/java/software/amazon/timestream/jdbc/TimestreamDataSource.java

@@ -74,7 +74,7 @@ public Connection getConnection() throws SQLException {
 
   @Override
   public Connection getConnection(String accessKey, String secretKey) throws SQLException {
-    LOGGER.fine("Instantiating a TimestreamConnection from TimestreamDataSource.");
+    LOGGER.finer("Instantiating a TimestreamConnection from TimestreamDataSource.");
     return createTimestreamConnection(getProperties(accessKey, secretKey));
   }
 
@@ -94,13 +94,13 @@ public PooledConnection getPooledConnection(String accessKey, String secretKey)
     while (!poolForCredentials.isEmpty() && (timestreamPooledConnection == null)) {
       final TimestreamConnection connection = poolForCredentials.remove(0);
       if (!connection.isClosed()) {
-        LOGGER.info("Returning an open connection from the connection pool.");
+        LOGGER.finer("Returning an open connection from the connection pool.");
         timestreamPooledConnection = createTimestreamPooledConnection(connection);
       }
     }
 
     if (timestreamPooledConnection == null) {
-      LOGGER.info("Could not find a connection in the pool, creating a connection.");
+      LOGGER.finer("Could not find a connection in the pool, creating a connection.");
       timestreamPooledConnection = createTimestreamPooledConnection(
         createTimestreamConnection(getProperties(accessKey, secretKey)));
     }
@@ -680,9 +680,9 @@ public void connectionClosed(ConnectionEvent event) {
     eventSource.removeConnectionEventListener(this);
     final TimestreamConnection connection = (TimestreamConnection) eventSource.getConnection();
     if (connection.isClosed()) {
-      LOGGER.info("Connection is closed, not recycling connection back into the connection pool.");
+      LOGGER.finer("Connection is closed, not recycling connection back into the connection pool.");
     } else {
-      LOGGER.info("Connection is still open, recycling the connection back into the connection pool.");
+      LOGGER.finer("Connection is still open, recycling the connection back into the connection pool.");
       availablePools.get(connection.getConnectionProperties()).add(connection);
     }
   }

jdbc/src/main/java/software/amazon/timestream/jdbc/TimestreamDriver.java

@@ -49,13 +49,13 @@ public class TimestreamDriver implements java.sql.Driver {
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
 
-        // Enable all logs in the JUL Logger since we want to control things via SLF4J. JUL Logger will filter out
+        // Enable only >= FINE logs in the JUL Logger since we want to control things via SLF4J. JUL Logger will filter out
         // messages before it gets to SLF4J if it set to a restrictive level.
         LOGGER.setLevel(Level.FINE);
 
         APPLICATION_NAME = getApplicationName();
         APP_NAME_SUFFIX = " [" + APPLICATION_NAME + "]";
-        LOGGER.fine("Name of the application using the driver: " + APP_NAME_SUFFIX);
+        LOGGER.finer("Name of the application using the driver: " + APP_NAME_SUFFIX);
 
         // Load the driver version from the associated pom file.
         int majorVersion = 0;
@@ -107,8 +107,8 @@ public TimestreamConnection connect(String url, Properties info) throws SQLExcep
             return null;
         }
 
-        LOGGER.info("Timestream JDBC driver version: " + DRIVER_VERSION);
-        LOGGER.fine("Instantiating a TimestreamConnection from TimestreamDriver.");
+        LOGGER.fine("Timestream JDBC driver version: " + DRIVER_VERSION);
+        LOGGER.finer("Instantiating a TimestreamConnection from TimestreamDriver.");
         return createTimestreamConnection(parseUrl(url, info),
             new ClientConfiguration().withUserAgentSuffix(getUserAgentSuffix()));
     }
@@ -134,7 +134,7 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws
         if (acceptsURL(url)) {
             tempUrl = url;
         } else {
-            LOGGER.info("Unsupported input URL: \""
+            LOGGER.warning("Unsupported input URL: \""
               + url
               + "\", the default URL \""
               + Constants.URL_PREFIX
@@ -207,7 +207,7 @@ private static String getApplicationName() {
             }
         } catch (Exception err) {
             // Eat the exception and fall through.
-            LOGGER.info(
+            LOGGER.warning(
                 "An exception has occurred and ignored while retrieving the caller application name: "
                     + err.getLocalizedMessage());
         }
@@ -256,7 +256,7 @@ private Properties parseUrl(String url, Properties info) throws SQLException {
                 if (TimestreamConnectionProperty.isSupportedProperty(keyString)) {
                   allProperties.put(keyString, value);
                 } else {
-                  LOGGER.fine("Ignored unsupported property: " + keyString);
+                  LOGGER.warning("Ignored unsupported property: " + keyString);
                 }
             });
         }
@@ -271,7 +271,7 @@ private Properties parseUrl(String url, Properties info) throws SQLException {
                 if (TimestreamConnectionProperty.isSupportedProperty(trimmedKeyStr)) {
                     allProperties.put(trimmedKeyStr, keyValue[1]);
                 } else {
-                    LOGGER.fine("Ignored unsupported property: " + trimmedKeyStr);
+                    LOGGER.warning("Ignored unsupported property: " + trimmedKeyStr);
                 }
             }
         }

performancetest/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>software.amazon.timestream</groupId>
     <artifactId>timestream</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
   </parent>
 
   <artifactId>performancetest</artifactId>

pom.xml

@@ -17,7 +17,7 @@
 
   <groupId>software.amazon.timestream</groupId>
   <artifactId>timestream</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>pom</packaging>
 
   <modules>