Merge branch 'main' into cloudwatch-metrics-example

momentohq · Nov 1, 2023 · 3aa686c · 3aa686c
2 parents 958f459 + 45a0049
commit 3aa686c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/client-sdk-nodejs/src/config/middleware/impl/experimental-metrics-middleware.ts b/packages/client-sdk-nodejs/src/config/middleware/impl/experimental-metrics-middleware.ts
@@ -108,7 +108,7 @@ export abstract class ExperimentalMetricsMiddlewareRequestHandler
 
   onRequestBody(request: MiddlewareMessage): Promise<MiddlewareMessage> {
     this.requestSize = request.messageLength();
-    this.requestType = request.constructor.name;
+    this.requestType = request._grpcMessage.constructor.name;
     this.requestBodyTime = new Date().getTime();
     return Promise.resolve(request);
   }

diff --git a/packages/client-sdk-nodejs/src/config/middleware/middleware.ts b/packages/client-sdk-nodejs/src/config/middleware/middleware.ts
@@ -29,7 +29,10 @@ export class MiddlewareMessage {
   }
 
   messageLength(): number {
-    return this._grpcMessage.serializeBinary().length;
+    if (this._grpcMessage !== null && this._grpcMessage !== undefined) {
+      return this._grpcMessage.serializeBinary().length;
+    }
+    return 0;
   }
 }
 

diff --git a/packages/client-sdk-nodejs/src/index.ts b/packages/client-sdk-nodejs/src/index.ts
@@ -200,6 +200,7 @@ export {
 
 export {ExperimentalRequestLoggingMiddleware} from './config/middleware/experimental-request-logging-middleware';
 export {ExperimentalMetricsCsvMiddleware} from './config/middleware/experimental-metrics-csv-middleware';
+export {ExperimentalMetricsLoggingMiddleware} from './config/middleware/experimental-metrics-logging-middleware';
 export {ExampleAsyncMiddleware} from './config/middleware/example-async-middleware';
 export {ExperimentalMetricsLoggingMiddleware} from './config/middleware/experimental-metrics-logging-middleware';