APM-4118 Test for headers being logged as object

Author: acarriedev

tests/test_splunk_logging.py

@@ -383,8 +383,6 @@ def test_splunk_deny_list_headers_not_logged(
         content = payload[message_type]
         assert content["headers"]
 
-        headers = json.loads(content["headers"])
-
         deny_list = [
             "Accept-Coding",
             "Accept-Language",
@@ -394,7 +392,7 @@ def test_splunk_deny_list_headers_not_logged(
             "Strict-Transport-Security",
         ]
         for denied_header in deny_list:
-            assert denied_header not in headers
+            assert denied_header not in content["headers"]
 
     @pytest.mark.nhsd_apim_authorization(
         access="application", level="level3", force_new_token=True
@@ -464,10 +462,8 @@ def test_splunk_headers_already_logged_not_duplicated(
         content = payload[message_type]
         assert content["headers"]
 
-        headers = json.loads(content["headers"])
-
         for logged_header in headers_already_logged:
-            assert logged_header["header_name"] not in headers
+            assert logged_header["header_name"] not in content["headers"]
             assert content[logged_header["splunk_key"]] is not None
 
     @pytest.mark.nhsd_apim_authorization(
@@ -503,7 +499,7 @@ def test_splunk_request_headers_not_overwritten_in_proxy(
         content = splunk_payload["request"]
         assert content["headers"]
 
-        headers = json.loads(content["headers"])
+        headers = content["headers"]
 
         assert headers["Test-Header-One"] == "foo bar bar foo"
         assert headers["Test-Header-Two"] == "bar foo foo bar"

tests/utils/splunk_logging_schema.json

@@ -44,7 +44,7 @@
       "type": "object",
       "properties": {
         "headers": {
-          "type": "string"
+          "type": "object"
         },
         "uri": {
           "type": "string"
@@ -340,7 +340,7 @@
       "type": "object",
       "properties": {
         "headers": {
-          "type": "string"
+          "type": "object"
         },
         "status_code": {
           "type": "string",