diff --git a/docs/JDBC-WRAPPER-CONFIGURATION-ASSISTANT.md b/docs/JDBC-WRAPPER-CONFIGURATION-ASSISTANT.md
index 69934ff4e..2806253a5 100644
--- a/docs/JDBC-WRAPPER-CONFIGURATION-ASSISTANT.md
+++ b/docs/JDBC-WRAPPER-CONFIGURATION-ASSISTANT.md
@@ -1400,6 +1400,7 @@ A v1 normal profile: `failoverTimeoutMs=180000`, the rest at defaults. A v1 aggr
 |---|---|---|
 | `wrapperCaseSensitive` | `true` | Case sensitivity for parameter names. Set `false` only for legacy compat. |
 | ~~`enableGreenNodeReplacement`~~ | `false` | **Deprecated.** Use the `bg` plugin. (Was used for stale green-host DNS handling post Blue/Green switchover.) |
+| `enableConnectionMetadata` | `true`, or `false` for RDS Proxy endpoints | **4.7.0+.** Sends the wrapper name, version and plugin codes when connecting: `aurora.connection_str` in `options` for Aurora PostgreSQL, `connectionAttributes` for MySQL and MariaDB. RDS Proxy refuses PostgreSQL connections that carry it, so it is skipped for RDS Proxy endpoints unless set explicitly. An explicit value always wins. Set `false` when the proxy is reached through a custom DNS name. |
 
 ### 6.10 Failure detection strategy (how to detect a dead host while a query is in flight)
 
@@ -2103,6 +2104,7 @@ logging.level.software.amazon.jdbc=trace
 | Intermittent ~60s stalls under concurrent load when connecting via a custom Route 53 CNAME / non-RDS host with `failover2`+`efm2`; Hikari leak detection fires; connections marked broken with `SQLSTATE(08001)`; log shows `The request to discover the new topology timed out or was unsuccessful`; repeated bursts drain the pool → `Could not open JDBC Connection for transaction`. Worked on 3.x, regressed on 4.x. (GitHub #2035) | Connection host is a CNAME the driver can't recognize as an RDS endpoint and `clusterInstanceHostPattern` is not set → the bare `?` instance template yields **unresolvable** per-instance hostnames (e.g. `myinstance` with no domain). `failover2`'s topology monitor treats the resulting `UnknownHostException`/`08xxx` as "expected during failover" and retries silently until `failoverTimeoutMs` while the borrowed connection is held; no DNS error is logged at INFO/WARN. | Set `clusterInstanceHostPattern` (e.g. `?.XYZ.<region>.rds.amazonaws.com`) **and** `clusterId`. Removing `failover2`/`efm2` also avoids it. On fixed versions the driver warns at startup for non-RDS hosts without `clusterInstanceHostPattern` and fails fast with a clear configuration error instead of blocking. |
 | After a Blue/Green Deployment is deleted and recreated without restarting the application, the new green environment never receives topology probes (`rds_tools.show_topology` shows 0 calls in `pg_stat_statements`); the blue → green mapping is absent or still names the old green node. Depending on whether the old green endpoint still resolves, `FINEST` either repeats `[TARGET] Opening monitoring connection to <old green endpoint>` with no matching `Opened` line, or shows the target monitor connecting successfully while reporting `phase <null>` | The target monitor latched onto the green endpoint of the deleted deployment. Its fallback to the blue endpoint only applies before an endpoint has been discovered, so it never re-points, and the plugin only recreated its monitors after a *completed* switchover. If the old green instance was retained or its name still resolves, the monitor keeps connecting to a node that has been detached from the deployment. **Fixed in 4.5.0**: a deployment that either environment stops reporting for `bgDeploymentRemovedGraceMs` is treated as deleted, and the monitoring context is reset and rediscovered (logged at `INFO`) | Upgrade to **4.5.0+**. On earlier versions, restart the application; alternatively rename the new green instance to the DB identifier shown in the `Opening monitoring connection` log line so the cached endpoint resolves to it |
 | Blue/Green switchover holds traffic and never builds a blue → green mapping, with no obvious error | The plugin cannot reach the green environment, so it never collects the green topology. Before **4.5.0** this is only visible at `FINEST` as a repeating `Opening monitoring connection` line with no matching `Opened` | On **4.5.0+** the plugin logs a `WARNING` after `bgEndpointUnreachableMs` and reports the deployment as not ready for switchover; resolve the reachability problem (security groups, direct access to instance endpoints) before switching over |
+| Through RDS Proxy with Aurora PostgreSQL on **4.6.0**, the first connection works, but every later one fails with `FATAL: Feature not supported: RDS Proxy currently doesn't support command-line options.` (GitHub #2240) | 4.6.0 adds `-c aurora.connection_str=...` to the PG `options` property once the dialect is detected as `aurora-pg`. The first connection still uses `rds-pg`, which adds nothing, and then `aurora-pg` is cached for the URL. RDS Proxy refuses startup options. **Fixed in 4.7.0**: connection metadata is skipped for RDS Proxy endpoints by default | Upgrade to **4.7.0+**. For a proxy behind a custom DNS name, also set `enableConnectionMetadata=false` (§6.9). On 4.6.0, set `wrapperDialect=rds-pg` (the proxy hides the topology, so nothing is lost), or stay on 4.5.0 |
 | Open Liberty doesn't recover after failover | Failover SQL states not recognized as stale-connection | Add `identifyException` mappings for `08S02` and `08007` (see §15.4) |
 | Unexpected behavior in Vert.x or other reactive contexts | Wrapper may not skip-wrap classes you depend on | Add the relevant package to `skipWrappingForPackages` |
 
diff --git a/docs/using-the-jdbc-driver/UsingTheJdbcDriver.md b/docs/using-the-jdbc-driver/UsingTheJdbcDriver.md
index a8b2f9137..fc17dc9c6 100644
--- a/docs/using-the-jdbc-driver/UsingTheJdbcDriver.md
+++ b/docs/using-the-jdbc-driver/UsingTheJdbcDriver.md
@@ -199,6 +199,7 @@ These parameters are applicable to any instance of the AWS Advanced JDBC Wrapper
 | `wrapperCaseSensitive`,<br>`wrappercasesensitive` | 2.6.0 | `Boolean` | No                                                                                                                                                                              | Allows the driver to change case sensitivity for parameter names in the connection string and in connection properties. Set parameter to `false` to allow case-insensitive parameter names.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `true`         |
 | `skipWrappingForPackages`                         | 2.6.3 | `String`  | No                                                                                                                                                                              | Register Java package names (separated by comma) which will be left unwrapped. This setting modifies all future connections established by the driver, not just a particular connection.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `com.pgvector` |
 | `connectionPoolType`                              | 3.1.0 | `String`  | No                                                                                                                                                                              | Activate internal connection pooling and set up an internal pool implementation type. Possible values are `hikari` and `c3p0`.<br><br>In order to configure specific pooling parameters use configuration property names for classes `com.zaxxer.hikariHikariConfig` or `com.mchange.v2.c3p0.ComboPooledDataSource` prefixed with `cp-`. For example, `connectionPoolType=hikari&cp-MaximumPoolSize=20&cp-MinimumIdle=1`. <br><br>Internal connection pool is maintained per database cluster specified by `clusterId` parameter. Clusters with different `clusterId` values will use separate connection pools.                                                                                                                                                 | `null`         |
+| `enableConnectionMetadata`                        | 4.7.0 | `Boolean` | No | Sends the wrapper name, version and plugin codes to the database when connecting: the `aurora.connection_str` setting for Aurora PostgreSQL, and connection attributes for MySQL and MariaDB. RDS Proxy refuses PostgreSQL connections that carry this setting, so by default it is sent to every host except RDS Proxy endpoints. Set it to `false` when the proxy is reached through a custom DNS name. | `true`, or `false` for RDS Proxy endpoints |
 
 > [!NOTE]
 > `loginTimeout`, `connectTimeout` and `socketTimeout` are always in milliseconds, whatever the target driver is. The PostgreSQL JDBC driver (pgjdbc) uses the same property names in seconds, so when moving settings from a `jdbc:postgresql:` URL, multiply the values by 1000. Because pgjdbc accepts only whole seconds, the wrapper converts the milliseconds to seconds by truncating, and logs a warning once when a value from 1 to 999 becomes 0 (no timeout).
diff --git a/wrapper/src/main/java/software/amazon/jdbc/PropertyDefinition.java b/wrapper/src/main/java/software/amazon/jdbc/PropertyDefinition.java
index 3ee617bbf..4459f068b 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/PropertyDefinition.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/PropertyDefinition.java
@@ -182,6 +182,17 @@ public class PropertyDefinition {
               "true", "false"
           });
 
+  public static final AwsWrapperProperty ENABLE_CONNECTION_METADATA =
+      new AwsWrapperProperty(
+          "enableConnectionMetadata",
+          null,
+          "Enables sending the wrapper name, version and plugin codes to the database as connection metadata."
+            + " If not set, it's enabled for all hosts except RDS Proxy endpoints.",
+          false,
+          new String[] {
+              "true", "false"
+          });
+
   public static final AwsWrapperProperty ASSUME_FETCH_ENTIRE_RESULT_SET = new AwsWrapperProperty(
       "wrapperAssumeFetchEntireResultSet", "true",
       "Allow the driver to optimized work with ResultSets and skip tracking some of their methods"
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java
index 394a2a67e..29174fecb 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java
@@ -153,16 +153,20 @@ public void prepareConnectProperties(
       final @NonNull Properties connectProperties,
       final @NonNull String protocol,
       final @NonNull HostSpec hostSpec) {
-
+    final @Nullable String pluginCodes =
+        connectProperties.getProperty(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
+    connectProperties.remove(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
+    if (!this.dialectUtils.isConnectionMetadataEnabled(connectProperties, hostSpec)) {
+      return;
+    }
     final String driverInfoOption = String.format(
         "-c aurora.connection_str=_d:aws_jdbc_wrapper,_v:%s,_p:%s",
         DriverInfo.DRIVER_VERSION,
-        connectProperties.getProperty(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+        pluginCodes);
     connectProperties.setProperty("options",
         connectProperties.getProperty("options") == null
             ? driverInfoOption
             : connectProperties.getProperty("options") + " " + driverInfoOption);
-    connectProperties.remove(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
   }
 
   @Override
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/DialectUtils.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/DialectUtils.java
index 268016ec9..326af1899 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/dialect/DialectUtils.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/dialect/DialectUtils.java
@@ -20,12 +20,41 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Properties;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import software.amazon.jdbc.HostRole;
+import software.amazon.jdbc.HostSpec;
+import software.amazon.jdbc.PropertyDefinition;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.Pair;
+import software.amazon.jdbc.util.RdsUrlType;
+import software.amazon.jdbc.util.RdsUtils;
 
 public class DialectUtils {
+
+  private final RdsUtils rdsUtils = new RdsUtils();
+
+  /**
+   * Checks whether the wrapper should send connection metadata (wrapper name, version and plugin codes) to the
+   * database. An explicit {@link PropertyDefinition#ENABLE_CONNECTION_METADATA} value always wins. If the property
+   * isn't set, metadata is sent to every host except RDS Proxy endpoints, which refuse it.
+   *
+   * @param props    the connection properties.
+   * @param hostSpec the host to connect to.
+   * @return true if connection metadata should be sent, false otherwise.
+   */
+  public boolean isConnectionMetadataEnabled(final Properties props, final HostSpec hostSpec) {
+    final Object value = props.get(PropertyDefinition.ENABLE_CONNECTION_METADATA.name);
+    if (value instanceof Boolean) {
+      return (Boolean) value;
+    }
+    if (value != null) {
+      return Boolean.parseBoolean(value.toString());
+    }
+    final RdsUrlType urlType = rdsUtils.identifyRdsType(hostSpec.getHost());
+    return urlType != RdsUrlType.RDS_PROXY && urlType != RdsUrlType.RDS_PROXY_ENDPOINT;
+  }
+
   /**
    * Given a series of existence queries, returns true if they all execute successfully and contain at least one record.
    * Otherwise, returns false.
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/MariaDbDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/MariaDbDialect.java
index 9ba08d4c6..cae1c8f12 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/dialect/MariaDbDialect.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/dialect/MariaDbDialect.java
@@ -103,16 +103,20 @@ public HostListProviderSupplier getHostListProviderSupplier() {
   @Override
   public void prepareConnectProperties(
       final @NonNull Properties connectProperties, final @NonNull String protocol, final @NonNull HostSpec hostSpec) {
-
+    final @Nullable String pluginCodes =
+        connectProperties.getProperty(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
+    connectProperties.remove(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
+    if (!this.dialectUtils.isConnectionMetadataEnabled(connectProperties, hostSpec)) {
+      return;
+    }
     final String connectionAttributes = String.format(
         "_d:aws_jdbc_wrapper,_v:%s,_p:%s",
         DriverInfo.DRIVER_VERSION,
-        connectProperties.getProperty(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+        pluginCodes);
     connectProperties.setProperty("connectionAttributes",
         connectProperties.getProperty("connectionAttributes") == null
             ? connectionAttributes
             : connectProperties.getProperty("connectionAttributes") + "," + connectionAttributes);
-    connectProperties.remove(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
   }
 
   @Override
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/MultiAzClusterMysqlDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/MultiAzClusterMysqlDialect.java
index c37869c6d..9fb45a0f0 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/dialect/MultiAzClusterMysqlDialect.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/dialect/MultiAzClusterMysqlDialect.java
@@ -95,6 +95,9 @@ public HostListProviderSupplier getHostListProviderSupplier() {
   @Override
   public void prepareConnectProperties(
       final @NonNull Properties connectProperties, final @NonNull String protocol, final @NonNull HostSpec hostSpec) {
+    if (!this.dialectUtils.isConnectionMetadataEnabled(connectProperties, hostSpec)) {
+      return;
+    }
     final String connectionAttributes =
         "_jdbc_wrapper_name:aws_jdbc_driver,_jdbc_wrapper_version:" + DriverInfo.DRIVER_VERSION;
     connectProperties.setProperty("connectionAttributes",
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/MysqlDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/MysqlDialect.java
index c99676f7d..28ebe1e24 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/dialect/MysqlDialect.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/dialect/MysqlDialect.java
@@ -106,16 +106,20 @@ public void prepareConnectProperties(
       final @NonNull Properties connectProperties,
       final @NonNull String protocol,
       final @NonNull HostSpec hostSpec) {
-
+    final @Nullable String pluginCodes =
+        connectProperties.getProperty(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
+    connectProperties.remove(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
+    if (!this.dialectUtils.isConnectionMetadataEnabled(connectProperties, hostSpec)) {
+      return;
+    }
     final String connectionAttributes = String.format(
         "_d:aws_jdbc_wrapper,_v:%s,_p:%s",
         DriverInfo.DRIVER_VERSION,
-        connectProperties.getProperty(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+        pluginCodes);
     connectProperties.setProperty("connectionAttributes",
         connectProperties.getProperty("connectionAttributes") == null
             ? connectionAttributes
             : connectProperties.getProperty("connectionAttributes") + "," + connectionAttributes);
-    connectProperties.remove(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY);
   }
 
   @Override
diff --git a/wrapper/src/test/java/software/amazon/jdbc/DialectTests.java b/wrapper/src/test/java/software/amazon/jdbc/DialectTests.java
index b9a159cfb..b008b2b73 100644
--- a/wrapper/src/test/java/software/amazon/jdbc/DialectTests.java
+++ b/wrapper/src/test/java/software/amazon/jdbc/DialectTests.java
@@ -36,6 +36,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import software.amazon.jdbc.dialect.AuroraMysqlDialect;
@@ -401,4 +403,99 @@ void testMysqlPrepareConnectPropertiesUnchangedWhenInUrl() {
         props.getProperty("connectionAttributes"));
     assertFalse(props.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
   }
+
+  // CONNECTION METADATA AND RDS PROXY
+  private static final String MYSQL_CONNECTION_ATTRIBUTES =
+      "_d:aws_jdbc_wrapper,_v:" + DriverInfo.DRIVER_VERSION + ",_p:a+b";
+
+  private static HostSpec host(final String host) {
+    return new HostSpecBuilder(new SimpleHostAvailabilityStrategy()).host(host).build();
+  }
+
+  private Properties getMetadataProps(final String options, final Object enableConnectionMetadata) {
+    final Properties props = getPluginCodesProps(options);
+    props.put(PropertyDefinition.ENABLE_CONNECTION_METADATA.name, enableConnectionMetadata);
+    return props;
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+      "proxy-test-name.proxy-XYZ.us-east-2.rds.amazonaws.com",
+      "endpoint-test-name.endpoint.proxy-XYZ.us-east-2.rds.amazonaws.com"})
+  void testConnectionMetadataSkippedByDefaultForRdsProxy(final String proxyHost) {
+    final Properties pgProps = getPluginCodesProps(PG_USER_OPTIONS);
+    auroraPgDialect.prepareConnectProperties(pgProps, "jdbc:postgresql://", host(proxyHost));
+    assertEquals(PG_USER_OPTIONS, pgProps.getProperty("options"));
+    assertFalse(pgProps.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+
+    final Properties pgPropsInUrl = getPluginCodesProps(null);
+    auroraPgDialect.prepareConnectProperties(pgPropsInUrl, "jdbc:postgresql://", host(proxyHost), true);
+    assertFalse(pgPropsInUrl.containsKey("options"));
+    assertFalse(pgPropsInUrl.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+
+    final Properties mysqlProps = getPluginCodesProps(null);
+    mysqlDialect.prepareConnectProperties(mysqlProps, "jdbc:mysql://", host(proxyHost));
+    assertFalse(mysqlProps.containsKey("connectionAttributes"));
+    assertFalse(mysqlProps.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+
+    final Properties mariaDbProps = getPluginCodesProps(null);
+    mariaDbDialect.prepareConnectProperties(mariaDbProps, "jdbc:mariadb://", host(proxyHost));
+    assertFalse(mariaDbProps.containsKey("connectionAttributes"));
+    assertFalse(mariaDbProps.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+
+    final Properties multiAzProps = new Properties();
+    new MultiAzClusterMysqlDialect().prepareConnectProperties(multiAzProps, "jdbc:mysql://", host(proxyHost));
+    assertFalse(multiAzProps.containsKey("connectionAttributes"));
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"true", "TRUE"})
+  void testConnectionMetadataSentForRdsProxyWhenEnabled(final String enabled) {
+    final HostSpec proxyHostSpec = host("proxy-test-name.proxy-XYZ.us-east-2.rds.amazonaws.com");
+
+    final Properties pgProps = getMetadataProps(PG_USER_OPTIONS, enabled);
+    auroraPgDialect.prepareConnectProperties(pgProps, "jdbc:postgresql://", proxyHostSpec);
+    assertEquals(PG_USER_OPTIONS + " " + PG_DRIVER_INFO_OPTION, pgProps.getProperty("options"));
+
+    final Properties mysqlProps = getMetadataProps(null, enabled);
+    mysqlDialect.prepareConnectProperties(mysqlProps, "jdbc:mysql://", proxyHostSpec);
+    assertEquals(MYSQL_CONNECTION_ATTRIBUTES, mysqlProps.getProperty("connectionAttributes"));
+
+    final Properties mariaDbProps = getMetadataProps(null, enabled);
+    mariaDbDialect.prepareConnectProperties(mariaDbProps, "jdbc:mariadb://", proxyHostSpec);
+    assertEquals(MYSQL_CONNECTION_ATTRIBUTES, mariaDbProps.getProperty("connectionAttributes"));
+  }
+
+  @Test
+  void testConnectionMetadataSkippedWhenDisabled() {
+    final HostSpec clusterHostSpec = host("test-cluster.cluster-XYZ.us-east-2.rds.amazonaws.com");
+
+    final Properties pgProps = getMetadataProps(PG_USER_OPTIONS, "false");
+    auroraPgDialect.prepareConnectProperties(pgProps, "jdbc:postgresql://", clusterHostSpec);
+    assertEquals(PG_USER_OPTIONS, pgProps.getProperty("options"));
+    assertFalse(pgProps.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+
+    final Properties mysqlProps = getMetadataProps(null, Boolean.FALSE);
+    mysqlDialect.prepareConnectProperties(mysqlProps, "jdbc:mysql://", clusterHostSpec);
+    assertFalse(mysqlProps.containsKey("connectionAttributes"));
+    assertFalse(mysqlProps.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+
+    final Properties mariaDbProps = getMetadataProps(null, "false");
+    mariaDbDialect.prepareConnectProperties(mariaDbProps, "jdbc:mariadb://", clusterHostSpec);
+    assertFalse(mariaDbProps.containsKey("connectionAttributes"));
+    assertFalse(mariaDbProps.containsKey(ConnectionPluginManager.EFFECTIVE_PLUGIN_CODES_PROPERTY));
+  }
+
+  @Test
+  void testConnectionMetadataSentByDefaultForNonProxyHost() {
+    final HostSpec clusterHostSpec = host("test-cluster.cluster-XYZ.us-east-2.rds.amazonaws.com");
+
+    final Properties pgProps = getPluginCodesProps(null);
+    auroraPgDialect.prepareConnectProperties(pgProps, "jdbc:postgresql://", clusterHostSpec);
+    assertEquals(PG_DRIVER_INFO_OPTION, pgProps.getProperty("options"));
+
+    final Properties mariaDbProps = getPluginCodesProps(null);
+    mariaDbDialect.prepareConnectProperties(mariaDbProps, "jdbc:mariadb://", clusterHostSpec);
+    assertEquals(MYSQL_CONNECTION_ATTRIBUTES, mariaDbProps.getProperty("connectionAttributes"));
+  }
 }
