fix outdated topology during B/G switchover caused wrong connection failover (#1599)

Author: sergiyvamz

docs/using-the-jdbc-driver/using-plugins/UsingTheBlueGreenPlugin.md

@@ -65,6 +65,7 @@
 import software.amazon.jdbc.util.ServiceUtility;
 import software.amazon.jdbc.util.StringUtils;
 import software.amazon.jdbc.util.WrapperUtils;
+import software.amazon.jdbc.util.events.EventPublisher;
 import software.amazon.jdbc.util.monitoring.MonitorService;
 import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.DefaultTelemetryFactory;
@@ -110,6 +111,7 @@ public class Driver implements java.sql.Driver {
 
   private final StorageService storageService;
   private final MonitorService monitorService;
+  private final EventPublisher eventPublisher;
   private final ConnectionUrlParser urlParser = new ConnectionUrlParser();
 
   public Driver() {
@@ -119,6 +121,7 @@ public Driver() {
   public Driver(CoreServicesContainer coreServicesContainer) {
     this.storageService = coreServicesContainer.getStorageService();
     this.monitorService = coreServicesContainer.getMonitorService();
+    this.eventPublisher = coreServicesContainer.getEventPublisher();
   }
 
   public static void register() throws SQLException {
@@ -242,8 +245,9 @@ public Connection connect(final String url, final Properties info) throws SQLExc
 
       String targetDriverProtocol = urlParser.getProtocol(driverUrl);
       FullServicesContainer servicesContainer = ServiceUtility.getInstance().createStandardServiceContainer(
-          storageService,
-          monitorService,
+          this.storageService,
+          this.monitorService,
+          this.eventPublisher,
           defaultConnectionProvider,
           effectiveConnectionProvider,
           telemetryFactory,

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

@@ -30,6 +30,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -57,10 +58,11 @@
  * by the {@link PluginService} interface. The methods that are not expected to be called will log a warning or throw an
  * {@link UnsupportedOperationException} when called.
  */
+@SuppressWarnings("deprecation")
 public class PartialPluginService implements PluginService, CanReleaseResources, HostListProviderService,
     PluginManagerService {
 
-  private static final Logger LOGGER = Logger.getLogger(PluginServiceImpl.class.getName());
+  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 CacheMap<String, HostAvailability> hostAvailabilityExpiringCache = new CacheMap<>();
@@ -623,7 +625,7 @@ public void fillAliases(Connection connection, HostSpec hostSpec) throws SQLExce
       }
     } catch (final SQLException sqlException) {
       // log and ignore
-      LOGGER.finest(() -> Messages.get("PluginServiceImpl.failedToRetrieveHostPort"));
+      LOGGER.log(Level.FINEST, sqlException, () -> Messages.get("PluginServiceImpl.failedToRetrieveHostPort"));
     }
 
     // Add the instance endpoint if the current connection is associated with a topology aware database cluster.

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

@@ -33,6 +33,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -759,7 +760,7 @@ public void fillAliases(Connection connection, HostSpec hostSpec) throws SQLExce
       }
     } catch (final SQLException sqlException) {
       // log and ignore
-      LOGGER.finest(() -> Messages.get("PluginServiceImpl.failedToRetrieveHostPort"));
+      LOGGER.log(Level.FINEST, sqlException, () -> Messages.get("PluginServiceImpl.failedToRetrieveHostPort"));
     }
 
     // Add the instance endpoint if the current connection is associated with a topology aware database cluster.

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

@@ -55,6 +55,7 @@
 import software.amazon.jdbc.util.SqlState;
 import software.amazon.jdbc.util.StringUtils;
 import software.amazon.jdbc.util.WrapperUtils;
+import software.amazon.jdbc.util.events.EventPublisher;
 import software.amazon.jdbc.util.monitoring.MonitorService;
 import software.amazon.jdbc.util.storage.StorageService;
 import software.amazon.jdbc.util.telemetry.DefaultTelemetryFactory;
@@ -75,6 +76,7 @@ public class AwsWrapperDataSource implements DataSource, Referenceable, Serializ
   private final ConnectionUrlParser urlParser = new ConnectionUrlParser();
   private final StorageService storageService;
   private final MonitorService monitorService;
+  private final EventPublisher eventPublisher;
 
   static {
     try {
@@ -105,6 +107,7 @@ public AwsWrapperDataSource() {
   public AwsWrapperDataSource(CoreServicesContainer coreServicesContainer) {
     this.storageService = coreServicesContainer.getStorageService();
     this.monitorService = coreServicesContainer.getMonitorService();
+    this.eventPublisher = coreServicesContainer.getEventPublisher();
   }
 
   @Override
@@ -284,8 +287,9 @@ ConnectionWrapper createConnectionWrapper(
       final TelemetryFactory telemetryFactory) throws SQLException {
     String targetProtocol = this.urlParser.getProtocol(url);
     FullServicesContainer servicesContainer = ServiceUtility.getInstance().createStandardServiceContainer(
-        storageService,
-        monitorService,
+        this.storageService,
+        this.monitorService,
+        this.eventPublisher,
         defaultProvider,
         effectiveProvider,
         telemetryFactory,

wrapper/src/main/java/software/amazon/jdbc/ds/AwsWrapperDataSource.java

@@ -22,9 +22,10 @@
 import java.util.concurrent.TimeoutException;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import software.amazon.jdbc.HostSpec;
+import software.amazon.jdbc.util.events.EventSubscriber;
 import software.amazon.jdbc.util.monitoring.Monitor;
 
-public interface ClusterTopologyMonitor extends Monitor {
+public interface ClusterTopologyMonitor extends Monitor, EventSubscriber {
 
   boolean canDispose();