refactor: use monitoring RdsHostListProvider by default

wrapper/src/main/java/software/amazon/jdbc/Driver.java

@@ -37,8 +37,6 @@
 import software.amazon.jdbc.dialect.Dialect;
 import software.amazon.jdbc.dialect.DialectManager;
 import software.amazon.jdbc.exceptions.ExceptionHandler;
-import software.amazon.jdbc.hostlistprovider.RdsHostListProvider;
-import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsHostListProvider;
 import software.amazon.jdbc.plugin.AwsSecretsManagerCacheHolder;
 import software.amazon.jdbc.plugin.DataCacheConnectionPlugin;
 import software.amazon.jdbc.plugin.OpenedConnectionTracker;

wrapper/src/main/java/software/amazon/jdbc/PartialPluginService.java

@@ -67,6 +67,7 @@ public class PartialPluginService implements PluginService, CanReleaseResources,
 
   private static final Logger LOGGER = Logger.getLogger(PartialPluginService.class.getName());
   protected static final long DEFAULT_HOST_AVAILABILITY_CACHE_EXPIRE_NANO = TimeUnit.MINUTES.toNanos(5);
+  protected static final int DEFAULT_TOPOLOGY_QUERY_TIMEOUT_MS = 5000;
 
   protected static final CacheMap<String, HostAvailability> hostAvailabilityExpiringCache = new CacheMap<>();
   protected final FullServicesContainer servicesContainer;
@@ -92,7 +93,7 @@ public PartialPluginService(
       @NonNull final String originalUrl,
       @NonNull final String targetDriverProtocol,
       @NonNull final TargetDriverDialect targetDriverDialect,
-      @NonNull final Dialect dbDialect) {
+      @NonNull final Dialect dbDialect) throws SQLException {
     this(
         servicesContainer,
         new ExceptionManager(),
@@ -112,7 +113,7 @@ public PartialPluginService(
       @NonNull final String targetDriverProtocol,
       @NonNull final TargetDriverDialect targetDriverDialect,
       @NonNull final Dialect dbDialect,
-      @Nullable final ConfigurationProfile configurationProfile) {
+      @Nullable final ConfigurationProfile configurationProfile) throws SQLException {
     this.servicesContainer = servicesContainer;
     this.servicesContainer.setHostListProviderService(this);
     this.servicesContainer.setPluginService(this);
@@ -361,6 +362,12 @@ public boolean isInTransaction() {
         Messages.get("PartialPluginService.unexpectedMethodCall", new Object[] {"isInTransaction"}));
   }
 
+  @Override
+  public boolean isDialectConfirmed() {
+    throw new UnsupportedOperationException(
+        Messages.get("PartialPluginService.unexpectedMethodCall", new Object[] {"isDialectConfirmed"}));
+  }
+
   @Override
   public void setInTransaction(final boolean inTransaction) {
     this.isInTransaction = inTransaction;
@@ -380,47 +387,18 @@ public void refreshHostList() throws SQLException {
     }
   }
 
-  @Override
-  public void refreshHostList(final Connection connection) throws SQLException {
-    final List<HostSpec> updatedHostList = this.getHostListProvider().refresh(connection);
-    if (!Objects.equals(updatedHostList, this.allHosts)) {
-      updateHostAvailability(updatedHostList);
-      setNodeList(this.allHosts, updatedHostList);
-    }
-  }
-
   @Override
   public void forceRefreshHostList() throws SQLException {
-    final List<HostSpec> updatedHostList = this.getHostListProvider().forceRefresh();
-    if (updatedHostList != null) {
-      updateHostAvailability(updatedHostList);
-      setNodeList(this.allHosts, updatedHostList);
-    }
-  }
-
-  @Override
-  public void forceRefreshHostList(final Connection connection) throws SQLException {
-    final List<HostSpec> updatedHostList = this.getHostListProvider().forceRefresh(connection);
-    if (updatedHostList != null) {
-      updateHostAvailability(updatedHostList);
-      setNodeList(this.allHosts, updatedHostList);
-    }
+    this.forceRefreshHostList(false, DEFAULT_TOPOLOGY_QUERY_TIMEOUT_MS);
   }
 
   @Override
   public boolean forceRefreshHostList(final boolean shouldVerifyWriter, final long timeoutMs)
       throws SQLException {
 
     final HostListProvider hostListProvider = this.getHostListProvider();
-    if (!(hostListProvider instanceof BlockingHostListProvider)) {
-      throw new UnsupportedOperationException(
-          Messages.get("PluginServiceImpl.requiredBlockingHostListProvider",
-              new Object[] {hostListProvider.getClass().getName()}));
-    }
-
     try {
-      final List<HostSpec> updatedHostList =
-          ((BlockingHostListProvider) hostListProvider).forceRefresh(shouldVerifyWriter, timeoutMs);
+      final List<HostSpec> updatedHostList = hostListProvider.forceRefresh(shouldVerifyWriter, timeoutMs);
       if (updatedHostList != null) {
         updateHostAvailability(updatedHostList);
         setNodeList(this.allHosts, updatedHostList);

wrapper/src/main/java/software/amazon/jdbc/PluginService.java

@@ -156,16 +156,14 @@ HostSpec getHostSpecByStrategy(List<HostSpec> hosts, HostRole role, String strat
 
   boolean isInTransaction();
 
+  boolean isDialectConfirmed();
+
   HostListProvider getHostListProvider();
 
   void refreshHostList() throws SQLException;
 
-  void refreshHostList(Connection connection) throws SQLException;
-
   void forceRefreshHostList() throws SQLException;
 
-  void forceRefreshHostList(Connection connection) throws SQLException;
-
   /**
    * Initiates a topology update.
    *

wrapper/src/main/java/software/amazon/jdbc/PluginServiceImpl.java

@@ -66,13 +66,11 @@ public class PluginServiceImpl implements PluginService, CanReleaseResources,
 
   private static final Logger LOGGER = Logger.getLogger(PluginServiceImpl.class.getName());
   protected static final long DEFAULT_HOST_AVAILABILITY_CACHE_EXPIRE_NANO = TimeUnit.MINUTES.toNanos(5);
+  protected static final int DEFAULT_TOPOLOGY_QUERY_TIMEOUT_MS = 5000;
 
   protected static final CacheMap<String, HostAvailability> hostAvailabilityExpiringCache = new CacheMap<>();
   protected final FullServicesContainer servicesContainer;
 
-  protected static final CacheMap<String, Object> statusesExpiringCache = new CacheMap<>();
-  protected static final long DEFAULT_STATUS_CACHE_EXPIRE_NANO = TimeUnit.MINUTES.toNanos(60);
-
   protected final ConnectionPluginManager pluginManager;
   private final Properties props;
   private final String originalUrl;
@@ -83,6 +81,7 @@ public class PluginServiceImpl implements PluginService, CanReleaseResources,
   protected HostSpec currentHostSpec;
   protected HostSpec initialConnectionHostSpec;
   private boolean isInTransaction;
+  private boolean isDialectConfirmed;
   private final ExceptionManager exceptionManager;
   protected final @Nullable ExceptionHandler exceptionHandler;
   protected final DialectProvider dialectProvider;
@@ -482,6 +481,11 @@ public void setInTransaction(final boolean inTransaction) {
     this.isInTransaction = inTransaction;
   }
 
+  @Override
+  public boolean isDialectConfirmed() {
+    return this.isDialectConfirmed;
+  }
+
   @Override
   public HostListProvider getHostListProvider() {
     return this.hostListProvider;
@@ -496,55 +500,26 @@ public void refreshHostList() throws SQLException {
     }
   }
 
-  @Override
-  public void refreshHostList(final Connection connection) throws SQLException {
-    final List<HostSpec> updatedHostList = this.getHostListProvider().refresh(connection);
-    if (!Objects.equals(updatedHostList, this.allHosts)) {
-      updateHostAvailability(updatedHostList);
-      setNodeList(this.allHosts, updatedHostList);
-    }
-  }
-
   @Override
   public void forceRefreshHostList() throws SQLException {
-    final List<HostSpec> updatedHostList = this.getHostListProvider().forceRefresh();
-    if (updatedHostList != null) {
-      updateHostAvailability(updatedHostList);
-      setNodeList(this.allHosts, updatedHostList);
-    }
-  }
-
-  @Override
-  public void forceRefreshHostList(final Connection connection) throws SQLException {
-    final List<HostSpec> updatedHostList = this.getHostListProvider().forceRefresh(connection);
-    if (updatedHostList != null) {
-      updateHostAvailability(updatedHostList);
-      setNodeList(this.allHosts, updatedHostList);
-    }
+    this.forceRefreshHostList(false, DEFAULT_TOPOLOGY_QUERY_TIMEOUT_MS);
   }
 
   @Override
   public boolean forceRefreshHostList(final boolean shouldVerifyWriter, final long timeoutMs)
       throws SQLException {
 
     final HostListProvider hostListProvider = this.getHostListProvider();
-    if (!(hostListProvider instanceof BlockingHostListProvider)) {
-      throw new UnsupportedOperationException(
-          Messages.get("PluginServiceImpl.requiredBlockingHostListProvider",
-              new Object[]{hostListProvider.getClass().getName()}));
-    }
-
     try {
-      final List<HostSpec> updatedHostList =
-          ((BlockingHostListProvider) hostListProvider).forceRefresh(shouldVerifyWriter, timeoutMs);
+      final List<HostSpec> updatedHostList = hostListProvider.forceRefresh(shouldVerifyWriter, timeoutMs);
       if (updatedHostList != null) {
         updateHostAvailability(updatedHostList);
         setNodeList(this.allHosts, updatedHostList);
         return true;
       }
     } catch (TimeoutException ex) {
       // do nothing.
-      LOGGER.finest(Messages.get("PluginServiceImpl.forceRefreshTimeout", new Object[]{timeoutMs}));
+      LOGGER.finest(Messages.get("PluginServiceImpl.forceRefreshTimeout", new Object[] {timeoutMs}));
     }
     return false;
   }
@@ -723,13 +698,18 @@ public void updateDialect(final @NonNull Connection connection) throws SQLExcept
         this.originalUrl,
         this.initialConnectionHostSpec,
         connection);
+    this.isDialectConfirmed = true;
     if (originalDialect == this.dialect) {
       return;
     }
 
+    updateHostListProvider();
+  }
+
+  protected void updateHostListProvider() throws SQLException {
     final HostListProviderSupplier supplier = this.dialect.getHostListProviderSupplier();
     this.setHostListProvider(supplier.getProvider(this.props, this.originalUrl, this.servicesContainer));
-    this.refreshHostList(connection);
+    this.refreshHostList();
   }
 
   @Override

wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraMysqlDialect.java

@@ -19,12 +19,9 @@
 import java.sql.Connection;
 import java.util.Collections;
 import java.util.List;
-import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.hostlistprovider.AuroraTopologyUtils;
 import software.amazon.jdbc.hostlistprovider.RdsHostListProvider;
 import software.amazon.jdbc.hostlistprovider.TopologyUtils;
-import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsHostListProvider;
-import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;
 
 public class AuroraMysqlDialect extends MysqlDialect implements TopologyDialect, BlueGreenDialect {
 
@@ -60,11 +57,8 @@ public boolean isDialect(final Connection connection) {
   @Override
   public HostListProviderSupplier getHostListProviderSupplier() {
     return (properties, initialUrl, servicesContainer) -> {
-      final PluginService pluginService = servicesContainer.getPluginService();
-      final TopologyUtils topologyUtils = new AuroraTopologyUtils(this, pluginService.getHostSpecBuilder());
-      if (pluginService.isPluginInUse(FailoverConnectionPlugin.class)) {
-        return new MonitoringRdsHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
-      }
+      final TopologyUtils topologyUtils =
+          new AuroraTopologyUtils(this, servicesContainer.getPluginService().getHostSpecBuilder());
       return new RdsHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
     };
   }

wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java

@@ -23,12 +23,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Logger;
-import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.hostlistprovider.AuroraTopologyUtils;
 import software.amazon.jdbc.hostlistprovider.RdsHostListProvider;
 import software.amazon.jdbc.hostlistprovider.TopologyUtils;
-import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringRdsHostListProvider;
-import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;
 import software.amazon.jdbc.util.DriverInfo;
 import software.amazon.jdbc.util.Messages;
 
@@ -107,11 +104,8 @@ public List<String> getDialectUpdateCandidates() {
   @Override
   public HostListProviderSupplier getHostListProviderSupplier() {
     return (properties, initialUrl, servicesContainer) -> {
-      final PluginService pluginService = servicesContainer.getPluginService();
-      final TopologyUtils topologyUtils = new AuroraTopologyUtils(this, pluginService.getHostSpecBuilder());
-      if (pluginService.isPluginInUse(FailoverConnectionPlugin.class)) {
-        return new MonitoringRdsHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
-      }
+      final TopologyUtils topologyUtils =
+          new AuroraTopologyUtils(this, servicesContainer.getPluginService().getHostSpecBuilder());
       return new RdsHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
     };
   }

wrapper/src/main/java/software/amazon/jdbc/dialect/GlobalAuroraMysqlDialect.java

@@ -22,11 +22,8 @@
 import java.sql.Statement;
 import java.util.Collections;
 import java.util.List;
-import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.hostlistprovider.GlobalAuroraHostListProvider;
 import software.amazon.jdbc.hostlistprovider.GlobalAuroraTopologyUtils;
-import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringGlobalAuroraHostListProvider;
-import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;
 
 public class GlobalAuroraMysqlDialect extends AuroraMysqlDialect implements GlobalAuroraTopologyDialect {
 
@@ -75,12 +72,8 @@ public boolean isDialect(final Connection connection) {
   @Override
   public HostListProviderSupplier getHostListProviderSupplier() {
     return (properties, initialUrl, servicesContainer) -> {
-      final PluginService pluginService = servicesContainer.getPluginService();
       final GlobalAuroraTopologyUtils topologyUtils =
-          new GlobalAuroraTopologyUtils(this, pluginService.getHostSpecBuilder());
-      if (pluginService.isPluginInUse(FailoverConnectionPlugin.class)) {
-        return new MonitoringGlobalAuroraHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
-      }
+          new GlobalAuroraTopologyUtils(this, servicesContainer.getPluginService().getHostSpecBuilder());
       return new GlobalAuroraHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
     };
   }

wrapper/src/main/java/software/amazon/jdbc/dialect/GlobalAuroraPgDialect.java

@@ -23,11 +23,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
-import software.amazon.jdbc.PluginService;
 import software.amazon.jdbc.hostlistprovider.GlobalAuroraHostListProvider;
 import software.amazon.jdbc.hostlistprovider.GlobalAuroraTopologyUtils;
-import software.amazon.jdbc.hostlistprovider.monitoring.MonitoringGlobalAuroraHostListProvider;
-import software.amazon.jdbc.plugin.failover2.FailoverConnectionPlugin;
 import software.amazon.jdbc.util.Messages;
 
 public class GlobalAuroraPgDialect extends AuroraPgDialect implements GlobalAuroraTopologyDialect {
@@ -90,12 +87,8 @@ public boolean isDialect(final Connection connection) {
   @Override
   public HostListProviderSupplier getHostListProviderSupplier() {
     return (properties, initialUrl, servicesContainer) -> {
-      final PluginService pluginService = servicesContainer.getPluginService();
       final GlobalAuroraTopologyUtils topologyUtils =
-          new GlobalAuroraTopologyUtils(this, pluginService.getHostSpecBuilder());
-      if (pluginService.isPluginInUse(FailoverConnectionPlugin.class)) {
-        return new MonitoringGlobalAuroraHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
-      }
+          new GlobalAuroraTopologyUtils(this, servicesContainer.getPluginService().getHostSpecBuilder());
       return new GlobalAuroraHostListProvider(topologyUtils, properties, initialUrl, servicesContainer);
     };
   }

wrapper/src/main/java/software/amazon/jdbc/dialect/HostListProviderSupplier.java

@@ -16,6 +16,7 @@
 
 package software.amazon.jdbc.dialect;
 
+import java.sql.SQLException;
 import java.util.Properties;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import software.amazon.jdbc.hostlistprovider.HostListProvider;
@@ -26,5 +27,5 @@ public interface HostListProviderSupplier {
   @NonNull HostListProvider getProvider(
       final @NonNull Properties properties,
       final String initialUrl,
-      final @NonNull FullServicesContainer servicesContainer);
+      final @NonNull FullServicesContainer servicesContainer) throws SQLException;
 }