diff --git a/app/notify_client/__init__.py b/app/notify_client/__init__.py index f2f1e922d..e47930a09 100644 --- a/app/notify_client/__init__.py +++ b/app/notify_client/__init__.py @@ -38,6 +38,7 @@ class NotifyAdminAPIClient(BaseAPIClient): if not has_request_context(): return headers headers['X-B3-TraceId'] = request.request_id + headers['X-B3-SpanId'] = request.span_id return headers def check_inactive_service(self): diff --git a/tests/app/notify_client/test_notify_admin_api_client.py b/tests/app/notify_client/test_notify_admin_api_client.py index 6b031a380..4082647b0 100644 --- a/tests/app/notify_client/test_notify_admin_api_client.py +++ b/tests/app/notify_client/test_notify_admin_api_client.py @@ -99,6 +99,7 @@ def test_generate_headers_sets_request_id_if_in_request_context(app_): headers = api_client.generate_headers('api_token') assert set(headers.keys()) == { - 'Authorization', 'Content-type', 'User-agent', 'X-Custom-Forwarder', 'X-B3-TraceId' + 'Authorization', 'Content-type', 'User-agent', 'X-Custom-Forwarder', 'X-B3-TraceId', 'X-B3-SpanId', } assert headers['X-B3-TraceId'] == request_context.request.request_id + assert headers['X-B3-SpanId'] == request_context.request.span_id