From 32d591ae530e647348ac3b35aef926452153482f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 14:30:40 -0500 Subject: [PATCH] Update dependency com.linecorp.armeria:armeria-bom to v1.25.0 (#5748) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jack Berg --- dependencyManagement/build.gradle.kts | 2 +- .../testing/internal/AbstractHttpTelemetryExporterTest.java | 2 +- .../java/io/opentelemetry/B3PropagationIntegrationTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 6bb9be441a8..5b1223a6104 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,7 +11,7 @@ val DEPENDENCY_BOMS = listOf( "com.fasterxml.jackson:jackson-bom:2.15.2", "com.google.guava:guava-bom:32.1.2-jre", "com.google.protobuf:protobuf-bom:3.24.1", - "com.linecorp.armeria:armeria-bom:1.24.3", + "com.linecorp.armeria:armeria-bom:1.25.0", "com.squareup.okhttp3:okhttp-bom:4.11.0", "com.squareup.okio:okio-bom:3.5.0", // applies to transitive dependencies of okhttp "io.grpc:grpc-bom:1.57.2", diff --git a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java index 662b58ab397..be8e5e773fc 100644 --- a/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java +++ b/exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java @@ -178,7 +178,7 @@ public HttpResponse serve(ServiceRequestContext ctx, HttpRequest req) { MediaType.parse("application/x-protobuf"), successResponse); }); - return HttpResponse.from(responseFuture); + return HttpResponse.of(responseFuture); } private static byte[] maybeGzipInflate(RequestHeaders requestHeaders, byte[] content) diff --git a/integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java b/integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java index 8dae9adb8ff..b87db824a26 100644 --- a/integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java +++ b/integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java @@ -72,7 +72,7 @@ public HttpResponse serve(ServiceRequestContext ctx, HttpRequest req) { .setParent(incomingContext) .startSpan(); try (Scope ignored = span.makeCurrent()) { - return HttpResponse.from( + return HttpResponse.of( client .get() .get("/backend")