Skip to content

Commit 1b46c5f

Browse files
renovate[bot]laurit
authored andcommitted
fix(deps): update errorproneversion to v2.42.0 (minor) (open-telemetry#14726)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 608fc19 commit 1b46c5f

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
3737

3838
val autoServiceVersion = "1.1.1"
3939
val autoValueVersion = "1.11.0"
40-
val errorProneVersion = "2.41.0"
40+
val errorProneVersion = "2.42.0"
4141
val byteBuddyVersion = "1.17.7"
4242
val asmVersion = "9.8"
4343
val jmhVersion = "1.37"

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/OpenTelemetryModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,37 @@ protected void configure() {
3131

3232
@Singleton
3333
@Provides
34-
RatpackClientTelemetry ratpackClientTelemetry(OpenTelemetry openTelemetry) {
34+
static RatpackClientTelemetry ratpackClientTelemetry(OpenTelemetry openTelemetry) {
3535
return RatpackClientTelemetry.create(openTelemetry);
3636
}
3737

3838
@Singleton
3939
@Provides
40-
RatpackServerTelemetry ratpackServerTelemetry(OpenTelemetry openTelemetry) {
40+
static RatpackServerTelemetry ratpackServerTelemetry(OpenTelemetry openTelemetry) {
4141
return RatpackServerTelemetry.create(openTelemetry);
4242
}
4343

4444
@Singleton
4545
@Provides
46-
Handler ratpackServerHandler(RatpackServerTelemetry ratpackTracing) {
46+
static Handler ratpackServerHandler(RatpackServerTelemetry ratpackTracing) {
4747
return ratpackTracing.getHandler();
4848
}
4949

5050
@Singleton
5151
@Provides
52-
ExecInterceptor ratpackExecInterceptor(RatpackServerTelemetry ratpackTracing) {
52+
static ExecInterceptor ratpackExecInterceptor(RatpackServerTelemetry ratpackTracing) {
5353
return ratpackTracing.getExecInterceptor();
5454
}
5555

5656
@Singleton
5757
@Provides
58-
HttpClient instrumentedHttpClient(RatpackClientTelemetry ratpackTracing) throws Exception {
58+
static HttpClient instrumentedHttpClient(RatpackClientTelemetry ratpackTracing) throws Exception {
5959
return ratpackTracing.instrument(HttpClient.of(spec -> {}));
6060
}
6161

6262
@Singleton
6363
@Provides
64-
ExecInitializer ratpackExecInitializer(RatpackServerTelemetry ratpackTracing) {
64+
static ExecInitializer ratpackExecInitializer(RatpackServerTelemetry ratpackTracing) {
6565
return ratpackTracing.getExecInitializer();
6666
}
6767
}

instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/spring/AbstractSpringServerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class AbstractSpringServerTest extends AbstractRestletServerTest
2323
protected void setupServer(Component component) {
2424
ApplicationContext context = new ClassPathXmlApplicationContext(getConfigurationName());
2525
router = (Router) context.getBean("testRouter");
26-
Server server = (Server) context.getBean("testServer", new Object[] {"http", port});
26+
Server server = (Server) context.getBean("testServer", "http", port);
2727
component.getServers().add(server);
2828
}
2929

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.instrumentation.testing.junit.http;
77

8+
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
89
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;
910
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_PARAMETERS;
1011
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR;
@@ -16,6 +17,7 @@
1617
import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
1718
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
1819
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
20+
import static java.util.Collections.singletonList;
1921
import static org.junit.jupiter.api.Assumptions.assumeFalse;
2022
import static org.junit.jupiter.api.Assumptions.assumeTrue;
2123

@@ -899,14 +901,17 @@ protected SpanDataAssert assertServerSpan(
899901

900902
if (endpoint == CAPTURE_HEADERS) {
901903
assertThat(attrs)
902-
.containsEntry("http.request.header.x-test-request", new String[] {"test"});
904+
.containsEntry(
905+
stringArrayKey("http.request.header.x-test-request"), singletonList("test"));
903906
assertThat(attrs)
904-
.containsEntry("http.response.header.x-test-response", new String[] {"test"});
907+
.containsEntry(
908+
stringArrayKey("http.response.header.x-test-response"), singletonList("test"));
905909
}
906910
if (endpoint == CAPTURE_PARAMETERS) {
907911
assertThat(attrs)
908912
.containsEntry(
909-
"servlet.request.parameter.test-parameter", new String[] {"test value õäöü"});
913+
stringArrayKey("servlet.request.parameter.test-parameter"),
914+
singletonList("test value õäöü"));
910915
}
911916
});
912917

0 commit comments

Comments
 (0)