Merge pull request DataDog#175 from DataDog/stephenf/only-add-env-none-if-no-env-set

Only add env:none tag to logs if no env tag is set

Author: swfunc

aws/logs_monitoring/lambda_function.py

@@ -250,7 +250,7 @@ def compileRegex(rule, pattern):
 DD_CUSTOM_TAGS = "ddtags"
 DD_SERVICE = "service"
 DD_HOST = "host"
-DD_FORWARDER_VERSION = "2.3.0"
+DD_FORWARDER_VERSION = "2.3.1"
 
 class RetriableException(Exception):
  pass
@@ -822,7 +822,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"]: