From 040f501df0018ec9ebadcf8890af44543434fe67 Mon Sep 17 00:00:00 2001 From: djetter-py Date: Thu, 14 Jan 2021 11:50:58 -0500 Subject: [PATCH 1/3] add aws.requestId log message field if lambda_request_id is found --- src/function.py | 3 +++ test/log_ingestion_test.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/function.py b/src/function.py index 9bbe9af..6bd054c 100644 --- a/src/function.py +++ b/src/function.py @@ -452,6 +452,9 @@ def _package_log_payload(data): log_message["attributes"]["aws"][ "lambda_request_id" ] = lambda_request_id + log_message["attributes"]["aws"][ + "requestId" + ] = lambda_request_id log_messages.append(log_message) diff --git a/test/log_ingestion_test.py b/test/log_ingestion_test.py index 4615eef..bf8e7ae 100644 --- a/test/log_ingestion_test.py +++ b/test/log_ingestion_test.py @@ -496,14 +496,19 @@ def test_lambda_request_ids_are_extracted(mock_aio_post): assert len(messages) == 5 assert messages[0]["timestamp"] == timestamp assert messages[0]["attributes"]["aws"]["lambda_request_id"] == expected_request_id + assert messages[0]["attributes"]["aws"]["requestId"] == expected_request_id assert messages[1]["timestamp"] == timestamp assert messages[1]["attributes"]["aws"]["lambda_request_id"] == expected_request_id + assert messages[1]["attributes"]["aws"]["requestId"] == expected_request_id assert messages[2]["timestamp"] == timestamp assert messages[2]["attributes"]["aws"]["lambda_request_id"] == expected_request_id + assert messages[2]["attributes"]["aws"]["requestId"] == expected_request_id assert messages[3]["timestamp"] == timestamp assert messages[3]["attributes"]["aws"]["lambda_request_id"] == expected_request_id + assert messages[3]["attributes"]["aws"]["requestId"] == expected_request_id assert messages[4]["timestamp"] == timestamp - assert messages[4]["attributes"]["aws"]["lambda_request_id"] == expected_request_id2 + assert messages[4]["attributes"]["aws"]["lambda_request_id"] == expected_request_id + assert messages[4]["attributes"]["aws"]["requestId"] == expected_request_id async def aio_post_response(): From 42ce24c0e2a7ed72c521417590e018c5bcd03a97 Mon Sep 17 00:00:00 2001 From: djetter-py Date: Thu, 14 Jan 2021 12:24:16 -0500 Subject: [PATCH 2/3] fix mistake in test expected value reference --- test/log_ingestion_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/log_ingestion_test.py b/test/log_ingestion_test.py index bf8e7ae..ad5c60a 100644 --- a/test/log_ingestion_test.py +++ b/test/log_ingestion_test.py @@ -507,8 +507,8 @@ def test_lambda_request_ids_are_extracted(mock_aio_post): assert messages[3]["attributes"]["aws"]["lambda_request_id"] == expected_request_id assert messages[3]["attributes"]["aws"]["requestId"] == expected_request_id assert messages[4]["timestamp"] == timestamp - assert messages[4]["attributes"]["aws"]["lambda_request_id"] == expected_request_id - assert messages[4]["attributes"]["aws"]["requestId"] == expected_request_id + assert messages[4]["attributes"]["aws"]["lambda_request_id"] == expected_request_id2 + assert messages[4]["attributes"]["aws"]["requestId"] == expected_request_id2 async def aio_post_response(): From 5786ab9775b4d9bf5227dfd7e161b8aa038c17da Mon Sep 17 00:00:00 2001 From: djetter-py Date: Thu, 14 Jan 2021 12:27:04 -0500 Subject: [PATCH 3/3] fix black formatting --- src/function.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/function.py b/src/function.py index 6bd054c..7e117c0 100644 --- a/src/function.py +++ b/src/function.py @@ -452,9 +452,7 @@ def _package_log_payload(data): log_message["attributes"]["aws"][ "lambda_request_id" ] = lambda_request_id - log_message["attributes"]["aws"][ - "requestId" - ] = lambda_request_id + log_message["attributes"]["aws"]["requestId"] = lambda_request_id log_messages.append(log_message)