Revert "feat(logger): add context decorator functionality (#13)"

This reverts commit 18f1097.

Author: saragerion

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "commit": "commit",
     "lerna-ci": "lerna exec -- npm ci",
-    "lerna-test": "lerna exec -- npm run test",
+    "lerna-test": "lerna exec -- jest --coverage  --detectOpenHandles",
     "lerna-build": "lerna exec -- tsc",
     "lerna-lint": "lerna exec -- eslint \"./{src,tests}/**/*.ts\"",
     "lerna-format": "lerna exec -- eslint --fix \"./{src,tests}/**/*.ts\"",

packages/logger/README.md

@@ -50,8 +50,6 @@ logger.error('This is an ERROR log');
 
 ### Capturing Lambda context info
 
-Without decorators:
-
 ```typescript
 // Environment variables set for the Lambda
 process.env.LOG_LEVEL = 'WARN';
@@ -109,51 +107,6 @@ const lambdaHandler: Handler = async (event, context) => {
 </details>
 
 
-With decorators:
-
-```typescript
-// Environment variables set for the Lambda
-process.env.LOG_LEVEL = 'INFO';
-process.env.POWERTOOLS_SERVICE_NAME = 'hello-world';
-
-const logger = new Logger();
-
-class Lambda implements LambdaInterface {
-
-  @logger.injectLambdaContext()
-  public handler<TEvent, TResult>(_event: TEvent, _context: Context, _callback: Callback<TResult>): void | Promise<TResult> {
-
-    logger.info('This is an INFO log with some context');
-
-  }
-
-}
-
-new Lambda().handler(dummyEvent, dummyContext, () => console.log('Lambda invoked!'));
-
-```
-
-<details>
- <summary>Click to expand and see the logs outputs</summary>
-
-```bash
-
-{
-  aws_request_id: 'c6af9ac6-7b61-11e6-9a41-93e8deadbeef',
-  lambda_function_arn: 'arn:aws:lambda:eu-central-1:123456789012:function:Example',
-  lambda_function_memory_size: 128,
-  lambda_function_name: 'foo-bar-function',
-  level: 'INFO',
-  message: 'This is an INFO log with some context',
-  service: 'hello-world',
-  timestamp: '2021-03-17T08:25:41.198Z',
-  xray_trace_id: 'abcdef123456abcdef123456abcdef123456'
-}
-
-```
-</details>
-
-
 ### Appending additional keys
 
 ```typescript

packages/logger/examples/child-logger.ts

@@ -30,4 +30,4 @@ const lambdaHandler: Handler = async () => {
 
 };
 
-lambdaHandler(dummyEvent, dummyContext, () => console.log('Lambda invoked!'));
+lambdaHandler(dummyEvent, dummyContext, () => {});

packages/logger/examples/hello-world-with-context-decorators.ts

@@ -30,4 +30,4 @@ const lambdaHandler: Handler = async () => {
 
 };
 
-lambdaHandler(dummyEvent, dummyContext, () => console.log('lambda invoked!'));
+lambdaHandler(dummyEvent, dummyContext, () => console.log('Lambda invoked!'));

packages/logger/examples/sample-rate.ts

@@ -22,10 +22,10 @@ module.exports = {
   ],
   'coverageThreshold': {
     'global': {
-      'statements': 100,
-      'branches': 100,
-      'functions': 100,
-      'lines': 100,
+      'statements': 70,
+      'branches': 60,
+      'functions': 70,
+      'lines': 70,
     },
   },
   'coverageReporters': [

packages/logger/jest.config.js

@@ -8,7 +8,7 @@
   },
   "scripts": {
     "commit": "commit",
-    "test": "jest  --detectOpenHandles",
+    "test": "jest --coverage  --detectOpenHandles",
     "watch": "jest --watch",
     "build": "tsc",
     "lint": "eslint \"./{src,tests}/**/*.ts\"",

packages/logger/package.json

@@ -1,4 +1,3 @@
-import { context as dummyContext } from '../../../../tests/resources/contexts/hello-world';
 import { Logger } from '../../src';
 import { populateEnvironmentVariables } from '../helpers';
 
@@ -56,13 +55,8 @@ describe('Logger', () => {
 
     logger.error('foo');
     logger.error('foo', { bar: 'baz' });
-    logger.error({ bar: 'baz', message: 'foo' });
 
-    const error = new Error('Something happened!');
-    error.stack = 'A custom stack trace';
-    logger.error('foo', { bar: 'baz' }, error);
-
-    expect(console.log).toBeCalledTimes(4);
+    expect(console.log).toBeCalledTimes(2);
     expect(console.log).toHaveBeenNthCalledWith(1, {
       message: 'foo',
       service: 'hello-world',
@@ -78,27 +72,6 @@ describe('Logger', () => {
       timestamp: '2016-06-20T12:08:10.000Z',
       xray_trace_id: 'abcdef123456abcdef123456abcdef123456'
     });
-    expect(console.log).toHaveBeenNthCalledWith(3, {
-      bar: 'baz',
-      message: 'foo',
-      service: 'hello-world',
-      level: 'ERROR',
-      timestamp: '2016-06-20T12:08:10.000Z',
-      xray_trace_id: 'abcdef123456abcdef123456abcdef123456'
-    });
-    expect(console.log).toHaveBeenNthCalledWith(4, {
-      bar: 'baz',
-      error: {
-        message: 'Something happened!',
-        name: 'Error',
-        stack: 'A custom stack trace',
-      },
-      message: 'foo',
-      service: 'hello-world',
-      level: 'ERROR',
-      timestamp: '2016-06-20T12:08:10.000Z',
-      xray_trace_id: 'abcdef123456abcdef123456abcdef123456'
-    });
   });
 
   test('should return a valid DEBUG log', () => {
@@ -152,44 +125,5 @@ describe('Logger', () => {
 
   });
 
-  test('should return a valid INFO log with context enabled', () => {
-
-    const logger = new Logger({
-      isContextEnabled: true
-    });
-    logger.addContext(dummyContext);
-
-    logger.info('foo');
-    logger.info( { message: 'foo', bar: 'baz' });
-
-    expect(console.log).toBeCalledTimes(2);
-    expect(console.log).toHaveBeenNthCalledWith(1, {
-      'aws_request_id': 'c6af9ac6-7b61-11e6-9a41-93e8deadbeef',
-      'cold_start': true,
-      'lambda_function_arn': 'arn:aws:lambda:eu-central-1:123456789012:function:Example',
-      'lambda_function_memory_size': 128,
-      'lambda_function_name': 'foo-bar-function',
-      'level': 'INFO',
-      'message': 'foo',
-      'service': 'hello-world',
-      'timestamp': '2016-06-20T12:08:10.000Z',
-      'xray_trace_id': 'abcdef123456abcdef123456abcdef123456'
-    });
-    expect(console.log).toHaveBeenNthCalledWith(2, {
-      'aws_request_id': 'c6af9ac6-7b61-11e6-9a41-93e8deadbeef',
-      'bar': 'baz',
-      'cold_start': true,
-      'lambda_function_arn': 'arn:aws:lambda:eu-central-1:123456789012:function:Example',
-      'lambda_function_memory_size': 128,
-      'lambda_function_name': 'foo-bar-function',
-      'level': 'INFO',
-      'message': 'foo',
-      'service': 'hello-world',
-      'timestamp': '2016-06-20T12:08:10.000Z',
-      'xray_trace_id': 'abcdef123456abcdef123456abcdef123456'
-    });
-
-  });
-
 });
 

packages/logger/src/lambda/LambdaInterface.ts

@@ -1,6 +1,5 @@
 {
     "compilerOptions": {
-        "experimentalDecorators": true,
         "noImplicitAny": true,
         "target": "ES2020",
         "module": "commonjs",

packages/logger/src/lambda/index.ts

@@ -3,7 +3,7 @@ type LogLevelInfo = 'INFO';
 type LogLevelWarn = 'WARN';
 type LogLevelError = 'ERROR';
 
-type LogLevel = LogLevelDebug | LogLevelInfo | LogLevelWarn | LogLevelError | string;
+type LogLevel = LogLevelDebug | LogLevelInfo | LogLevelWarn | LogLevelError;
 
 type LogLevelThresholds = {
   [key in LogLevel]: number;

packages/logger/tests/unit/Logger.test.ts

@@ -1,4 +1,4 @@
-import { LogAttributes, LogLevel } from '..';
+import { LogAttributes, LogLevel } from '../Log';
 
 type PowertoolLog = LogAttributes & {