debug

aws · Nov 17, 2023 · 1b89a9d · 1b89a9d
1 parent 81fc5b4
commit 1b89a9d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginManager.java b/wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginManager.java
@@ -58,6 +58,7 @@
  * <p>THIS CLASS IS NOT MULTI-THREADING SAFE IT'S EXPECTED TO HAVE ONE INSTANCE OF THIS MANAGER PER
  * JDBC CONNECTION
  */
+@SuppressWarnings("deprecation")
 public class ConnectionPluginManager implements CanReleaseResources, Wrapper {
 
   protected static final Map<Class<? extends ConnectionPlugin>, String> pluginNameByClass =

diff --git a/wrapper/src/main/java/software/amazon/jdbc/Driver.java b/wrapper/src/main/java/software/amazon/jdbc/Driver.java
@@ -103,11 +103,17 @@ public Connection connect(final String url, final Properties info) throws SQLExc
 
     LOGGER.finest("Opening connection to " + url);
 
-    final String databaseName = ConnectionUrlParser.parseDatabaseFromUrl(url);
     ConnectionUrlParser.parsePropertiesFromUrl(url, info);
     final Properties props = PropertyUtils.copyProperties(info);
 
-    final String profileName = PropertyDefinition.PROFILE_NAME.getString(info);
+    final String databaseName = ConnectionUrlParser.parseDatabaseFromUrl(url);
+    if (!StringUtils.isNullOrEmpty(databaseName)) {
+      PropertyDefinition.DATABASE.set(props, databaseName);
+    }
+
+    LOGGER.finest(() -> PropertyUtils.logProperties(props, "DEBUG: Connecting with properties: \n"));
+
+    final String profileName = PropertyDefinition.PROFILE_NAME.getString(props);
     ConfigurationProfile configurationProfile = null;
     if (!StringUtils.isNullOrEmpty(profileName)) {
       configurationProfile = DriverConfigurationProfiles.getProfileConfiguration(profileName);
@@ -120,11 +126,8 @@ public Connection connect(final String url, final Properties info) throws SQLExc
                 new Object[] {profileName}));
       }
     }
-    if (!StringUtils.isNullOrEmpty(databaseName)) {
-      PropertyDefinition.DATABASE.set(info, databaseName);
-    }
 
-    TelemetryFactory telemetryFactory = new DefaultTelemetryFactory(info);
+    TelemetryFactory telemetryFactory = new DefaultTelemetryFactory(props);
     TelemetryContext context = telemetryFactory.openTelemetryContext(
         "software.amazon.jdbc.Driver.connect", TelemetryTraceLevel.TOP_LEVEL);
 
@@ -152,7 +155,7 @@ public Connection connect(final String url, final Properties info) throws SQLExc
         return null;
       }
 
-      final String logLevelStr = PropertyDefinition.LOGGER_LEVEL.getString(info);
+      final String logLevelStr = PropertyDefinition.LOGGER_LEVEL.getString(props);
       if (!StringUtils.isNullOrEmpty(logLevelStr)) {
         final Level logLevel = Level.parse(logLevelStr.toUpperCase());
         final Logger rootLogger = Logger.getLogger("");
@@ -191,6 +194,7 @@ public Connection connect(final String url, final Properties info) throws SQLExc
           targetDriverDialect,
           configurationProfile,
           telemetryFactory);
+
     } catch (Exception ex) {
       context.setException(ex);
       context.setSuccess(false);

diff --git a/wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java b/wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java
@@ -113,6 +113,9 @@ public Connection connect(
       final @NonNull Properties props)
       throws SQLException {
 
+    LOGGER.finest(() -> "DEBUG: Connecting with properties:\n"
+        + PropertyUtils.logProperties(props, ""));
+
     final Properties copy = PropertyUtils.copyProperties(props);
     dialect.prepareConnectProperties(copy, protocol, hostSpec);
     final ConnectInfo connectInfo = targetDriverDialect.prepareConnectInfo(protocol, hostSpec, copy);