open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failing tests on openj9 (#11247)

This commit is contained in:
Lauri Tulmin 2024-04-29 11:39:13 +03:00 committed by GitHub
parent b1cb13d28d
commit b33ccb4058
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/ForwardedHostAddressAndPortExtractorTest.java
View File

@ -10,6 +10,7 @@ import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import io.opentelemetry.instrumentation.api.semconv.network.internal.AddressAndPort;
@ -82,10 +83,11 @@ class ForwardedHostAddressAndPortExtractorTest {
@ParameterizedTest
@ArgumentsSource(HostArgs.class)
@SuppressWarnings("MockitoDoSetup")
void shouldParseForwardedHost(
List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-host")).thenReturn(headers);
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-host");
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);
@ -96,11 +98,12 @@ class ForwardedHostAddressAndPortExtractorTest {
@ParameterizedTest
@ArgumentsSource(HostArgs.class)
@SuppressWarnings("MockitoDoSetup")
void shouldParsePseudoAuthority(
List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-host")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, ":authority")).thenReturn(headers);
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-host");
doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, ":authority");
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);
@ -111,12 +114,13 @@ class ForwardedHostAddressAndPortExtractorTest {
@ParameterizedTest
@ArgumentsSource(HostArgs.class)
@SuppressWarnings("MockitoDoSetup")
void shouldParseHost(
List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-host")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, ":authority")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "host")).thenReturn(headers);
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-host");
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, ":authority");
doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "host");
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);

6
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/ForwardedUrlSchemeProviderTest.java
View File

@ -12,6 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import java.util.List;
@ -73,9 +74,10 @@ class ForwardedUrlSchemeProviderTest {
@ParameterizedTest
@ArgumentsSource(ForwardedProtoHeaderValues.class)
@SuppressWarnings("MockitoDoSetup")
void parseForwardedProtoHeader(List<String> values, String expectedScheme) {
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-proto")).thenReturn(values);
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
doReturn(values).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-proto");
assertThat(underTest.apply(REQUEST)).isEqualTo(expectedScheme);
}

6
instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerAddressAndPortExtractorTest.java
View File

@ -10,6 +10,7 @@ import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.params.provider.Arguments.arguments;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import io.opentelemetry.instrumentation.api.semconv.network.internal.AddressAndPort;
@ -91,9 +92,10 @@ class HttpServerAddressAndPortExtractorTest {
@ParameterizedTest
@ArgumentsSource(ForwardedForArgs.class)
@SuppressWarnings("MockitoDoSetup")
void shouldParseForwardedFor(List<String> headers, @Nullable String expectedAddress) {
when(getter.getHttpRequestHeader("request", "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader("request", "x-forwarded-for")).thenReturn(headers);
doReturn(emptyList()).when(getter).getHttpRequestHeader("request", "forwarded");
doReturn(headers).when(getter).getHttpRequestHeader("request", "x-forwarded-for");
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, "request");