update parsers debugging to include original event in debug logs

Author: manwaring

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [4.0.4]  (2020-09-06)
+
+### Changed
+
+- Better debug logging of events - include original and parsed messages instead of just parsed
+
 ## [4.0.3]  (2020-09-06)
 
 ### Changed
@@ -279,6 +285,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
 - Update older libraries
 - Now publish from Git tags instead of master pushes
 
+[4.0.2]: https://github.com/manwaring/lambda-wrapper/compare/v4.0.3...v4.0.4
+[4.0.3]: https://github.com/manwaring/lambda-wrapper/compare/v4.0.2...v4.0.3
 [4.0.2]: https://github.com/manwaring/lambda-wrapper/compare/v4.0.1...v4.0.2
 [4.0.1]: https://github.com/manwaring/lambda-wrapper/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/manwaring/lambda-wrapper/compare/v3.7.0...v4.0.0

README.md

@@ -25,6 +25,7 @@
     <img src="https://flat.badgen.net/david/dep/manwaring/lambda-wrapper"></a>
   <a href="https://david-dm.org/manwaring/lambda-wrapper?type=dev">
     <img src="https://flat.badgen.net/david/dev/manwaring/lambda-wrapper/?label=dev+dependencies"></a>
+    <img height="0" width="0" src="https://b7z7o7y5fi.execute-api.us-east-1.amazonaws.com/v1/readme/visits/github/manwaring/lambda-wrapper?style=flat-square">
 </p>
 
 # AWS Lambda wrapper library
@@ -1311,6 +1312,3 @@ interface WrapperSignature<T> {
 There is one [working example](examples) of how this package can be used in a simple 'hello world' serverless application:
 
 1. [Using the Serverless Framework and TypeScript](examples/ts)
-
-<img height="0" src="https://b7z7o7y5fi.execute-api.us-east-1.amazonaws.com/v1/readme/visits/github/manwaring/lambda-wrapper?style=flat-square">
-

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@manwaring/lambda-wrapper",
   "description": "A lambda handler wrapper to abstract common functionality and provide useful defaults",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "scripts": {
     "publish-please-dry-run": "publish-please --dry-run",
     "publish-please": "publish-please",

package.json

@@ -17,8 +17,9 @@ export class Request {
     const body = new Body(event.body, headers).getParsedBody();
     const TEST_REQUEST_HEADER = process.env.TEST_REQUEST_HEADER || 'Test-Request';
     const testRequest = headers && headers[TEST_REQUEST_HEADER] ? JSON.parse(headers[TEST_REQUEST_HEADER]) : false;
-    metrics.common({ body, websocket, path, query, auth, headers, testRequest });
-    return { body, websocket, path, query, auth, headers, testRequest };
+    const parsed = { body, websocket, path, query, auth, headers, testRequest };
+    metrics.common(parsed, event);
+    return parsed;
   }
 
   private getAuth() {

src/api/v1/parser.ts

@@ -16,8 +16,9 @@ export class Request {
     const body = new Body(event.body, headers).getParsedBody();
     const TEST_REQUEST_HEADER = process.env.TEST_REQUEST_HEADER || 'Test-Request';
     const testRequest = headers && headers[TEST_REQUEST_HEADER] ? JSON.parse(headers[TEST_REQUEST_HEADER]) : false;
-    metrics.common({ body, path, query, auth, headers, testRequest });
-    return { body, path, query, auth, headers, testRequest };
+    const parsed = { body, path, query, auth, headers, testRequest };
+    metrics.common(parsed, event);
+    return parsed;
   }
 
   private getAuth() {

src/api/v2-http/parser.ts

@@ -3,8 +3,9 @@ import { logger } from './log';
 export class Metrics {
   constructor(private type: string) {}
 
-  common(payload): void {
+  common(parsed: any, original?: any): void {
     const { REVISION, STAGE, AWS_REGION } = process.env;
+    const payload = original ? { original, parsed } : parsed;
     logger.debug(`Received ${this.type} event payload`, payload);
     if (AWS_REGION) {
       logger.info('region', AWS_REGION);

src/common/metrics.ts

@@ -10,7 +10,7 @@ export function sns<T = any>(
 ): (event: SNSEvent, context: Context, callback: Callback) => any {
   return function handler(event: SNSEvent, context: Context, callback: Callback) {
     const message = new SnsParser<T>(event).getMessage();
-    metrics.common(message);
+    metrics.common(message, event);
     return custom({ event, message, success, error });
   };
 }