fix: Set EMF metrics key correctly

roypat · roypat · commit 9232614d552d · 2023-10-09T13:56:44.000Z
It lives in the "CloudWatchMetrics" subdictionary, not in the "_aws"
root dictionary. This was prevening metrics from showing up in the
correct namespace in the cloudwatch web interface (they were listed
under "local" instead of "PerfTests").

Signed-off-by: Patrick Roy &lt;roypat@amazon.co.uk&gt;
diff --git a/tests/host_tools/metrics.py b/tests/host_tools/metrics.py
@@ -105,7 +105,8 @@ def emit_raw_emf(emf_msg: dict):
         "AWS_EMF_LOG_GROUP_NAME", f"{namespace}-metrics"
     )
     emf_msg["_aws"]["LogStreamName"] = os.environ.get("AWS_EMF_LOG_STREAM_NAME", "")
-    emf_msg["_aws"]["Namespace"] = namespace
+    for metrics in emf_msg["_aws"]["CloudWatchMetrics"]:
+        metrics["Namespace"] = namespace
 
     emf_endpoint = urlparse(os.environ["AWS_EMF_AGENT_ENDPOINT"])
     with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,8 @@ def emit_raw_emf(emf_msg: dict):`
`105`	`105`	`"AWS_EMF_LOG_GROUP_NAME", f"{namespace}-metrics"`
`106`	`106`	`)`
`107`	`107`	`emf_msg["_aws"]["LogStreamName"] = os.environ.get("AWS_EMF_LOG_STREAM_NAME", "")`
`108`		`- emf_msg["_aws"]["Namespace"] = namespace`
	`108`	`+ for metrics in emf_msg["_aws"]["CloudWatchMetrics"]:`
	`109`	`+ metrics["Namespace"] = namespace`
`109`	`110`
`110`	`111`	`emf_endpoint = urlparse(os.environ["AWS_EMF_AGENT_ENDPOINT"])`
`111`	`112`	`with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock:`