Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 #6877

Merged
merged 3 commits into from
Nov 18, 2024
Merged

fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 #6877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fb06bb
fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0
renovate[bot] Nov 15, 2024
2ea5a4c
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
jack-berg Nov 18, 2024
b69b7f5
Stop using deprecated methods
jack-berg Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.18.1",
"com.google.guava:guava-bom:33.3.1-jre",
"com.google.protobuf:protobuf-bom:3.25.5",
"com.linecorp.armeria:armeria-bom:1.30.1",
"com.linecorp.armeria:armeria-bom:1.31.0",
"com.squareup.okhttp3:okhttp-bom:4.12.0",
"com.squareup.okio:okio-bom:3.9.1", // applies to transitive dependencies of okhttp
"io.grpc:grpc-bom:1.68.1",
Expand Down
3 changes: 2 additions & 1 deletion ...va/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.Message;
import com.linecorp.armeria.common.HttpRequest;
import com.linecorp.armeria.common.TlsKeyPair;
import com.linecorp.armeria.common.grpc.protocol.ArmeriaStatusException;
import com.linecorp.armeria.server.ServerBuilder;
import com.linecorp.armeria.server.ServiceRequestContext;
Expand Down Expand Up @@ -137,7 +138,7 @@ protected void configure(ServerBuilder sb) {

sb.http(0);
sb.https(0);
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));
sb.tlsCustomizer(ssl -> ssl.trustManager(clientCertificate.certificate()));
sb.decorator(LoggingService.newDecorator());
}
Expand Down
3 changes: 2 additions & 1 deletion ...va/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.linecorp.armeria.common.HttpStatus;
import com.linecorp.armeria.common.MediaType;
import com.linecorp.armeria.common.RequestHeaders;
import com.linecorp.armeria.common.TlsKeyPair;
import com.linecorp.armeria.server.HttpService;
import com.linecorp.armeria.server.ServerBuilder;
import com.linecorp.armeria.server.ServiceRequestContext;
Expand Down Expand Up @@ -144,7 +145,7 @@ protected void configure(ServerBuilder sb) {

sb.http(0);
sb.https(0);
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));
sb.tlsCustomizer(ssl -> ssl.trustManager(clientCertificate.certificate()));
sb.decorator(LoggingService.newDecorator());
}
Expand Down
3 changes: 2 additions & 1 deletion ...est/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import static org.junit.jupiter.api.Named.named;
import static org.junit.jupiter.params.provider.Arguments.arguments;

import com.linecorp.armeria.common.TlsKeyPair;
import com.linecorp.armeria.common.grpc.protocol.ArmeriaStatusException;
import com.linecorp.armeria.server.ServerBuilder;
import com.linecorp.armeria.server.ServiceRequestContext;
Expand Down Expand Up @@ -117,7 +118,7 @@ protected CompletionStage<byte[]> handleMessage(
});
sb.http(0);
sb.https(0);
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));
sb.tlsCustomizer(
ssl -> {
ssl.clientAuth(ClientAuth.OPTIONAL);
Expand Down
Loading