Skip to content

Commit 44caf79

Browse files
sergiyvamzsergiyvamz
committed
use efm2 plugin by default
1 parent 7367f51 commit 44caf79

File tree

22 files changed

+34
-34
lines changed

22 files changed

+34
-34
lines changed

‎benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/PluginBenchmarks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ Properties useAuroraHostListAndReadWriteSplittingPluginWithReaderLoadBalancing()
386386

387387
Properties useTelemetry() {
388388
final Properties properties = new Properties();
389-
properties.setProperty("wrapperPlugins", "dataCache,auroraHostList,efm");
389+
properties.setProperty("wrapperPlugins", "dataCache,auroraHostList,efm2");
390390
properties.setProperty("enableTelemetry", "true");
391391
properties.setProperty("telemetryMetricsBackend", "none");
392392
properties.setProperty("telemetryTracesBackend", "none");
@@ -395,7 +395,7 @@ Properties useTelemetry() {
395395

396396
Properties disabledTelemetry() {
397397
final Properties properties = new Properties();
398-
properties.setProperty("wrapperPlugins", "dataCache,auroraHostList,efm");
398+
properties.setProperty("wrapperPlugins", "dataCache,auroraHostList,efm2");
399399
properties.setProperty("enableTelemetry", "false");
400400
return properties;
401401
}

‎docs/using-the-jdbc-driver/UsingTheJdbcDriver.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ Plugins are loaded and managed through the Connection Plugin Manager and may be
7373

7474
| Parameter | Value | Required | Description | Default Value |
7575
|-----------------------------------|-----------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------|
76-
| `wrapperPlugins` | `String` | No | Comma separated list of connection plugin codes. <br><br>Example: `failover,efm` | `auroraConnectionTracker,failover,efm` |
76+
| `wrapperPlugins` | `String` | No | Comma separated list of connection plugin codes. <br><br>Example: `failover,efm2` | `auroraConnectionTracker,failover,efm` |
7777
| `autoSortWrapperPluginOrder` | `Boolean` | No | Allows the AWS JDBC Driver to sort connection plugins to prevent plugin misconfiguration. Allows a user to provide a custom plugin order if needed. | `true` |
7878
| `wrapperProfileName` | `String` | No | Driver configuration profile name. Instead of listing plugin codes with `wrapperPlugins`, the driver profile can be set with this parameter. <br><br> Example: See [below](#configuration-profiles). | `null` |
7979

8080
To use a built-in plugin, specify its relevant plugin code for the `wrapperPlugins`.
81-
The default value for `wrapperPlugins` is `auroraConnectionTracker,failover,efm`. These 3 plugins are enabled by default. To read more about these plugins, see the [List of Available Plugins](#list-of-available-plugins) section.
81+
The default value for `wrapperPlugins` is `auroraConnectionTracker,failover,efm2`. These 3 plugins are enabled by default. To read more about these plugins, see the [List of Available Plugins](#list-of-available-plugins) section.
8282
To override the default plugins, simply provide a new value for `wrapperPlugins`.
8383
For instance, to use the [IAM Authentication Connection Plugin](./using-plugins/UsingTheIamAuthenticationPlugin.md) and the [Failover Connection Plugin](./using-plugins/UsingTheFailoverPlugin.md):
8484

‎examples/AWSDriverExample/src/main/java/software/amazon/AwsIamAuthenticationDatasourceExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void main(String[] args) throws SQLException {
5858
Properties targetDataSourceProps = new Properties();
5959

6060
// Enable the IAM authentication plugin along with failover and host monitoring plugins.
61-
targetDataSourceProps.setProperty("wrapperPlugins", "iam,failover,efm");
61+
targetDataSourceProps.setProperty("wrapperPlugins", "iam,failover,efm2");
6262

6363
ds.addDataSourceProperty("targetDataSourceProperties", targetDataSourceProps);
6464

‎examples/AWSDriverExample/src/main/java/software/amazon/DriverMetaDataConnectionPluginExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static void main(String[] args) throws SQLException {
3838
final Properties properties = new Properties();
3939
properties.setProperty("user", USERNAME);
4040
properties.setProperty("password", PASSWORD);
41-
PropertyDefinition.PLUGINS.set(properties, "driverMetaData,failover,efm");
41+
PropertyDefinition.PLUGINS.set(properties, "driverMetaData,failover,efm2");
4242

4343
// DriverMetaDataConnectionPlugin Settings
4444
// Override the return value of DatabaseMetaData#getDriverName to "PostgreSQL JDBC Driver"

‎examples/AWSDriverExample/src/main/java/software/amazon/PgConnectionSample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class PgConnectionSample {
3535
// + "?user=username"
3636
// + "&password=password"
3737
// + "&loginTimeout=100"
38-
// + "&wrapperPlugins=failover,efm"
38+
// + "&wrapperPlugins=failover,efm2"
3939
// + "&wrapperLogUnclosedConnections=true";
4040
private static final String USERNAME = "username";
4141
private static final String PASSWORD = "password";
@@ -49,7 +49,7 @@ public static void main(String[] args) throws SQLException {
4949
properties.setProperty("loginTimeout", "100");
5050

5151
// Configuring connection properties for the JDBC Wrapper.
52-
properties.setProperty("wrapperPlugins", "failover,efm");
52+
properties.setProperty("wrapperPlugins", "failover,efm2");
5353
properties.setProperty("wrapperLogUnclosedConnections", "true");
5454

5555
try (Connection conn = DriverManager.getConnection(CONNECTION_STRING, properties);

‎examples/AWSDriverExample/src/main/java/software/amazon/ReadWriteSplittingMySQLExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public static void main(String[] args) throws SQLException {
4242

4343
final Properties props = new Properties();
4444

45-
// Enable readWriteSplitting, failover, and efm plugins and set properties
46-
props.setProperty(PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm");
45+
// Enable readWriteSplitting, failover, and efm2 plugins and set properties
46+
props.setProperty(PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm2");
4747
props.setProperty(PropertyDefinition.USER.name, USERNAME);
4848
props.setProperty(PropertyDefinition.PASSWORD.name, PASSWORD);
4949

‎examples/AWSDriverExample/src/main/java/software/amazon/ReadWriteSplittingPostgresExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public static void main(String[] args) throws SQLException {
4444

4545
final Properties props = new Properties();
4646

47-
// Enable readWriteSplitting, failover, and efm plugins and set properties
48-
props.setProperty(PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm");
47+
// Enable readWriteSplitting, failover, and efm2 plugins and set properties
48+
props.setProperty(PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm2");
4949
props.setProperty(PropertyDefinition.USER.name, USERNAME);
5050
props.setProperty(PropertyDefinition.PASSWORD.name, PASSWORD);
5151

‎examples/AWSDriverExample/src/main/java/software/amazon/ReadWriteSplittingSpringJdbcTemplateMySQLExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static DataSource getSimpleMySQLDataSource() {
8888

8989
Properties targetDataSourceProps = new Properties();
9090
targetDataSourceProps.setProperty(
91-
PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm");
91+
PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm2");
9292

9393
ds.setUser(USERNAME);
9494
ds.setPassword(PASSWORD);
@@ -118,7 +118,7 @@ private static DataSource getHikariCPDataSource() {
118118

119119
Properties targetDataSourceProps = new Properties();
120120
targetDataSourceProps.setProperty(PropertyDefinition.PLUGINS.name,
121-
"readWriteSplitting,failover,efm");
121+
"readWriteSplitting,failover,efm2");
122122

123123
ds.addDataSourceProperty("targetDataSourceProperties", targetDataSourceProps);
124124

‎examples/AWSDriverExample/src/main/java/software/amazon/ReadWriteSplittingSpringJdbcTemplatePostgresExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static DataSource getSimplePostgresDataSource() {
8787

8888
Properties targetDataSourceProps = new Properties();
8989
targetDataSourceProps.setProperty(
90-
PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm");
90+
PropertyDefinition.PLUGINS.name, "readWriteSplitting,failover,efm2");
9191

9292
ds.setUser(USERNAME);
9393
ds.setPassword(PASSWORD);
@@ -117,7 +117,7 @@ private static DataSource getHikariCPDataSource() {
117117

118118
Properties targetDataSourceProps = new Properties();
119119
targetDataSourceProps.setProperty(PropertyDefinition.PLUGINS.name,
120-
"readWriteSplitting,failover,efm");
120+
"readWriteSplitting,failover,efm2");
121121

122122
ds.addDataSourceProperty("targetDataSourceProperties", targetDataSourceProps);
123123

‎examples/AWSDriverExample/src/main/java/software/amazon/TelemetryMetricsOTLPExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static void main(String[] args) throws SQLException {
7070

7171
// Properties
7272
final Properties properties = new Properties();
73-
properties.setProperty(PropertyDefinition.PLUGINS.name, "dataCache, efm, failover");
73+
properties.setProperty(PropertyDefinition.PLUGINS.name, "dataCache,efm2,failover");
7474
properties.setProperty(PropertyDefinition.USER.name, USERNAME);
7575
properties.setProperty(PropertyDefinition.PASSWORD.name, PASSWORD);
7676

0 commit comments

Comments
 (0)