From b3726e6bc34aa142ce47041c340d47841fbe0061 Mon Sep 17 00:00:00 2001 From: Christophe Papazian Date: Fri, 22 Aug 2025 16:30:35 +0200 Subject: [PATCH 1/3] use forwarded as IP pattern --- ddtrace/contrib/internal/trace_utils.py | 1 + tests/tracer/test_trace_utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ddtrace/contrib/internal/trace_utils.py b/ddtrace/contrib/internal/trace_utils.py index 286f11795d9..f17be3b914d 100644 --- a/ddtrace/contrib/internal/trace_utils.py +++ b/ddtrace/contrib/internal/trace_utils.py @@ -70,6 +70,7 @@ "x-real-ip", "true-client-ip", "x-client-ip", + "forwarded", "forwarded-for", "x-cluster-client-ip", "fastly-client-ip", diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py index 3e5e7a707df..4998a86f405 100644 --- a/tests/tracer/test_trace_utils.py +++ b/tests/tracer/test_trace_utils.py @@ -632,7 +632,7 @@ def test_set_http_meta_case_sensitive_headers_notfound(mock_store_headers, span, ("x-real-ip", "2.2.2.2"), ("true-client-ip", "3.3.3.3"), ("x-client-ip", "4.4.4.4"), - ("x-forwarded", "5.5.5.5"), + ("forwarded", "5.5.5.5"), ("forwarded-for", "6.6.6.6"), ("x-cluster-client-ip", "7.7.7.7"), ("fastly-client-ip", "8.8.8.8"), From b587933a3c7975b9c162148f0dac1ccafe980690 Mon Sep 17 00:00:00 2001 From: Christophe Papazian Date: Fri, 22 Aug 2025 16:50:31 +0200 Subject: [PATCH 2/3] fix test --- tests/tracer/test_trace_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py index 4998a86f405..aa6570bca9f 100644 --- a/tests/tracer/test_trace_utils.py +++ b/tests/tracer/test_trace_utils.py @@ -644,8 +644,8 @@ def test_set_http_meta_case_sensitive_headers_notfound(mock_store_headers, span, ALL_TESTS = [ ["", dict(ALL_IP_HEADERS[-1 : -i - 2 : -1]), ALL_IP_HEADERS[-1 - i][1]] for i in range(len(ALL_IP_HEADERS)) ] -# x-forwarded is now ignored so we fall back to forwarded-for -ALL_TESTS[5][2] = "6.6.6.6" +# x-forwarded is now ignored so we fall back to forwarded +ALL_TESTS[5][2] = "5.5.5.5" @pytest.mark.parametrize( From b3c2e4adc4646407871e79ccb59c85a49bfaf98d Mon Sep 17 00:00:00 2001 From: Christophe Papazian Date: Fri, 22 Aug 2025 17:03:17 +0200 Subject: [PATCH 3/3] simplification --- tests/tracer/test_trace_utils.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/tracer/test_trace_utils.py b/tests/tracer/test_trace_utils.py index aa6570bca9f..b49c09af377 100644 --- a/tests/tracer/test_trace_utils.py +++ b/tests/tracer/test_trace_utils.py @@ -644,8 +644,6 @@ def test_set_http_meta_case_sensitive_headers_notfound(mock_store_headers, span, ALL_TESTS = [ ["", dict(ALL_IP_HEADERS[-1 : -i - 2 : -1]), ALL_IP_HEADERS[-1 - i][1]] for i in range(len(ALL_IP_HEADERS)) ] -# x-forwarded is now ignored so we fall back to forwarded -ALL_TESTS[5][2] = "5.5.5.5" @pytest.mark.parametrize(