Skip to content

Commit b1bc7ae

Browse files
fix(deps): update armeria packages to v1.33.0 (minor) (#14383)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent f5d6389 commit b1bc7ae

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

smoke-tests/images/fake-backend/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
}
1212

1313
dependencies {
14-
implementation("com.linecorp.armeria:armeria-grpc:1.32.5")
14+
implementation("com.linecorp.armeria:armeria-grpc:1.33.0")
1515
implementation("io.opentelemetry.proto:opentelemetry-proto")
1616
runtimeOnly("org.slf4j:slf4j-simple")
1717
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@
6060
import io.opentelemetry.testing.internal.io.netty.channel.ChannelOption;
6161
import io.opentelemetry.testing.internal.io.netty.channel.ChannelPipeline;
6262
import io.opentelemetry.testing.internal.io.netty.channel.EventLoopGroup;
63+
import io.opentelemetry.testing.internal.io.netty.channel.MultiThreadIoEventLoopGroup;
6364
import io.opentelemetry.testing.internal.io.netty.channel.SimpleChannelInboundHandler;
64-
import io.opentelemetry.testing.internal.io.netty.channel.nio.NioEventLoopGroup;
65+
import io.opentelemetry.testing.internal.io.netty.channel.nio.NioIoHandler;
6566
import io.opentelemetry.testing.internal.io.netty.channel.socket.SocketChannel;
6667
import io.opentelemetry.testing.internal.io.netty.channel.socket.nio.NioSocketChannel;
6768
import io.opentelemetry.testing.internal.io.netty.handler.codec.http.DefaultFullHttpRequest;
@@ -453,7 +454,7 @@ void httpPipelining() throws InterruptedException {
453454
TextMapSetter<DefaultFullHttpRequest> setter =
454455
(request, key, value) -> request.headers().set(key, value);
455456

456-
EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
457+
EventLoopGroup eventLoopGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
457458
try {
458459
Bootstrap bootstrap = buildBootstrap(eventLoopGroup);
459460
Channel channel = bootstrap.connect(address.getHost(), port).sync().channel();
@@ -513,7 +514,7 @@ void requestWithNonStandardHttpMethod() throws InterruptedException {
513514
// test uses http 1.1
514515
assumeFalse(options.useHttp2);
515516

516-
EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
517+
EventLoopGroup eventLoopGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
517518
try {
518519
Bootstrap bootstrap = buildBootstrap(eventLoopGroup);
519520
Channel channel = bootstrap.connect(address.getHost(), port).sync().channel();

testing/armeria-shaded-for-testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
dependencies {
7-
implementation("com.linecorp.armeria:armeria-junit5:1.32.5")
7+
implementation("com.linecorp.armeria:armeria-junit5:1.33.0")
88
implementation("com.google.errorprone:error_prone_annotations")
99
}
1010

0 commit comments

Comments
 (0)