Parse data out of input events to include in responses

Author: swfunc

scripts/run_integration_tests.sh

@@ -24,8 +24,6 @@ script_start_time=$(date --iso-8601=seconds)
 
 mismatch_found=false
 
-echo "Start time is $script_start_time"
-
 if [ -z "$DD_API_KEY" ]; then
     echo "No DD_API_KEY env var set, exiting"
     exit 1

tests/integration/handle.py

@@ -6,8 +6,29 @@
 
 @datadog_lambda_wrapper
 def handle(event, context):
+    # Parse request ID and record ids out of the event to include in the response
+    request_id = event.get("requestContext", {}).get("requestId")
+    event_records = event.get("Records", [])
+
+    record_ids = []
+    for record in event_records:
+        # SQS
+        if record.get("messageId"):
+            record_ids.append(record["messageId"])
+        # SNS
+        if record.get("Sns", {}).get("MessageId"):
+            record_ids.append(record["Sns"]["MessageId"])
+
     lambda_metric("hello.dog", 1, tags=["team:serverless", "role:hello"])
     lambda_metric(
         "tests.integration.count", 21, tags=["test:integration", "role:hello"]
     )
-    return {"statusCode": 200, "body": "hello, dog!"}
+
+    return {
+        "statusCode": 200,
+        "body": {
+            "message": "hello, dog!",
+            "request_id": request_id,
+            "event_record_ids": record_ids,
+        },
+    }

tests/integration/http_requests.py

@@ -15,4 +15,4 @@ def handle(event, context):
     us_response = requests.get("https://ip-ranges.datadoghq.com/")
     eu_response = requests.get("https://ip-ranges.datadoghq.eu/")
 
-    return {"statusCode": 200, "body": "hello, dog!"}
+    return {"statusCode": 200, "body": {"message": "hello, dog!"}}

tests/integration/snapshots/return_values/async-metrics_python27_api-gateway-get.json

@@ -1,4 +1,8 @@
 {
-    "body": "hello, dog!",
+    "body": {
+        "message": "hello, dog!",
+        "event_record_ids": [],
+        "request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9"
+    },
     "statusCode": 200
 }

tests/integration/snapshots/return_values/async-metrics_python27_sns.json

@@ -1,4 +1,10 @@
 {
-    "body": "hello, dog!",
+    "body": {
+        "message": "hello, dog!",
+        "event_record_ids": [
+            "95df01b4-ee98-5cb9-9903-4c221d41eb5e"
+        ],
+        "request_id": null
+    },
     "statusCode": 200
 }

tests/integration/snapshots/return_values/async-metrics_python27_sqs.json

@@ -1,4 +1,11 @@
 {
-    "body": "hello, dog!",
+    "body": {
+        "message": "hello, dog!",
+        "event_record_ids": [
+            "059f36b4-87a3-44ab-83d2-661975830a7d",
+            "2e1424d4-f796-459a-8184-9c92662be6da"
+        ],
+        "request_id": null
+    },
     "statusCode": 200
 }

tests/integration/snapshots/return_values/async-metrics_python36_api-gateway-get.json

@@ -1,4 +1,8 @@
 {
     "statusCode": 200,
-    "body": "hello, dog!"
+    "body": {
+        "message": "hello, dog!",
+        "request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
+        "event_record_ids": []
+    }
 }

tests/integration/snapshots/return_values/async-metrics_python36_sns.json

@@ -1,4 +1,10 @@
 {
     "statusCode": 200,
-    "body": "hello, dog!"
+    "body": {
+        "message": "hello, dog!",
+        "request_id": null,
+        "event_record_ids": [
+            "95df01b4-ee98-5cb9-9903-4c221d41eb5e"
+        ]
+    }
 }

tests/integration/snapshots/return_values/async-metrics_python36_sqs.json

@@ -1,4 +1,11 @@
 {
     "statusCode": 200,
-    "body": "hello, dog!"
+    "body": {
+        "message": "hello, dog!",
+        "request_id": null,
+        "event_record_ids": [
+            "059f36b4-87a3-44ab-83d2-661975830a7d",
+            "2e1424d4-f796-459a-8184-9c92662be6da"
+        ]
+    }
 }

tests/integration/snapshots/return_values/async-metrics_python37_api-gateway-get.json

@@ -1,4 +1,8 @@
 {
     "statusCode": 200,
-    "body": "hello, dog!"
+    "body": {
+        "message": "hello, dog!",
+        "request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
+        "event_record_ids": []
+    }
 }