Skip to content

Revert "fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 (#1542)" #1546

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

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Revert "fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 (#1542)" #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
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;
Expand Down Expand Up @@ -69,7 +68,7 @@ static class HttpsServerTest {
new ServerExtension() {
@Override
protected void configure(ServerBuilder sb) {
sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile()));
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
Copy link
Member

@jack-berg jack-berg Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check out what I did in core to fix this deprecation: https://github.com/open-telemetry/opentelemetry-java/pull/6877/files

Suggested change
sb.tls(certificate.certificateFile(), certificate.privateKeyFile());
sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate()));

Copy link
Member Author

@trask trask Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will fix when renovate re-opens, just want to roll this back which should never have been merged in the first place (#1545)


sb.service("/", (ctx, req) -> HttpResponse.of("Thanks for trusting me"));
}
Expand Down
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 @@ -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.31.0",
"com.linecorp.armeria:armeria-bom:1.30.1",
"org.junit:junit-bom:5.11.3",
"io.grpc:grpc-bom:1.68.1",
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}",
Expand Down
Loading