diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot index 9d7b520ad..a76f33504 100644 --- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot +++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log.json~snapshot @@ -19,7 +19,7 @@ "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", "ddsource": "cloudwatch", "service": "cloudwatch", "host": "testLogGroup" @@ -38,7 +38,7 @@ "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:", "ddsource": "cloudwatch", "service": "cloudwatch", "host": "testLogGroup" diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_coldstart.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_coldstart.json~snapshot index a8289324f..40d4661de 100644 --- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_coldstart.json~snapshot +++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_coldstart.json~snapshot @@ -22,7 +22,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" @@ -44,7 +44,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" @@ -66,7 +66,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_custom_tags.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_custom_tags.json~snapshot index 70281ee35..49ed4988d 100644 --- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_custom_tags.json~snapshot +++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_custom_tags.json~snapshot @@ -19,7 +19,7 @@ "invoked_function_arn": "arn:aws:lambda:us-east-1:0:function:test" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,custom_tag1:value1,custom_tag2:value2", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,custom_tag1:value1,custom_tag2:value2", "ddsource": "cloudwatch", "service": "cloudwatch", "host": "testLogGroup" diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot index cf052d6a9..9e3c64dc3 100644 --- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot +++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot @@ -22,7 +22,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -44,7 +44,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -66,7 +66,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -88,7 +88,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -110,7 +110,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -132,7 +132,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -154,7 +154,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -176,7 +176,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -198,7 +198,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -220,7 +220,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -242,7 +242,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -264,7 +264,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -286,7 +286,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -308,7 +308,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -330,7 +330,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -352,7 +352,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:hello-dog-node-dev-hello12x,region:us-east-1,service:hello-dog-node-dev-hello12x", "ddsource": "lambda", "service": "hello-dog-node-dev-hello12x", "host": "arn:aws:lambda:us-east-1:0:function:hello-dog-node-dev-hello12x" @@ -370,6 +370,124 @@ "verb": "POST", "content-type": "application/json", "data": null + }, + { + "path": "/api/v1/distribution_points?api_key=abcdefghijklmnopqrstuvwxyz012345", + "verb": "POST", + "content-type": "application/json", + "data": { + "series": [ + { + "metric": "aws.lambda.enhanced.invocations", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "region:us-east-1", + "account_id:601427279990", + "functionname:hello-dog-node-dev-hello12x", + "cold_start:false", + "memorysize:128", + "runtime:nodejs12.x", + "forwardername:test", + "forwarder_memorysize:1536", + "forwarder_version:", + "env:none", + "account_id:0", + "aws_account:0", + "functionname:hello-dog-node-dev-hello12x", + "region:us-east-1", + "service:hello-dog-node-dev-hello12x" + ], + "interval": 10 + }, + { + "metric": "hello.js10x.dog-2", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "dd_lambda_layer:datadog-nodev12.14.1", + "forwardername:test", + "forwarder_memorysize:1536", + "forwarder_version:", + "env:none", + "account_id:0", + "aws_account:0", + "functionname:hello-dog-node-dev-hello12x", + "region:us-east-1", + "service:hello-dog-node-dev-hello12x" + ], + "interval": 10 + }, + { + "metric": "aws.lambda.enhanced.duration", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "memorysize:128", + "cold_start:false", + "region:us-east-1", + "account_id:0", + "aws_account:0", + "functionname:hello-dog-node-dev-hello12x" + ], + "interval": 10 + }, + { + "metric": "aws.lambda.enhanced.billed_duration", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "memorysize:128", + "cold_start:false", + "region:us-east-1", + "account_id:0", + "aws_account:0", + "functionname:hello-dog-node-dev-hello12x" + ], + "interval": 10 + }, + { + "metric": "aws.lambda.enhanced.max_memory_used", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "memorysize:128", + "cold_start:false", + "region:us-east-1", + "account_id:0", + "aws_account:0", + "functionname:hello-dog-node-dev-hello12x" + ], + "interval": 10 + }, + { + "metric": "aws.lambda.enhanced.estimated_cost", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "memorysize:128", + "cold_start:false", + "region:us-east-1", + "account_id:0", + "aws_account:0", + "functionname:hello-dog-node-dev-hello12x" + ], + "interval": 10 + } + ] + } } ] } \ No newline at end of file diff --git a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_timeout.json~snapshot b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_timeout.json~snapshot index 846e551a3..ba2258f09 100644 --- a/aws/logs_monitoring/tests/snapshots/cloudwatch_log_timeout.json~snapshot +++ b/aws/logs_monitoring/tests/snapshots/cloudwatch_log_timeout.json~snapshot @@ -22,7 +22,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" @@ -44,7 +44,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" @@ -66,7 +66,7 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" @@ -88,12 +88,35 @@ "arn": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" }, "ddsourcecategory": "aws", - "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:x.x.x,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", + "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:,env:none,account_id:0,aws_account:0,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event", "ddsource": "lambda", "service": "storms-cloudwatch-event", "host": "arn:aws:lambda:us-east-1:0:function:storms-cloudwatch-event" } ] + }, + { + "path": "/api/v1/distribution_points?api_key=abcdefghijklmnopqrstuvwxyz012345", + "verb": "POST", + "content-type": "application/json", + "data": { + "series": [ + { + "metric": "aws.lambda.enhanced.timeouts", + "points": "", + "type": "distribution", + "host": null, + "device": null, + "tags": [ + "region:us-east-1", + "account_id:0", + "aws_account:0", + "functionname:storms-cloudwatch-event" + ], + "interval": 10 + } + ] + } } ] } \ No newline at end of file diff --git a/aws/logs_monitoring/tools/Dockerfile_integration b/aws/logs_monitoring/tools/Dockerfile_integration index 1402a4ec8..146d5baff 100644 --- a/aws/logs_monitoring/tools/Dockerfile_integration +++ b/aws/logs_monitoring/tools/Dockerfile_integration @@ -5,6 +5,3 @@ ARG forwarder # Add the code into /var/task (will unzip files) ADD $forwarder /var/task/ - -ENV DD_API_KEY "fake-api-key" -ENV DD_SITE "datadog.com" diff --git a/aws/logs_monitoring/tools/docker-compose.yml b/aws/logs_monitoring/tools/docker-compose.yml index 98a549a90..ed86e1d69 100644 --- a/aws/logs_monitoring/tools/docker-compose.yml +++ b/aws/logs_monitoring/tools/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: forwarder: image: datadog-log-forwarder:${PYTHON_RUNTIME:-python3.7} - command: lambda_function.datadog_forwarder + command: lambda_function.lambda_handler environment: AWS_ACCOUNT_ID: 0000000000 DOCKER_LAMBDA_STAY_OPEN: 1 @@ -11,6 +11,7 @@ services: DD_API_KEY: abcdefghijklmnopqrstuvwxyz012345 # Must be 32 characters exactly DD_URL: forwarder-recorder # Used for logs intake DD_PORT: 8080 # API port to use + DD_SITE: datadog.com DD_API_URL: http://forwarder-recorder:8080 DD_LOGS_INTAKE_URL: forwarder-recorder:8080 DD_TRACE_INTAKE_URL: http://forwarder-recorder:8080 diff --git a/aws/logs_monitoring/tools/test_harness/recorder/recorder.py b/aws/logs_monitoring/tools/test_harness/recorder/recorder.py index 493fc8b86..988a8b84b 100755 --- a/aws/logs_monitoring/tools/test_harness/recorder/recorder.py +++ b/aws/logs_monitoring/tools/test_harness/recorder/recorder.py @@ -12,7 +12,7 @@ class RecorderHandler(BaseHTTPRequestHandler): def __init__(self, request, client_address, server): - super().__init__(request, client_address, server)() + super().__init__(request, client_address, server) def handle_request(self): global events @@ -52,7 +52,6 @@ def handle_request(self): self.wfile.write(response.encode("utf-8")) return - # Handler for the GET requests def do_GET(self): self.handle_request() diff --git a/aws/logs_monitoring/tools/test_harness/tests/test_snapshots.py b/aws/logs_monitoring/tools/test_harness/tests/test_snapshots.py index dea0af027..f6ce81fd3 100644 --- a/aws/logs_monitoring/tools/test_harness/tests/test_snapshots.py +++ b/aws/logs_monitoring/tools/test_harness/tests/test_snapshots.py @@ -1,9 +1,11 @@ import unittest import base64 import os -import urllib.request, json +import urllib.request +import json import re import gzip +from time import sleep recorder_url = os.environ.get("RECORDER_URL", default="") forwarder_url = os.environ.get("FORWARDER_URL", default="") @@ -20,7 +22,7 @@ class TestForwarderSnapshots(unittest.TestCase): def get_recording(self): with urllib.request.urlopen(recorder_url) as url: - message = self.filter_message(url.read().decode()) + message = self.filter_snapshot(url.read().decode()) data = json.loads(message) return data @@ -35,11 +37,22 @@ def send_log_event(self, event): request = urllib.request.Request(forwarder_url, data=event.encode("utf-8")) urllib.request.urlopen(request) - def filter_message(self, message): - # Remove forwarder_version from output - return re.sub( - r"forwarder_version:\d+\.\d+\.\d+", "forwarder_version:x.x.x", message + def filter_snapshot(self, snapshot): + # Remove things that can vary during each test run + # forwarder_version + snapshot = re.sub( + r"forwarder_version:\d+\.\d+\.\d+", + "forwarder_version:", + snapshot, ) + # Metric points + snapshot = re.sub( + r"\"points\":.*?,(?=\s*\")", + '"points": "",', + snapshot, + flags=re.MULTILINE, + ) + return snapshot def compare_snapshot(self, input_filename, snapshot_filename): with open(input_filename, "r") as input_file: