Merge pull request #101 from jimmyn/feat/lambda-logging-config

feat(AWS Lambda): Support advanced logging configuration

Author: mnapoli

docs/guides/functions.md

@@ -873,6 +873,33 @@ functions:
     ephemeralStorageSize: 1024
 ```
 
+## Logging Configuration
+
+[Configuring Lambda advanced logging options](https://docs.aws.amazon.com/lambda/latest/dg/monitoring-cloudwatchlogs.html#monitoring-cloudwatchlogs-advanced)
+
+This can be configured at the provider level (applies to all functions) or individually per function:
+
+```yml
+# Provider-level configuration (applies to all functions)
+provider:
+  logs:
+    lambda:
+      logFormat: JSON
+      applicationLogLevel: INFO
+      systemLogLevel: WARN
+      logGroup: /aws/lambda/global-log-group
+
+# Function-level configuration (overrides provider settings)
+functions:
+  helloLogging:
+    handler: handler.handler
+    logs:
+      applicationLogLevel: DEBUG
+      logFormat: JSON
+      logGroup: helloLoggingLogGroup
+      systemLogLevel: DEBUG
+```
+
 ## Lambda Hashing Algorithm migration
 
 **Note** Below migration guide is intended to be used if you are already using `v3` version of the Framework and you have `provider.lambdaHashingVersion` property set to `20200924` in your configuration file. If you are still on v2 and want to upgrade to v3, please refer to [V3 Upgrade docs](../../../guides/upgrading-v3.md#lambda-hashing-algorithm).

docs/guides/serverless.yml.md

@@ -517,6 +517,17 @@ Configure logs for the deployed resources:
 ```yml
 provider:
   logs:
+    # Optional Configuration of Lambda Logging Configuration
+    lambda:
+      # The Log Format to be used for all lambda functions (default: Text)
+      logFormat: JSON
+      # The Application Log Level to be used, This can only be set if `logFormat` is set to `JSON`
+      applicationLogLevel: ERROR
+      # The System Log Level to be used, This can only be set if `logFormat` is set to `JSON`
+      systemLogLevel: INFO
+      # The LogGroup that will be used by default. If this is set the Framework will not create LogGroups for any functions
+      logGroup: /aws/lambda/global-log-group
+
     # Enable HTTP API logs
     # This can either be set to `httpApi: true` to use defaults, or configured via subproperties
     # Can only be configured if the API is created by Serverless Framework
@@ -722,6 +733,12 @@ functions:
     maximumRetryAttempts: 1
     # Maximum event age in seconds when invoking asynchronously (between 60 and 21600)
     maximumEventAge: 7200
+    # Configuring Lambda advanced logging options
+    logs:
+      applicationLogLevel: DEBUG
+      logFormat: JSON
+      logGroup: helloLoggingLogGroup
+      systemLogLevel: DEBUG
 ```
 
 ## Lambda events

lib/plugins/aws/package/compile/functions.js

@@ -632,6 +632,34 @@ class AwsCompileFunctions {
       }
     }
 
+    const logs =
+      functionObject.logs ||
+      (this.serverless.service.provider.logs && this.serverless.service.provider.logs.lambda);
+
+    if (logs) {
+      const loggingConfig = {};
+
+      if (logs.applicationLogLevel) {
+        loggingConfig.ApplicationLogLevel = logs.applicationLogLevel;
+      }
+
+      if (logs.logFormat) {
+        loggingConfig.LogFormat = logs.logFormat;
+      }
+
+      if (logs.logGroup) {
+        loggingConfig.LogGroup = logs.logGroup;
+      }
+
+      if (logs.systemLogLevel) {
+        loggingConfig.SystemLogLevel = logs.systemLogLevel;
+      }
+
+      if (Object.keys(loggingConfig).length) {
+        functionResource.Properties.LoggingConfig = loggingConfig;
+      }
+    }
+
     this.compileFunctionUrl(functionName);
     this.compileFunctionEventInvokeConfig(functionName);
   }

lib/plugins/aws/provider.js

@@ -1231,6 +1231,19 @@ class AwsProvider {
                     },
                   ],
                 },
+                lambda: {
+                  type: 'object',
+                  properties: {
+                    applicationLogLevel: {
+                      type: 'string',
+                      enum: ['DEBUG', 'ERROR', 'FATAL', 'INFO', 'TRACE', 'WARN'],
+                    },
+                    logFormat: { type: 'string', enum: ['JSON', 'Text'] },
+                    logGroup: { type: 'string', pattern: '^[.\\-_/#A-Za-z0-9]{1,512}$' },
+                    systemLogLevel: { type: 'string', enum: ['DEBUG', 'INFO', 'WARN'] },
+                  },
+                  additionalProperties: false,
+                },
               },
             },
             memorySize: { $ref: '#/definitions/awsLambdaMemorySize' },
@@ -1401,6 +1414,19 @@ class AwsProvider {
             disableLogs: { type: 'boolean' },
             environment: { $ref: '#/definitions/awsLambdaEnvironment' },
             ephemeralStorageSize: { type: 'integer', minimum: 512, maximum: 10240 },
+            logs: {
+              type: 'object',
+              properties: {
+                applicationLogLevel: {
+                  type: 'string',
+                  enum: ['DEBUG', 'ERROR', 'FATAL', 'INFO', 'TRACE', 'WARN'],
+                },
+                logFormat: { type: 'string', enum: ['JSON', 'Text'] },
+                logGroup: { type: 'string', pattern: '^[.\\-_/#A-Za-z0-9]{1,512}$' },
+                systemLogLevel: { type: 'string', enum: ['DEBUG', 'INFO', 'WARN'] },
+              },
+              additionalProperties: false,
+            },
             fileSystemConfig: {
               type: 'object',
               properties: {