Merge pull request #112 from NHSDigital/APM-4693-splunk-logging

Apm 4693 splunk logging

Author: ViniAkshara

.gitignore

@@ -18,5 +18,6 @@ __pycache__/
 .env
 .env*
 .vscode/
+.direnv/
 
 smoketest-report.xml

Makefile

@@ -14,7 +14,7 @@ install: install-node install-python .git/hooks/pre-commit
 
 lint:
 	npm run lint
-	find . -name '*.py' -not -path '**/.venv/*' | xargs poetry run flake8
+	find . -name '*.py' -not -path '**/.venv/*' -not -path '**/.direnv/*'| xargs poetry run flake8
 
 clean:
 	rm -rf build

proxies/live/apiproxy/policies/FlowCallout.LogToSplunk.xml

@@ -4,4 +4,4 @@
     <FaultRules/>
     <Properties/>
     <SharedFlowBundle>LogToSplunk</SharedFlowBundle>
-</FlowCallout>
+</FlowCallout>

tests/test_splunk_logging.py

@@ -56,6 +56,30 @@ def test_splunk_payload_schema(
         # If no exception is raised by validate(), the instance is valid.
         validate(instance=payload, schema=schema)
 
+    def test_splunk_payload_client_sent_timestamp(
+        self,
+        nhsd_apim_auth_headers,
+        nhsd_apim_proxy_url,
+        trace,
+    ):
+        session_name = str(uuid4())
+        header_filters = {"trace_id": session_name}
+        trace.post_debugsession(session=session_name, header_filters=header_filters)
+
+        requests.get(
+            url=f"{nhsd_apim_proxy_url}/splunk-test",
+            headers={**nhsd_apim_auth_headers, **header_filters},
+        )
+
+        payload = json.loads(
+            get_variable_from_trace(trace, session_name, "splunkCalloutRequest.content")
+        )
+
+        trace.delete_debugsession_by_name(session_name)
+
+        assert int(payload["client"]["sent_start"]) > 0
+        assert int(payload["client"]["sent_end"]) > 0
+
     def test_splunk_payload_schema_open_access(
         self,
         nhsd_apim_proxy_url,