Fix Itests results order

DataDog · Dec 4, 2023 · 187bd4b · 187bd4b
1 parent 379dd1e
commit 187bd4b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/aws/logs_monitoring/lambda_function.py b/aws/logs_monitoring/lambda_function.py
@@ -329,7 +329,11 @@ def extract_ddtags_from_message(event):
 
         # Extract service tag from message.ddtags if exists
         if "service" in extracted_ddtags:
-            event[DD_SERVICE] = next(tag[8:] for tag in extracted_ddtags.split(",") if tag.startswith("service:"))
+            event[DD_SERVICE] = next(
+                tag[8:]
+                for tag in extracted_ddtags.split(",")
+                if tag.startswith("service:")
+            )
             event[DD_CUSTOM_TAGS] = ",".join(
                 [
                     tag

diff --git a/aws/logs_monitoring/tests/test_lambda_function.py b/aws/logs_monitoring/tests/test_lambda_function.py
@@ -317,9 +317,7 @@ def test_extract_trace_payload_valid_trace(self):
 
 
 class TestMergeMessageTags(unittest.TestCase):
-    message_tags = (
-        '{"ddtags":"service:my_application_service,custom_tag_1:value1"}'
-    )
+    message_tags = '{"ddtags":"service:my_application_service,custom_tag_1:value1"}'
     custom_tags = "custom_tag_2:value2,service:my_custom_service"
 
     def test_extract_ddtags_from_message_str(self):
@@ -361,7 +359,13 @@ def test_extract_ddtags_from_message_dict(self):
 
     def test_extract_ddtags_from_message_service_tag_setting(self):
         loaded_message_tags = json.loads(self.message_tags)
-        loaded_message_tags["ddtags"] = ",".join([tag for tag in loaded_message_tags["ddtags"].split(",") if not tag.startswith("service:")])
+        loaded_message_tags["ddtags"] = ",".join(
+            [
+                tag
+                for tag in loaded_message_tags["ddtags"].split(",")
+                if not tag.startswith("service:")
+            ]
+        )
         event = {
             "message": loaded_message_tags,
             "ddtags": self.custom_tags,

diff --git a/...ogs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot b/...ogs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot
@@ -14,7 +14,7 @@
           },
           "ddsource": "cloudwatch",
           "ddsourcecategory": "aws",
-          "ddtags": "custom_tag1:value1,custom_tag2:value2,forwarder_memorysize:1536,forwarder_version:<redacted from snapshot>,forwardername:test",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:<redacted from snapshot>,custom_tag1:value1,custom_tag2:value2",
           "host": "testLogGroup",
           "id": "eventId1",
           "message": "{\"message\": \"hello world\"}",

diff --git a/...ogs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot b/...ogs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot
@@ -14,7 +14,7 @@
           },
           "ddsource": "cloudwatch",
           "ddsourcecategory": "aws",
-          "ddtags": "forwarder_memorysize:1536,forwarder_version:<redacted from snapshot>,forwardername:test,service:myservice",
+          "ddtags": "forwardername:test,forwarder_memorysize:1536,forwarder_version:<redacted from snapshot>,service:myservice",
           "host": "testLogGroup",
           "id": "eventId1",
           "message": "{\"message\": \"hello world\"}",