Skip to content

Commit c82e0dc

Browse files
ejona86kannanjgithub
ejona86
authored and
kannanjgithub
committed
Upgrade to Netty 4.1.124.Final
This implicitly disables NettyAdaptiveCumulator (grpc#11284), which can have a performance impact. We delayed upgrading Netty to give time to rework the optimization, but we've gone too long already without upgrading which causes problems for vulnerability tracking.
1 parent 19c579e commit c82e0dc

5 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎MODULE.bazel‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2323
"com.google.truth:truth:1.4.2",
2424
"com.squareup.okhttp:okhttp:2.7.5",
2525
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
26-
"io.netty:netty-buffer:4.1.110.Final",
27-
"io.netty:netty-codec-http2:4.1.110.Final",
28-
"io.netty:netty-codec-http:4.1.110.Final",
29-
"io.netty:netty-codec-socks:4.1.110.Final",
30-
"io.netty:netty-codec:4.1.110.Final",
31-
"io.netty:netty-common:4.1.110.Final",
32-
"io.netty:netty-handler-proxy:4.1.110.Final",
33-
"io.netty:netty-handler:4.1.110.Final",
34-
"io.netty:netty-resolver:4.1.110.Final",
26+
"io.netty:netty-buffer:4.1.124.Final",
27+
"io.netty:netty-codec-http2:4.1.124.Final",
28+
"io.netty:netty-codec-http:4.1.124.Final",
29+
"io.netty:netty-codec-socks:4.1.124.Final",
30+
"io.netty:netty-codec:4.1.124.Final",
31+
"io.netty:netty-common:4.1.124.Final",
32+
"io.netty:netty-handler-proxy:4.1.124.Final",
33+
"io.netty:netty-handler:4.1.124.Final",
34+
"io.netty:netty-resolver:4.1.124.Final",
3535
"io.netty:netty-tcnative-boringssl-static:2.0.70.Final",
3636
"io.netty:netty-tcnative-classes:2.0.70.Final",
37-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
38-
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
39-
"io.netty:netty-transport:4.1.110.Final",
37+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.124.Final",
38+
"io.netty:netty-transport-native-unix-common:4.1.124.Final",
39+
"io.netty:netty-transport:4.1.124.Final",
4040
"io.opencensus:opencensus-api:0.31.0",
4141
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
4242
"io.perfmark:perfmark-api:0.27.0",

‎SECURITY.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
400400
1.59.x | 4.1.97.Final | 2.0.61.Final
401401
1.60.x-1.66.x | 4.1.100.Final | 2.0.61.Final
402402
1.67.x-1.70.x | 4.1.110.Final | 2.0.65.Final
403-
1.71.x- | 4.1.110.Final | 2.0.70.Final
403+
1.71.x-1.74.x | 4.1.110.Final | 2.0.70.Final
404+
1.75.x- | 4.1.124.Final | 2.0.72.Final
404405

405406
_(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
406407

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
netty = '4.1.110.Final'
2+
netty = '4.1.124.Final'
33
# Keep the following references of tcnative version in sync whenever it's updated:
44
# SECURITY.md
5-
nettytcnative = '2.0.70.Final'
5+
nettytcnative = '2.0.72.Final'
66
opencensus = "0.31.1"
77
# Not upgrading to 4.x as it is not yet ABI compatible.
88
# https://github.com/protocolbuffers/protobuf/issues/17247

‎netty/src/test/java/io/grpc/netty/NettyClientHandlerTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import static io.grpc.netty.Utils.STATUS_OK;
2929
import static io.grpc.netty.Utils.TE_HEADER;
3030
import static io.grpc.netty.Utils.TE_TRAILERS;
31-
import static io.netty.handler.codec.http2.Http2CodecUtil.DEFAULT_PRIORITY_WEIGHT;
3231
import static java.nio.charset.StandardCharsets.UTF_8;
3332
import static org.junit.Assert.assertArrayEquals;
3433
import static org.junit.Assert.assertEquals;
@@ -276,7 +275,7 @@ public void cancelBufferedStreamShouldChangeClientStreamStatus() throws Exceptio
276275
public void createStreamShouldSucceed() throws Exception {
277276
createStream();
278277
verifyWrite().writeHeaders(eq(ctx()), eq(STREAM_ID), eq(grpcHeaders), eq(0),
279-
eq(DEFAULT_PRIORITY_WEIGHT), eq(false), eq(0), eq(false), any(ChannelPromise.class));
278+
eq(false), any(ChannelPromise.class));
280279
}
281280

282281
@Test

‎repositories.bzl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2727
"com.google.truth:truth:1.4.2",
2828
"com.squareup.okhttp:okhttp:2.7.5",
2929
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
30-
"io.netty:netty-buffer:4.1.110.Final",
31-
"io.netty:netty-codec-http2:4.1.110.Final",
32-
"io.netty:netty-codec-http:4.1.110.Final",
33-
"io.netty:netty-codec-socks:4.1.110.Final",
34-
"io.netty:netty-codec:4.1.110.Final",
35-
"io.netty:netty-common:4.1.110.Final",
36-
"io.netty:netty-handler-proxy:4.1.110.Final",
37-
"io.netty:netty-handler:4.1.110.Final",
38-
"io.netty:netty-resolver:4.1.110.Final",
30+
"io.netty:netty-buffer:4.1.124.Final",
31+
"io.netty:netty-codec-http2:4.1.124.Final",
32+
"io.netty:netty-codec-http:4.1.124.Final",
33+
"io.netty:netty-codec-socks:4.1.124.Final",
34+
"io.netty:netty-codec:4.1.124.Final",
35+
"io.netty:netty-common:4.1.124.Final",
36+
"io.netty:netty-handler-proxy:4.1.124.Final",
37+
"io.netty:netty-handler:4.1.124.Final",
38+
"io.netty:netty-resolver:4.1.124.Final",
3939
"io.netty:netty-tcnative-boringssl-static:2.0.70.Final",
4040
"io.netty:netty-tcnative-classes:2.0.70.Final",
41-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
42-
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
43-
"io.netty:netty-transport:4.1.110.Final",
41+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.124.Final",
42+
"io.netty:netty-transport-native-unix-common:4.1.124.Final",
43+
"io.netty:netty-transport:4.1.124.Final",
4444
"io.opencensus:opencensus-api:0.31.0",
4545
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
4646
"io.perfmark:perfmark-api:0.27.0",

0 commit comments

Comments
 (0)