Change the precedence between :authority and Host headers

open-telemetry · Oct 30, 2023 · f90cda3 · f90cda3
1 parent 96d59d5
commit f90cda3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...telemetry/instrumentation/api/instrumenter/http/ForwardedHostAddressAndPortExtractor.java b/...telemetry/instrumentation/api/instrumenter/http/ForwardedHostAddressAndPortExtractor.java
@@ -36,15 +36,15 @@ public void extract(AddressPortSink sink, REQUEST request) {
       }
     }
 
-    // try Host
-    for (String host : getter.getHttpRequestHeader(request, "host")) {
+    // try :authority (HTTP 2.0 pseudo-header)
+    for (String host : getter.getHttpRequestHeader(request, ":authority")) {
       if (extractHost(sink, host, 0, host.length())) {
         return;
       }
     }
 
-    // try :authority (HTTP 2.0 pseudo-header)
-    for (String host : getter.getHttpRequestHeader(request, ":authority")) {
+    // try Host
+    for (String host : getter.getHttpRequestHeader(request, "host")) {
       if (extractHost(sink, host, 0, host.length())) {
         return;
       }

diff --git a/...metry/instrumentation/api/instrumenter/http/ForwardedHostAddressAndPortExtractorTest.java b/...metry/instrumentation/api/instrumenter/http/ForwardedHostAddressAndPortExtractorTest.java
@@ -96,11 +96,11 @@ void shouldParseForwardedHost(
 
   @ParameterizedTest
   @ArgumentsSource(HostArgs.class)
-  void shouldParseHost(
+  void shouldParsePseudoAuthority(
       List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
     doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
     doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-host");
-    doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "host");
+    doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, ":authority");
 
     AddressAndPort sink = new AddressAndPort();
     underTest.extract(sink, REQUEST);
@@ -111,12 +111,12 @@ void shouldParseHost(
 
   @ParameterizedTest
   @ArgumentsSource(HostArgs.class)
-  void shouldParsePseudoAuthority(
+  void shouldParseHost(
       List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
     doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
     doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-host");
-    doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "host");
-    doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, ":authority");
+    doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, ":authority");
+    doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "host");
 
     AddressAndPort sink = new AddressAndPort();
     underTest.extract(sink, REQUEST);