Merge branch 'release' into chore/15380/usage_info

Author: salevine

app/client/cypress/support/commands.js

@@ -770,6 +770,17 @@ Cypress.Commands.add("startServerAndRoutes", () => {
     });
   });
 
+  // Stub the BetterBugs recording-link scripts that index.html injects on every
+  // page load. They play no role in tests, and when the fetch from the external
+  // CDN flakes the browser evaluates the error response as JS and throws a
+  // "SyntaxError: Unexpected token" that fails unrelated specs across shards.
+  // Serve an empty body so the fetch never leaves the CI network.
+  cy.intercept("GET", "https://pkg.betterbugs.io/**", {
+    statusCode: 200,
+    body: "",
+    headers: { "content-type": "application/javascript" },
+  });
+
   cy.intercept("PUT", "/api/v1/admin/env", (req) => {
     // GHSA-j9gf-vw2f-9hrw: server-side strict-mode now requires Origin to match
     // APPSMITH_BASE_URL. Use the live Cypress baseUrl instead of the legacy

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/configurations/connectionpool/ConnectionPoolConfigCE.java

@@ -4,4 +4,6 @@
 
 public interface ConnectionPoolConfigCE {
     Mono<Integer> getMaxConnectionPoolSize();
+
+    Mono<Integer> getSocketTimeoutSeconds();
 }

app/server/appsmith-plugins/mssqlPlugin/src/main/java/com/external/plugins/MssqlPlugin.java

@@ -372,14 +372,14 @@ private Set<String> populateHintMessages(List<String> columnNames) {
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
             log.debug(Thread.currentThread().getName() + ": datasourceCreate() called for MSSQL plugin.");
-            return Mono.defer(
-                    () -> connectionPoolConfig.getMaxConnectionPoolSize().flatMap(maxPoolSize -> {
-                        return Mono.fromCallable(() -> {
-                                    log.debug(Thread.currentThread().getName() + ": Connecting to SQL Server db");
-                                    return createConnectionPool(datasourceConfiguration, maxPoolSize);
-                                })
-                                .subscribeOn(scheduler);
-                    }));
+            return Mono.defer(() -> Mono.zip(
+                            connectionPoolConfig.getMaxConnectionPoolSize(),
+                            connectionPoolConfig.getSocketTimeoutSeconds())
+                    .flatMap(tuple -> Mono.fromCallable(() -> {
+                                log.debug(Thread.currentThread().getName() + ": Connecting to SQL Server db");
+                                return createConnectionPool(datasourceConfiguration, tuple.getT1(), tuple.getT2());
+                            })
+                            .subscribeOn(scheduler)));
         }
 
         @Override
@@ -581,7 +581,8 @@ public static long getPort(Endpoint endpoint) {
      * @return connection pool
      */
     private static HikariDataSource createConnectionPool(
-            DatasourceConfiguration datasourceConfiguration, Integer maxPoolSize) throws AppsmithPluginException {
+            DatasourceConfiguration datasourceConfiguration, Integer maxPoolSize, Integer socketTimeoutSeconds)
+            throws AppsmithPluginException {
 
         DBAuth authentication = null;
         StringBuilder urlBuilder = null;
@@ -600,6 +601,14 @@ private static HikariDataSource createConnectionPool(
         // should get tracked (may be falsely for long running queries) as leaked connection
         hikariConfig.setLeakDetectionThreshold(LEAK_DETECTION_TIME_MS);
 
+        // Send a TCP keepalive probe on idle connections every 150s. Prevents half-open
+        // sockets caused by NAT idle-eviction (AWS NAT Gateway default is 350s).
+        hikariConfig.setKeepaliveTime(150_000);
+
+        // Bound any single socket read so a half-open connection cannot wedge the pool's
+        // single-threaded connection-adder. mssql-jdbc takes socketTimeout in milliseconds.
+        hikariConfig.addDataSourceProperty("socketTimeout", String.valueOf(socketTimeoutSeconds * 1000));
+
         authentication = (DBAuth) datasourceConfiguration.getAuthentication();
         if (authentication.getUsername() != null) {
             hikariConfig.setUsername(authentication.getUsername());

app/server/appsmith-plugins/mssqlPlugin/src/test/java/com/external/plugins/MssqlTestDBContainerManager.java

@@ -26,6 +26,11 @@ private static class MockConnectionPoolConfig implements ConnectionPoolConfig {
         public Mono<Integer> getMaxConnectionPoolSize() {
             return Mono.just(5);
         }
+
+        @Override
+        public Mono<Integer> getSocketTimeoutSeconds() {
+            return Mono.just(600);
+        }
     }
 
     static MssqlPlugin.MssqlPluginExecutor mssqlPluginExecutor =

app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySQLDatasourceValidationTest.java

@@ -32,6 +32,11 @@ private static class MockConnectionPoolConfig implements ConnectionPoolConfig {
         public Mono<Integer> getMaxConnectionPoolSize() {
             return Mono.just(5);
         }
+
+        @Override
+        public Mono<Integer> getSocketTimeoutSeconds() {
+            return Mono.just(600);
+        }
     }
 
     static MySqlPlugin.MySqlPluginExecutor pluginExecutor =

app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlPluginTest.java

@@ -83,6 +83,11 @@ private static class MockConnectionPoolConfig implements ConnectionPoolConfig {
         public Mono<Integer> getMaxConnectionPoolSize() {
             return Mono.just(5);
         }
+
+        @Override
+        public Mono<Integer> getSocketTimeoutSeconds() {
+            return Mono.just(600);
+        }
     }
 
     static MySqlPlugin.MySqlPluginExecutor pluginExecutor =

app/server/appsmith-plugins/mysqlPlugin/src/test/java/com/external/plugins/MySqlStaleConnectionErrorMessageTest.java

@@ -33,6 +33,11 @@ private static class MockConnectionPoolConfig implements ConnectionPoolConfig {
         public Mono<Integer> getMaxConnectionPoolSize() {
             return Mono.just(5);
         }
+
+        @Override
+        public Mono<Integer> getSocketTimeoutSeconds() {
+            return Mono.just(600);
+        }
     }
 
     static MySqlPlugin.MySqlPluginExecutor pluginExecutor =

app/server/appsmith-plugins/oraclePlugin/src/main/java/com/external/plugins/OraclePlugin.java

@@ -1,5 +1,6 @@
 package com.external.plugins;
 
+import com.appsmith.external.configurations.connectionpool.ConnectionPoolConfig;
 import com.appsmith.external.constants.DataType;
 import com.appsmith.external.dtos.ExecuteActionDTO;
 import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginError;
@@ -92,6 +93,12 @@ public OraclePlugin(PluginWrapper wrapper) {
     public static class OraclePluginExecutor implements SmartSubstitutionInterface, PluginExecutor<HikariDataSource> {
         public static final Scheduler scheduler = Schedulers.boundedElastic();
 
+        private final ConnectionPoolConfig connectionPoolConfig;
+
+        public OraclePluginExecutor(ConnectionPoolConfig connectionPoolConfig) {
+            this.connectionPoolConfig = connectionPoolConfig;
+        }
+
         @Override
         public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
             log.debug(Thread.currentThread().getName() + ": datasourceCreate() called for Oracle plugin.");
@@ -104,11 +111,12 @@ public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourc
                         e.getMessage()));
             }
 
-            return Mono.fromCallable(() -> {
-                        log.debug(Thread.currentThread().getName() + ": Connecting to Oracle db");
-                        return createConnectionPool(datasourceConfiguration);
-                    })
-                    .subscribeOn(scheduler);
+            return connectionPoolConfig.getSocketTimeoutSeconds().flatMap(socketTimeoutSeconds -> Mono.fromCallable(
+                            () -> {
+                                log.debug(Thread.currentThread().getName() + ": Connecting to Oracle db");
+                                return createConnectionPool(datasourceConfiguration, socketTimeoutSeconds);
+                            })
+                    .subscribeOn(scheduler));
         }
 
         @Override

app/server/appsmith-plugins/oraclePlugin/src/main/java/com/external/plugins/utils/OracleDatasourceUtils.java

@@ -378,7 +378,8 @@ private static String getSampleColumnData(String type) {
         }
     }
 
-    public static HikariDataSource createConnectionPool(DatasourceConfiguration datasourceConfiguration)
+    public static HikariDataSource createConnectionPool(
+            DatasourceConfiguration datasourceConfiguration, Integer socketTimeoutSeconds)
             throws AppsmithPluginException {
         HikariConfig config = new HikariConfig();
 
@@ -444,6 +445,14 @@ public static HikariDataSource createConnectionPool(DatasourceConfiguration data
         // should get tracked (may be falsely for long running queries) as leaked connection
         config.setLeakDetectionThreshold(LEAK_DETECTION_TIME_MS);
 
+        // Send a TCP keepalive probe on idle connections every 150s. Prevents half-open
+        // sockets caused by NAT idle-eviction (AWS NAT Gateway default is 350s).
+        config.setKeepaliveTime(150_000);
+
+        // Bound any single socket read so a half-open connection cannot wedge the pool's
+        // single-threaded connection-adder. Oracle thin driver takes oracle.jdbc.ReadTimeout in milliseconds.
+        config.addDataSourceProperty("oracle.jdbc.ReadTimeout", String.valueOf(socketTimeoutSeconds * 1000));
+
         // Now create the connection pool from the configuration
         HikariDataSource datasource = null;
         try {

app/server/appsmith-plugins/oraclePlugin/src/test/java/com/external/plugins/OracleConnectionRateLimitTest.java

@@ -1,5 +1,6 @@
 package com.external.plugins;
 
+import com.appsmith.external.configurations.connectionpool.ConnectionPoolConfig;
 import com.appsmith.external.models.DatasourceConfiguration;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.OracleContainer;
@@ -16,7 +17,20 @@
 @Testcontainers
 public class OracleConnectionRateLimitTest {
 
-    OraclePlugin.OraclePluginExecutor oraclePluginExecutor = new OraclePlugin.OraclePluginExecutor();
+    private static class MockConnectionPoolConfig implements ConnectionPoolConfig {
+        @Override
+        public Mono<Integer> getMaxConnectionPoolSize() {
+            return Mono.just(5);
+        }
+
+        @Override
+        public Mono<Integer> getSocketTimeoutSeconds() {
+            return Mono.just(600);
+        }
+    }
+
+    OraclePlugin.OraclePluginExecutor oraclePluginExecutor =
+            new OraclePlugin.OraclePluginExecutor(new MockConnectionPoolConfig());
 
     @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional.
     @Container