Adapt efm2, limitless, and fastest response plugins to refactoring work (#1495)

Author: aaron-congo

aws-advanced-jdbc-wrapper-bundle/build.gradle.kts

@@ -25,8 +25,8 @@ repositories {
 
 dependencies {
     implementation("org.apache.httpcomponents:httpclient:4.5.14")
-    implementation("software.amazon.awssdk:rds:2.31.78")
-    implementation("software.amazon.awssdk:sts:2.31.78")
+    implementation("software.amazon.awssdk:rds:2.32.21")
+    implementation("software.amazon.awssdk:sts:2.32.21")
     implementation(project(":aws-advanced-jdbc-wrapper"))
 }
 

examples/AWSDriverExample/build.gradle.kts

@@ -18,9 +18,9 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8
     implementation("org.postgresql:postgresql:42.7.7")
     implementation("com.mysql:mysql-connector-j:9.3.0")
-    implementation("software.amazon.awssdk:rds:2.31.78")
-    implementation("software.amazon.awssdk:secretsmanager:2.31.12")
-    implementation("software.amazon.awssdk:sts:2.31.78")
+    implementation("software.amazon.awssdk:rds:2.32.21")
+    implementation("software.amazon.awssdk:secretsmanager:2.32.21")
+    implementation("software.amazon.awssdk:sts:2.32.21")
     implementation("com.fasterxml.jackson.core:jackson-databind:2.19.0")
     implementation(project(":aws-advanced-jdbc-wrapper"))
     implementation("io.opentelemetry:opentelemetry-api:1.52.0")

examples/DBCPExample/build.gradle.kts

@@ -19,5 +19,5 @@ dependencies {
     implementation("com.mysql:mysql-connector-j:9.3.0")
     implementation(project(":aws-advanced-jdbc-wrapper"))
     implementation("org.apache.commons:commons-dbcp2:2.13.0")
-    implementation("software.amazon.awssdk:rds:2.31.50")
+    implementation("software.amazon.awssdk:rds:2.32.21")
 }

examples/SpringHibernateBalancedReaderOneDataSourceExample/build.gradle.kts

@@ -23,6 +23,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.retry:spring-retry")
     implementation("org.postgresql:postgresql:42.7.7")
-    implementation("software.amazon.awssdk:rds:2.31.50")
+    implementation("software.amazon.awssdk:rds:2.32.21")
     implementation(project(":aws-advanced-jdbc-wrapper"))
 }

examples/SpringHibernateBalancedReaderTwoDataSourceExample/build.gradle.kts

@@ -23,6 +23,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.retry:spring-retry")
     implementation("org.postgresql:postgresql:42.7.7")
-    implementation("software.amazon.awssdk:rds:2.31.50")
+    implementation("software.amazon.awssdk:rds:2.32.21")
     implementation(project(":aws-advanced-jdbc-wrapper"))
 }

examples/SpringHibernateExample/build.gradle.kts

@@ -23,6 +23,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.postgresql:postgresql:42.7.7")
-    implementation("software.amazon.awssdk:rds:2.31.50")
+    implementation("software.amazon.awssdk:rds:2.32.21")
     implementation(project(":aws-advanced-jdbc-wrapper"))
 }

examples/SpringTxFailoverExample/README.md

@@ -102,7 +102,7 @@ dependencies {
 	implementation("org.springframework.retry:spring-retry:1.3.4")
 	implementation("org.springframework:spring-aspects:5.3.29")
 	implementation("org.postgresql:postgresql:42.5.4")
-	implementation("software.amazon.awssdk:rds:2.29.23")
+	implementation("software.amazon.awssdk:rds:2.32.21")
 	implementation("software.amazon.jdbc:aws-advanced-jdbc-wrapper:latest")
 }
 ```

examples/SpringWildflyExample/spring/build.gradle.kts

@@ -24,6 +24,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-web")
     runtimeOnly("org.springframework.boot:spring-boot-devtools")
     implementation("org.postgresql:postgresql:42.7.7")
-    implementation("software.amazon.awssdk:rds:2.31.50")
+    implementation("software.amazon.awssdk:rds:2.32.21")
     implementation(project(":aws-advanced-jdbc-wrapper"))
 }

wrapper/build.gradle.kts

@@ -34,13 +34,13 @@ if (useJacoco) {
 dependencies {
     implementation("org.checkerframework:checker-qual:3.49.5")
     compileOnly("org.apache.httpcomponents:httpclient:4.5.14")
-    compileOnly("software.amazon.awssdk:rds:2.32.15")
-    compileOnly("software.amazon.awssdk:auth:2.31.45") // Required for IAM (light implementation)
-    compileOnly("software.amazon.awssdk:http-client-spi:2.32.11") // Required for IAM (light implementation)
-    compileOnly("software.amazon.awssdk:sts:2.32.15")
+    compileOnly("software.amazon.awssdk:rds:2.32.21")
+    compileOnly("software.amazon.awssdk:auth:2.32.21") // Required for IAM (light implementation)
+    compileOnly("software.amazon.awssdk:http-client-spi:2.32.21") // Required for IAM (light implementation)
+    compileOnly("software.amazon.awssdk:sts:2.32.21")
     compileOnly("com.zaxxer:HikariCP:4.0.3") // Version 4.+ is compatible with Java 8
     compileOnly("com.mchange:c3p0:0.11.0")
-    compileOnly("software.amazon.awssdk:secretsmanager:2.31.12")
+    compileOnly("software.amazon.awssdk:secretsmanager:2.32.21")
     compileOnly("com.fasterxml.jackson.core:jackson-databind:2.19.0")
     compileOnly("com.mysql:mysql-connector-j:9.3.0")
     compileOnly("org.postgresql:postgresql:42.7.7")
@@ -70,12 +70,12 @@ dependencies {
     testImplementation("com.mchange:c3p0:0.11.0")
     testImplementation("org.springframework.boot:spring-boot-starter-jdbc:2.7.13") // 2.7.13 is the last version compatible with Java 8
     testImplementation("org.mockito:mockito-inline:4.11.0") // 4.11.0 is the last version compatible with Java 8
-    testImplementation("software.amazon.awssdk:rds:2.32.15")
-    testImplementation("software.amazon.awssdk:auth:2.31.45") // Required for IAM (light implementation)
-    testImplementation("software.amazon.awssdk:http-client-spi:2.32.11") // Required for IAM (light implementation)
-    testImplementation("software.amazon.awssdk:ec2:2.32.15")
-    testImplementation("software.amazon.awssdk:secretsmanager:2.31.12")
-    testImplementation("software.amazon.awssdk:sts:2.32.15")
+    testImplementation("software.amazon.awssdk:rds:2.32.21")
+    testImplementation("software.amazon.awssdk:auth:2.32.21") // Required for IAM (light implementation)
+    testImplementation("software.amazon.awssdk:http-client-spi:2.32.21") // Required for IAM (light implementation)
+    testImplementation("software.amazon.awssdk:ec2:2.32.21")
+    testImplementation("software.amazon.awssdk:secretsmanager:2.32.21")
+    testImplementation("software.amazon.awssdk:sts:2.32.21")
     // Note: all org.testcontainers dependencies should have the same version
     testImplementation("org.testcontainers:testcontainers:1.21.2")
     testImplementation("org.testcontainers:mysql:1.21.2")

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

@@ -44,13 +44,11 @@
 import software.amazon.jdbc.plugin.OpenedConnectionTracker;
 import software.amazon.jdbc.plugin.customendpoint.CustomEndpointMonitorImpl;
 import software.amazon.jdbc.plugin.efm.HostMonitorThreadContainer;
-import software.amazon.jdbc.plugin.efm2.HostMonitorServiceImpl;
 import software.amazon.jdbc.plugin.federatedauth.FederatedAuthCacheHolder;
 import software.amazon.jdbc.plugin.federatedauth.OktaAuthCacheHolder;
 import software.amazon.jdbc.plugin.iam.IamAuthCacheHolder;
 import software.amazon.jdbc.plugin.limitless.LimitlessRouterServiceImpl;
 import software.amazon.jdbc.plugin.strategy.fastestresponse.FastestResponseStrategyPlugin;
-import software.amazon.jdbc.plugin.strategy.fastestresponse.HostResponseTimeServiceImpl;
 import software.amazon.jdbc.profile.ConfigurationProfile;
 import software.amazon.jdbc.profile.DriverConfigurationProfiles;
 import software.amazon.jdbc.states.ResetSessionStateOnCloseCallable;
@@ -440,11 +438,9 @@ public static void clearCaches() {
 
   public static void releaseResources() {
     CoreServicesContainer.getInstance().getMonitorService().stopAndRemoveAll();
-    HostMonitorServiceImpl.closeAllMonitors();
     HostMonitorThreadContainer.releaseInstance();
     ConnectionProviderManager.releaseResources();
     HikariPoolsHolder.closeAllPools();
-    HostResponseTimeServiceImpl.closeAllMonitors();
     clearCaches();
   }