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(deps): update errorproneversion to v2.27.0 (main) (minor) (#11238) 

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2024-04-28 13:56:53 +03:00 committed by GitHub
parent 528c9769ed
commit 22adefcbd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependencyManagement/build.gradle.kts
View File

@ -40,7 +40,7 @@ val DEPENDENCY_BOMS = listOf(
val autoServiceVersion = "1.1.1"
val autoValueVersion = "1.10.4"
val errorProneVersion = "2.26.1"
val errorProneVersion = "2.27.0"
val byteBuddyVersion = "1.14.14"
val asmVersion = "9.7"
val jmhVersion = "1.37"

9
instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.java
View File

@ -41,14 +41,13 @@ class MethodSpanAttributesExtractorTest {
@BeforeEach
void setup() {
lenient()
.doAnswer(
.when(cache.computeIfAbsent(any(), any()))
.thenAnswer(
invocation -> {
Method m = invocation.getArgument(0);
Function<Method, AttributeBindings> fn = invocation.getArgument(1);
return fn.apply(m);
})
.when(cache)
.computeIfAbsent(any(), any());
});
}
@Test
@ -123,6 +122,7 @@ class MethodSpanAttributesExtractorTest {
}
@Test
@SuppressWarnings("MockitoDoSetup")
void appliesCachedBindings() {
AttributeBindings bindings = mock(AttributeBindings.class);
when(bindings.isEmpty()).thenReturn(false);
@ -143,6 +143,7 @@ class MethodSpanAttributesExtractorTest {
}
@Test
@SuppressWarnings("MockitoDoSetup")
void doesNotApplyCachedEmptyBindings() {
AttributeBindings bindings = mock(AttributeBindings.class);
when(bindings.isEmpty()).thenReturn(true);

14
instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeSpanNameExtractorTest.java
View File

@ -6,7 +6,7 @@
package io.opentelemetry.instrumentation.api.incubator.semconv.code;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import org.junit.jupiter.api.Test;
@ -23,8 +23,8 @@ class CodeSpanNameExtractorTest {
// given
Object request = new Object();
doReturn(TestClass.class).when(getter).getCodeClass(request);
doReturn("doSomething").when(getter).getMethodName(request);
when(getter.getCodeClass(request)).thenAnswer(invocation -> TestClass.class);
when(getter.getMethodName(request)).thenReturn("doSomething");
SpanNameExtractor<Object> underTest = CodeSpanNameExtractor.create(getter);
@ -41,8 +41,8 @@ class CodeSpanNameExtractorTest {
AnonymousBaseClass anon = new AnonymousBaseClass() {};
Object request = new Object();
doReturn(anon.getClass()).when(getter).getCodeClass(request);
doReturn("doSomething").when(getter).getMethodName(request);
when(getter.getCodeClass(request)).thenAnswer(invocation -> anon.getClass());
when(getter.getMethodName(request)).thenReturn("doSomething");
SpanNameExtractor<Object> underTest = CodeSpanNameExtractor.create(getter);
@ -59,8 +59,8 @@ class CodeSpanNameExtractorTest {
Runnable lambda = () -> {};
Object request = new Object();
doReturn(lambda.getClass()).when(getter).getCodeClass(request);
doReturn("doSomething").when(getter).getMethodName(request);
when(getter.getCodeClass(request)).thenAnswer(invocation -> lambda.getClass());
when(getter.getMethodName(request)).thenReturn("doSomething");
SpanNameExtractor<Object> underTest = CodeSpanNameExtractor.create(getter);

9
instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/http/HttpExperimentalAttributesExtractorTest.java
View File

@ -8,7 +8,7 @@ package io.opentelemetry.instrumentation.api.incubator.semconv.http;
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.entry;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder;
@ -43,10 +43,9 @@ class HttpExperimentalAttributesExtractorTest {
HttpCommonAttributesGetter<String, String> getter,
AttributesExtractor<String, String> extractor) {
doReturn(singletonList("123")).when(getter).getHttpRequestHeader("request", "content-length");
doReturn(singletonList("42"))
.when(getter)
.getHttpResponseHeader("request", "response", "content-length");
when(getter.getHttpRequestHeader("request", "content-length")).thenReturn(singletonList("123"));
when(getter.getHttpResponseHeader("request", "response", "content-length"))
.thenReturn(singletonList("42"));
AttributesBuilder attributes = Attributes.builder();
extractor.onStart(attributes, Context.root(), "request");

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

@ -10,7 +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;
import java.util.List;
@ -39,7 +39,7 @@ class ForwardedHostAddressAndPortExtractorTest {
@ArgumentsSource(ForwardedArgs.class)
void shouldParseForwarded(
List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(headers);
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);
@ -84,8 +84,8 @@ class ForwardedHostAddressAndPortExtractorTest {
@ArgumentsSource(HostArgs.class)
void shouldParseForwardedHost(
List<String> headers, @Nullable String expectedAddress, @Nullable Integer expectedPort) {
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-host");
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-host")).thenReturn(headers);
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);
@ -98,9 +98,9 @@ class ForwardedHostAddressAndPortExtractorTest {
@ArgumentsSource(HostArgs.class)
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, ":authority");
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-host")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, ":authority")).thenReturn(headers);
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);
@ -113,10 +113,10 @@ class ForwardedHostAddressAndPortExtractorTest {
@ArgumentsSource(HostArgs.class)
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, ":authority");
doReturn(headers).when(getter).getHttpRequestHeader(REQUEST, "host");
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);
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, REQUEST);

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

@ -12,7 +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;
import java.util.stream.Stream;
@ -38,14 +38,14 @@ class ForwardedUrlSchemeProviderTest {
@Test
void noHeaders() {
doReturn(emptyList()).when(getter).getHttpRequestHeader(eq(REQUEST), any());
when(getter.getHttpRequestHeader(eq(REQUEST), any())).thenReturn(emptyList());
assertThat(underTest.apply(REQUEST)).isNull();
}
@ParameterizedTest
@ArgumentsSource(ForwardedHeaderValues.class)
void parseForwardedHeader(List<String> values, String expectedScheme) {
doReturn(values).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(values);
assertThat(underTest.apply(REQUEST)).isEqualTo(expectedScheme);
}
@ -74,8 +74,8 @@ class ForwardedUrlSchemeProviderTest {
@ParameterizedTest
@ArgumentsSource(ForwardedProtoHeaderValues.class)
void parseForwardedProtoHeader(List<String> values, String expectedScheme) {
doReturn(emptyList()).when(getter).getHttpRequestHeader(REQUEST, "forwarded");
doReturn(values).when(getter).getHttpRequestHeader(REQUEST, "x-forwarded-proto");
when(getter.getHttpRequestHeader(REQUEST, "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader(REQUEST, "x-forwarded-proto")).thenReturn(values);
assertThat(underTest.apply(REQUEST)).isEqualTo(expectedScheme);
}

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

@ -10,7 +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;
import java.util.List;
@ -36,7 +36,7 @@ class HttpServerAddressAndPortExtractorTest {
@ParameterizedTest
@ArgumentsSource(ForwardedArgs.class)
void shouldParseForwarded(List<String> headers, @Nullable String expectedAddress) {
doReturn(headers).when(getter).getHttpRequestHeader("request", "forwarded");
when(getter.getHttpRequestHeader("request", "forwarded")).thenReturn(headers);
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, "request");
@ -92,8 +92,8 @@ class HttpServerAddressAndPortExtractorTest {
@ParameterizedTest
@ArgumentsSource(ForwardedForArgs.class)
void shouldParseForwardedFor(List<String> headers, @Nullable String expectedAddress) {
doReturn(emptyList()).when(getter).getHttpRequestHeader("request", "forwarded");
doReturn(headers).when(getter).getHttpRequestHeader("request", "x-forwarded-for");
when(getter.getHttpRequestHeader("request", "forwarded")).thenReturn(emptyList());
when(getter.getHttpRequestHeader("request", "x-forwarded-for")).thenReturn(headers);
AddressAndPort sink = new AddressAndPort();
underTest.extract(sink, "request");

8
instrumentation/hibernate/hibernate-reactive-1.0/javaagent/src/hibernateReactive1Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/reactive/v1_0/HibernateReactiveTest.java
View File

@ -148,7 +148,7 @@ class HibernateReactiveTest {
.find(Value.class, 1L)
.thenAccept(value -> testing.runWithSpan("callback", () -> {}));
})
.whenComplete((value, throwable) -> complete(result, value, throwable))));
.whenComplete((value, throwable) -> complete(result, null, throwable))));
result.get(30, TimeUnit.SECONDS);
assertTrace();
@ -173,7 +173,7 @@ class HibernateReactiveTest {
.get(Value.class, 1L)
.thenAccept(value -> testing.runWithSpan("callback", () -> {}));
})
.whenComplete((value, throwable) -> complete(result, value, throwable))));
.whenComplete((value, throwable) -> complete(result, null, throwable))));
result.get(30, TimeUnit.SECONDS);
assertTrace();
@ -198,7 +198,7 @@ class HibernateReactiveTest {
.withTransaction(transaction -> session.find(Value.class, 1L))
.thenAccept(value -> testing.runWithSpan("callback", () -> {}));
})
.whenComplete((value, throwable) -> complete(result, value, throwable))));
.whenComplete((value, throwable) -> complete(result, null, throwable))));
result.get(30, TimeUnit.SECONDS);
assertTrace();
@ -223,7 +223,7 @@ class HibernateReactiveTest {
.withTransaction(transaction -> session.get(Value.class, 1L))
.thenAccept(value -> testing.runWithSpan("callback", () -> {}));
})
.whenComplete((value, throwable) -> complete(result, value, throwable))));
.whenComplete((value, throwable) -> complete(result, null, throwable))));
result.get(30, TimeUnit.SECONDS);
assertTrace();

2
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent-unit-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/FailedRequestWithUrlMakerTest.java
View File

@ -53,6 +53,7 @@ class FailedRequestWithUrlMakerTest {
}
@Test
@SuppressWarnings("MockitoDoSetup")
void shouldPrependRemoteAddress() {
when(config.baseUrl()).thenReturn("/");
when(config.uri()).thenReturn("/docs");
@ -68,6 +69,7 @@ class FailedRequestWithUrlMakerTest {
@ParameterizedTest
@ArgumentsSource(DefaultPortsArguments.class)
@SuppressWarnings("MockitoDoSetup")
void shouldSkipDefaultPorts(int port, boolean isSecure) {
when(config.baseUrl()).thenReturn("/");
when(config.uri()).thenReturn("/docs");