redact dd-api-key (#307)

* redact dd-api-key

* fix flaky test_cold_start

Author: joeyzhao2018

scripts/run_integration_tests.sh

@@ -187,14 +187,15 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
                 sed '/^$/d' |
                 # Normalize Lambda runtime REPORT logs
                 sed -E 's/(RequestId|TraceId|SegmentId|Duration|init|Memory Used|"e"): [a-z0-9\.\-]+/\1: XXXX/g' |
+                sed -E 's/(python:3.[0-9]+\.v)[0-9]+/\1X/g' |
                 # Normalize HTTP headers
                 sed -E "s/(x-datadog-parent-id:|x-datadog-trace-id:|Content-Length:)[0-9]+/\1XXXX/g" |
                 # Remove Account ID
                 sed -E "s/(account_id:)[0-9]+/\1XXXX/g" |
                 # Normalize timestamps in datapoints POSTed to DD
                 sed -E 's/"points": \[\[[0-9\.]+,/"points": \[\[XXXX,/g' |
                 # Strip API key from logged requests
-                sed -E "s/(api_key=|'api_key': ')[a-z0-9\.\-]+/\1XXXX/g" |
+                sed -E "s/(api_key=|'api_key': '|DD-API-KEY:)[a-z0-9\.\-]+/\1XXXX/g" |
                 # Normalize package version so that these snapshots aren't broken on version bumps
                 sed -E "s/(dd_lambda_layer:datadog-python[0-9]+_)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
                 sed -E "s/(datadog_lambda:v)([0-9]+\.[0-9]+\.[0-9])/\1XX/g" |

tests/integration/snapshots/logs/async-metrics_python37.log

@@ -1,4 +1,4 @@
-INIT_START Runtime Version: python:3.7.v22	Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
+INIT_START Runtime Version: python:3.7.vX	Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
 START
 {
   "m": "aws.lambda.enhanced.invocations",

tests/integration/snapshots/logs/async-metrics_python38.log

@@ -1,4 +1,4 @@
-INIT_START Runtime Version: python:3.8.v15	Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
+INIT_START Runtime Version: python:3.8.vX	Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
 START
 {
   "m": "aws.lambda.enhanced.invocations",

tests/integration/snapshots/logs/async-metrics_python39.log

@@ -1,4 +1,4 @@
-INIT_START Runtime Version: python:3.9.v16	Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
+INIT_START Runtime Version: python:3.9.vX	Runtime Version ARN: arn:aws:lambda:eu-west-1:XXXX:eu-west-1
 START
 {
   "m": "aws.lambda.enhanced.invocations",

tests/integration/snapshots/logs/sync-metrics_python37.log

@@ -66,9 +66,11 @@ def find_spec(*args, **kwargs):
             import dummy_module
         except Exception as e:
             self.assertEqual(str(e), "Module failed to load")
-        self.assertEqual(len(cold_start.root_nodes), 1)
+        meta_path.pop(0)  # clean up first before checking test results
+        self.assertEqual(
+            len(cold_start.root_nodes), 1
+        )  # push_node should have pushed the node
         self.assertEqual(cold_start.root_nodes[0].module_name, mock_module_spec.name)
-        meta_path.pop(0)
 
 
 class TestColdStartTracer(unittest.TestCase):