From 21b4716d58606e26e101cb0c8289a1320678e8dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:14:35 +0000 Subject: [PATCH 1/2] fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index f8457ef40..8e444f56d 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -12,7 +12,7 @@ val otelInstrumentationVersion = "2.9.0-alpha" val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.18.1", "com.google.guava:guava-bom:33.3.1-jre", - "com.linecorp.armeria:armeria-bom:1.30.1", + "com.linecorp.armeria:armeria-bom:1.31.0", "org.junit:junit-bom:5.11.3", "io.grpc:grpc-bom:1.68.1", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}", From 87f8aa05c9bcb6a71b88b858a5364f0b8ee5b276 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 14 Nov 2024 09:07:06 -0700 Subject: [PATCH 2/2] Fix deprecation --- .../contrib/aws/resource/SimpleHttpClientTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java index 38837620b..6799b8d49 100644 --- a/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java +++ b/aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java @@ -10,6 +10,7 @@ import com.google.common.collect.ImmutableMap; import com.linecorp.armeria.common.AggregatedHttpRequest; import com.linecorp.armeria.common.HttpResponse; +import com.linecorp.armeria.common.TlsKeyPair; import com.linecorp.armeria.server.ServerBuilder; import com.linecorp.armeria.testing.junit5.server.SelfSignedCertificateExtension; import com.linecorp.armeria.testing.junit5.server.ServerExtension; @@ -68,7 +69,7 @@ static class HttpsServerTest { new ServerExtension() { @Override protected void configure(ServerBuilder sb) { - sb.tls(certificate.certificateFile(), certificate.privateKeyFile()); + sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile())); sb.service("/", (ctx, req) -> HttpResponse.of("Thanks for trusting me")); }