chore: store imported plugins, use log wrapper, update benchmark files (#277)

Author: crystall-bitquill

common/lib/authentication/aws_secrets_manager_plugin_factory.ts

@@ -21,11 +21,15 @@ import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
 import { logger } from "../../logutils";
 
-export class AwsSecretsManagerPluginFactory implements ConnectionPluginFactory {
+export class AwsSecretsManagerPluginFactory extends ConnectionPluginFactory {
+  private static awsSecretsManagerPlugin: any;
+
   async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
     try {
-      const awsSecretsManagerPlugin = await import("./aws_secrets_manager_plugin");
-      return new awsSecretsManagerPlugin.AwsSecretsManagerPlugin(pluginService, new Map(properties));
+      if (!AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin) {
+        AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin = await import("./aws_secrets_manager_plugin");
+      }
+      return new AwsSecretsManagerPluginFactory.awsSecretsManagerPlugin.AwsSecretsManagerPlugin(pluginService, new Map(properties));
     } catch (error: any) {
       if (error.code === "MODULE_NOT_FOUND") {
         logger.error(error);

common/lib/authentication/iam_authentication_plugin_factory.ts

@@ -21,11 +21,15 @@ import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
 import { logger } from "../../logutils";
 
-export class IamAuthenticationPluginFactory implements ConnectionPluginFactory {
-  async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
+export class IamAuthenticationPluginFactory extends ConnectionPluginFactory {
+  private static iamAuthenticationPlugin: any;
+
+  async getInstance(pluginService: PluginService, properties: object): Promise<ConnectionPlugin> {
     try {
-      const iamAuthenticationPlugin = await import("./iam_authentication_plugin");
-      return new iamAuthenticationPlugin.IamAuthenticationPlugin(pluginService);
+      if (!IamAuthenticationPluginFactory.iamAuthenticationPlugin) {
+        IamAuthenticationPluginFactory.iamAuthenticationPlugin = await import("./iam_authentication_plugin");
+      }
+      return new IamAuthenticationPluginFactory.iamAuthenticationPlugin.IamAuthenticationPlugin(pluginService);
     } catch (error: any) {
       logger.error(error);
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", "IamAuthenticationPlugin"));

common/lib/connection_plugin_chain_builder.ts

@@ -35,20 +35,18 @@ import { AuroraInitialConnectionStrategyFactory } from "./plugins/aurora_initial
 import { AuroraConnectionTrackerPluginFactory } from "./plugins/connection_tracker/aurora_connection_tracker_plugin_factory";
 import { ConnectionProviderManager } from "./connection_provider_manager";
 import { DeveloperConnectionPluginFactory } from "./plugins/dev/developer_connection_plugin_factory";
+import { ConnectionPluginFactory } from "./plugin_factory";
 
 /*
   Type alias used for plugin factory sorting. It holds a reference to a plugin
   factory and an assigned weight.
 */
 type PluginFactoryInfo = {
-  factory: FactoryClass;
+  factory: typeof ConnectionPluginFactory;
   weight: number;
 };
 
-export type FactoryClass = typeof IamAuthenticationPluginFactory | typeof FailoverPluginFactory;
-
 export class ConnectionPluginChainBuilder {
-  static readonly DEFAULT_PLUGINS = "failover,efm";
   static readonly WEIGHT_RELATIVE_TO_PRIOR_PLUGIN = -1;
 
   static readonly PLUGIN_FACTORIES = new Map<string, PluginFactoryInfo>([
@@ -75,10 +73,10 @@ export class ConnectionPluginChainBuilder {
     const plugins: ConnectionPlugin[] = [];
     let pluginCodes: string = props.get(WrapperProperties.PLUGINS.name);
     if (pluginCodes == null) {
-      pluginCodes = ConnectionPluginChainBuilder.DEFAULT_PLUGINS;
+      pluginCodes = WrapperProperties.DEFAULT_PLUGINS;
     }
 
-    const usingDefault = pluginCodes === ConnectionPluginChainBuilder.DEFAULT_PLUGINS;
+    const usingDefault = pluginCodes === WrapperProperties.DEFAULT_PLUGINS;
 
     pluginCodes = pluginCodes.trim();
 

common/lib/plugin_factory.ts

@@ -17,6 +17,8 @@
 import { PluginService } from "./plugin_service";
 import { ConnectionPlugin } from "./connection_plugin";
 
-export interface ConnectionPluginFactory {
-  getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin>;
+export class ConnectionPluginFactory {
+  getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
+    return;
+  }
 }

common/lib/plugin_manager.ts

@@ -16,7 +16,7 @@
 
 import { ConnectionPlugin } from "./connection_plugin";
 import { HostInfo } from "./host_info";
-import { ConnectionPluginChainBuilder, FactoryClass } from "./connection_plugin_chain_builder";
+import { ConnectionPluginChainBuilder } from "./connection_plugin_chain_builder";
 import { AwsWrapperError } from "./utils/errors";
 import { Messages } from "./utils/messages";
 import { PluginServiceManagerContainer } from "./plugin_service_manager_container";
@@ -30,6 +30,7 @@ import { ConnectionProviderManager } from "./connection_provider_manager";
 import { TelemetryFactory } from "./utils/telemetry/telemetry_factory";
 import { TelemetryTraceLevel } from "./utils/telemetry/telemetry_trace_level";
 import { ConnectionProvider } from "./connection_provider";
+import { ConnectionPluginFactory } from "./plugin_factory";
 
 type PluginFunc<T> = (plugin: ConnectionPlugin, targetFunc: () => Promise<T>) => Promise<T>;
 
@@ -327,7 +328,7 @@ export class PluginManager {
     throw new AwsWrapperError(Messages.get("PluginManager.unableToRetrievePlugin"));
   }
 
-  static registerPlugin(pluginCode: string, pluginFactory: FactoryClass) {
+  static registerPlugin(pluginCode: string, pluginFactory: typeof ConnectionPluginFactory) {
     ConnectionPluginChainBuilder.PLUGIN_FACTORIES.set(pluginCode, {
       factory: pluginFactory,
       weight: ConnectionPluginChainBuilder.WEIGHT_RELATIVE_TO_PRIOR_PLUGIN

common/lib/plugins/aurora_initial_connection_strategy_plugin_factory.ts

@@ -18,13 +18,16 @@ import { ConnectionPluginFactory } from "../plugin_factory";
 import { PluginService } from "../plugin_service";
 import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
-import { ConnectionPlugin } from "../connection_plugin";
 
-export class AuroraInitialConnectionStrategyFactory implements ConnectionPluginFactory {
-  async getInstance(pluginService: PluginService, props: Map<string, any>): Promise<ConnectionPlugin> {
+export class AuroraInitialConnectionStrategyFactory extends ConnectionPluginFactory {
+  private static auroraInitialConnectionStrategyPlugin: any;
+
+  async getInstance(pluginService: PluginService, props: Map<string, any>) {
     try {
-      const auroraInitialConnectionStrategyPlugin = await import("./aurora_initial_connection_strategy_plugin");
-      return new auroraInitialConnectionStrategyPlugin.AuroraInitialConnectionStrategyPlugin(pluginService);
+      if (!AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin) {
+        AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin = await import("./aurora_initial_connection_strategy_plugin");
+      }
+      return new AuroraInitialConnectionStrategyFactory.auroraInitialConnectionStrategyPlugin.AuroraInitialConnectionStrategyPlugin(pluginService);
     } catch (error: any) {
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", "AuroraInitialConnectionStrategyPlugin"));
     }

common/lib/plugins/connect_time_plugin_factory.ts

@@ -21,11 +21,15 @@ import { AwsWrapperError } from "../utils/errors";
 import { Messages } from "../utils/messages";
 import { logger } from "../../logutils";
 
-export class ConnectTimePluginFactory implements ConnectionPluginFactory {
+export class ConnectTimePluginFactory extends ConnectionPluginFactory {
+  private static connectTimePlugin: any;
+
   async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
     try {
-      const connectTimePlugin = await import("./connect_time_plugin");
-      return new connectTimePlugin.ConnectTimePlugin();
+      if (!ConnectTimePluginFactory.connectTimePlugin) {
+        ConnectTimePluginFactory.connectTimePlugin = await import("./connect_time_plugin");
+      }
+      return new ConnectTimePluginFactory.connectTimePlugin.ConnectTimePlugin();
     } catch (error: any) {
       logger.error(error.message);
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", "ConnectTimePlugin"));

common/lib/plugins/connection_tracker/aurora_connection_tracker_plugin_factory.ts

@@ -21,11 +21,15 @@ import { logger } from "../../../logutils";
 import { AwsWrapperError } from "../../utils/errors";
 import { Messages } from "../../utils/messages";
 
-export class AuroraConnectionTrackerPluginFactory implements ConnectionPluginFactory {
+export class AuroraConnectionTrackerPluginFactory extends ConnectionPluginFactory {
+  private static auroraConnectionTrackerPlugin: any;
+
   async getInstance(pluginService: PluginService, props: Map<string, any>): Promise<ConnectionPlugin> {
     try {
-      const auroraConnectionTrackerPlugin = await import("./aurora_connection_tracker_plugin");
-      return new auroraConnectionTrackerPlugin.AuroraConnectionTrackerPlugin(pluginService);
+      if (!AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin) {
+        AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin = await import("./aurora_connection_tracker_plugin");
+      }
+      return new AuroraConnectionTrackerPluginFactory.auroraConnectionTrackerPlugin.AuroraConnectionTrackerPlugin(pluginService);
     } catch (error: any) {
       logger.error(error.message);
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", "AuroraConnectionTrackerPlugin"));

common/lib/plugins/dev/developer_connection_plugin_factory.ts

@@ -22,11 +22,15 @@ import { Messages } from "../../utils/messages";
 import { AwsWrapperError } from "../../utils/errors";
 import { logger } from "../../../logutils";
 
-export class DeveloperConnectionPluginFactory implements ConnectionPluginFactory {
+export class DeveloperConnectionPluginFactory extends ConnectionPluginFactory {
+  private static developerPlugin: any;
+
   async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
     try {
-      const developerPlugin = await import("./developer_connection_plugin");
-      return new developerPlugin.DeveloperConnectionPlugin(pluginService, properties, new RdsUtils());
+      if (!DeveloperConnectionPluginFactory.developerPlugin) {
+        DeveloperConnectionPluginFactory.developerPlugin = await import("./developer_connection_plugin");
+      }
+      return new DeveloperConnectionPluginFactory.developerPlugin.DeveloperConnectionPlugin(pluginService, properties, new RdsUtils());
     } catch (error: any) {
       logger.error(error);
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", "DeveloperConnectionPlugin"));

common/lib/plugins/efm/host_monitoring_plugin_factory.ts

@@ -22,11 +22,15 @@ import { logger } from "../../../logutils";
 import { AwsWrapperError } from "../../utils/errors";
 import { Messages } from "../../utils/messages";
 
-export class HostMonitoringPluginFactory implements ConnectionPluginFactory {
+export class HostMonitoringPluginFactory extends ConnectionPluginFactory {
+  private static hostMonitoringPlugin: any;
+
   async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
     try {
-      const hostMonitoringPlugin = await import("./host_monitoring_connection_plugin");
-      return new hostMonitoringPlugin.HostMonitoringConnectionPlugin(pluginService, properties, new RdsUtils());
+      if (!HostMonitoringPluginFactory.hostMonitoringPlugin) {
+        HostMonitoringPluginFactory.hostMonitoringPlugin = await import("./host_monitoring_connection_plugin");
+      }
+      return new HostMonitoringPluginFactory.hostMonitoringPlugin.HostMonitoringConnectionPlugin(pluginService, properties, new RdsUtils());
     } catch (error: any) {
       logger.error(error.message);
       throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", "HostMonitoringPlugin"));