Merge remote-tracking branch 'origin/master' into gaetan.deputier/disable-ssl-validation-lambda

Author: gaetan-deputier

aws/logs_monitoring/README.md

@@ -140,13 +140,13 @@ If the `DD_FETCH_LAMBDA_TAGS` env variable is set to `true` then the log forward
 
 To configure your function:
 
-1. Set the memory to 1024 MB.s
+1. Set the memory to 1024 MB.
 2. Also set the timeout limit. 120 seconds is recommended to deal with big files.
-3. Hit the `Save and Test` button.
+3. Hit the `Save` button.
 
 ### 6. Test it
 
-If the test "succeeded", you are all set! The test log doesn't show up in the platform.
+Hit the `Test` button, and select `CloudWatch Logs` as the sample event. If the test "succeeded", you are all set! The test log doesn't show up in the platform.
 
 **Note**: For S3 logs, there may be some latency between the time a first S3 log file is posted and the Lambda function wakes up.
 

aws/logs_monitoring/lambda_function.py

@@ -829,7 +829,11 @@ def awslogs_handler(event, context, metadata):
  # Default `env` to `none` and `service` to the function name,
  # for correlation with the APM env and service.
  metadata[DD_SERVICE] = function_name
- metadata[DD_CUSTOM_TAGS] += ",env:none"
+
+ env_tag_exists = metadata[DD_CUSTOM_TAGS].startswith('env:') or ',env:' in metadata[DD_CUSTOM_TAGS]
+ # If there is no env specified, default to env:none
+ if not env_tag_exists:
+ metadata[DD_CUSTOM_TAGS] += ",env:none"
 
  # Create and send structured logs to Datadog
  for log in logs["logEvents"]: