clean up

aws · Apr 3, 2024 · 3a40c14 · 3a40c14
1 parent 5f45648
commit 3a40c14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/common/lib/plugins/execution_time_plugin.ts b/common/lib/plugins/execution_time_plugin.ts
@@ -36,7 +36,7 @@ export class ExecutionTimePlugin extends AbstractConnectionPlugin {
         const result = await methodFunc();
 
         const elapsedTimeNanos = getTimeInNanos() - startTime;
-        logger.debug(Messages.get("ExecutionTimeConnectionPlugin.executionTime", methodName, elapsedTimeNanos.toString()));
+        logger.debug(Messages.get("ExecutionTimePlugin.executionTime", methodName, elapsedTimeNanos.toString()));
         ExecutionTimePlugin.executionTime += elapsedTimeNanos;
         return result;
     }

diff --git a/common/lib/utils/locales/en.json b/common/lib/utils/locales/en.json
@@ -34,5 +34,5 @@
   "ClusterAwareWriterFailoverHandler.standaloneNode": "[TaskB] Host %s is not yet connected to a cluster. The cluster is still being reconfigured.",
   "ClusterAwareWriterFailoverHandler.taskBAttemptConnectionToNewWriter": "[TaskB] Trying to connect to a new writer: '%s'",
   "ClusterAwareWriterFailoverHandler.alreadyWriter": "Current reader connection is actually a new writer connection.",
-  "ExecutionTimeConnectionPlugin.executionTime": "Executed %s in %s nanoseconds."
+  "ExecutionTimePlugin.executionTime": "Executed %s in %s nanoseconds."
 }
diff --git a/tests/unit/execution_time_plugin.test.ts b/tests/unit/execution_time_plugin.test.ts
@@ -18,7 +18,7 @@ import { ExecutionTimePlugin } from "aws-wrapper-common-lib/lib/plugins/executio
 import { sleep } from "aws-wrapper-common-lib/lib/utils/utils";
 import { logger } from "aws-wrapper-common-lib/logutils";
 import { Writable } from "stream";
-import winston, {  } from "winston";
+import winston from "winston";
 
 const mockCallable = jest.fn();
 
@@ -33,9 +33,9 @@ describe("executionTimePluginTest", () => {
 
     let output = '';
     const stream = new Writable();
-    stream._write = (chunk, encoding, callback) => {
+    stream._write = (chunk, encoding, next) => {
       output = output += chunk.toString();
-      callback();
+      next();
     };
 
     const streamTransport = new winston.transports.Stream({ stream })
@@ -48,5 +48,8 @@ describe("executionTimePluginTest", () => {
 
     expect(logMessages[0]).toContain("Executed query in");
     expect(ExecutionTimePlugin.getTotalExecutionTime()).toBeGreaterThan(0n);
+
+    ExecutionTimePlugin.resetExecutionTime();
+    expect(ExecutionTimePlugin.getTotalExecutionTime()).toEqual(0n);
   })
 });