Merge pull request #71 from tlinhart/log-new-header-value

Use new header value in failed validation warning

asgi_correlation_id/middleware.py

@@ -54,13 +54,14 @@ async def __call__(self, scope: 'Scope', receive: 'Receive', send: 'Send') -> No
         headers = MutableHeaders(scope=scope)
         header_value = headers.get(self.header_name.lower())
 
+        validation_failed = False
         if not header_value:
             # Generate request ID if none was found
             id_value = self.generator()
         elif self.validator and not self.validator(header_value):
             # Also generate a request ID if one was found, but it was deemed invalid
+            validation_failed = True
             id_value = self.generator()
-            logger.warning(FAILED_VALIDATION_MESSAGE, header_value)
         else:
             # Otherwise, use the found request ID
             id_value = header_value
@@ -69,6 +70,9 @@ async def __call__(self, scope: 'Scope', receive: 'Receive', send: 'Send') -> No
         if self.transformer:
             id_value = self.transformer(id_value)
 
+        if validation_failed is True:
+            logger.warning(FAILED_VALIDATION_MESSAGE, id_value)
+
         # Update the request headers if needed
         if id_value != header_value and self.update_request_header is True:
             headers[self.header_name] = id_value

tests/test_middleware.py

@@ -106,8 +106,9 @@ async def test_view() -> dict:
 
     async with AsyncClient(app=app, base_url='http://test') as client:
         response = await client.get('test', headers={'X-Request-ID': value})
-        assert response.headers['X-Request-ID'] != value
-        assert caplog.messages[0] == FAILED_VALIDATION_MESSAGE.replace('%s', value)
+        new_value = response.headers['X-Request-ID']
+        assert new_value != value
+        assert caplog.messages[0] == FAILED_VALIDATION_MESSAGE.replace('%s', new_value)
 
 
 @pytest.mark.parametrize('app', apps)