From 6786ff8fde25da33a50a21d7bab6eb9fc9ed4946 Mon Sep 17 00:00:00 2001 From: Athanasios Voutsadakis Date: Tue, 14 Aug 2018 12:00:23 +0100 Subject: [PATCH] Use the zipkin headers from utils version 30.0.0 --- app/notify_client/__init__.py | 2 +- requirements-app.txt | 2 +- requirements.txt | 2 +- tests/app/notify_client/test_notify_admin_api_client.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/notify_client/__init__.py b/app/notify_client/__init__.py index eb313d889..f2f1e922d 100644 --- a/app/notify_client/__init__.py +++ b/app/notify_client/__init__.py @@ -37,7 +37,7 @@ class NotifyAdminAPIClient(BaseAPIClient): def _add_request_id_header(headers): if not has_request_context(): return headers - headers['NotifyRequestID'] = request.request_id + headers['X-B3-TraceId'] = request.request_id return headers def check_inactive_service(self): diff --git a/requirements-app.txt b/requirements-app.txt index bdccf422f..be2d6828b 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -21,4 +21,4 @@ notifications-python-client==5.0.0 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@29.3.6#egg=notifications-utils==29.3.6 +git+https://github.com/alphagov/notifications-utils.git@30.0.0#egg=notifications-utils==30.0.0 diff --git a/requirements.txt b/requirements.txt index c7e365fc4..29a4ca3d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ notifications-python-client==5.0.0 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@29.3.6#egg=notifications-utils==29.3.6 +git+https://github.com/alphagov/notifications-utils.git@30.0.0#egg=notifications-utils==30.0.0 ## The following requirements were added by pip freeze: awscli==1.15.77 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 9948af059..6b031a380 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,6 @@ 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', 'NotifyRequestID' + 'Authorization', 'Content-type', 'User-agent', 'X-Custom-Forwarder', 'X-B3-TraceId' } - assert headers['NotifyRequestID'] == request_context.request.request_id + assert headers['X-B3-TraceId'] == request_context.request.request_id