Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change the precedence between :authority and Host headers #9774

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Change the precedence between :authority and Host headers #9774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90cda3
Change the precedence between :authority and Host headers
Oct 30, 2023
a2cd7fc
fix testS
Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...telemetry/instrumentation/api/instrumenter/http/ForwardedHostAddressAndPortExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions ...metry/instrumentation/api/instrumenter/http/ForwardedHostAddressAndPortExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions ...instrumentation/api/instrumenter/http/HttpServerAttributesExtractorStableSemconvTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,10 +454,10 @@ void shouldExtractServerAddressAndPortFromForwardedHostHeader() {
}

@Test
void shouldExtractServerAddressAndPortFromHostHeader() {
void shouldExtractServerAddressAndPortFromAuthorityPseudoHeader() {
Map<String, String> request = new HashMap<>();
request.put("header.host", "github.com:123");
request.put("header.:authority", "opentelemetry.io:42");
request.put("header.host", "github.com:123");

Map<String, String> response = new HashMap<>();
response.put("statusCode", "200");
Expand All @@ -470,8 +470,8 @@ void shouldExtractServerAddressAndPortFromHostHeader() {

assertThat(startAttributes.build())
.containsOnly(
entry(SemanticAttributes.SERVER_ADDRESS, "github.com"),
entry(SemanticAttributes.SERVER_PORT, 123L));
entry(SemanticAttributes.SERVER_ADDRESS, "opentelemetry.io"),
entry(SemanticAttributes.SERVER_PORT, 42L));

AttributesBuilder endAttributes = Attributes.builder();
extractor.onEnd(endAttributes, Context.root(), request, response, null);
Expand All @@ -480,9 +480,9 @@ void shouldExtractServerAddressAndPortFromHostHeader() {
}

@Test
void shouldExtractServerAddressAndPortFromAuthorityPseudoHeader() {
void shouldExtractServerAddressAndPortFromHostHeader() {
Map<String, String> request = new HashMap<>();
request.put("header.:authority", "opentelemetry.io:42");
request.put("header.host", "github.com:123");

Map<String, String> response = new HashMap<>();
response.put("statusCode", "200");
Expand All @@ -495,8 +495,8 @@ void shouldExtractServerAddressAndPortFromAuthorityPseudoHeader() {

assertThat(startAttributes.build())
.containsOnly(
entry(SemanticAttributes.SERVER_ADDRESS, "opentelemetry.io"),
entry(SemanticAttributes.SERVER_PORT, 42L));
entry(SemanticAttributes.SERVER_ADDRESS, "github.com"),
entry(SemanticAttributes.SERVER_PORT, 123L));

AttributesBuilder endAttributes = Attributes.builder();
extractor.onEnd(endAttributes, Context.root(), request, response, null);
Expand Down
Loading