Bump io.netty:netty-bom from 4.1.119.Final to 4.2.0.Final

Author: dependabot[bot]

docs/src/test/java/io/micrometer/docs/netty/NettyMetricsTests.java

@@ -28,9 +28,12 @@
 import io.netty.buffer.ByteBufAllocatorMetricProvider;
 import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.DefaultEventLoopGroup;
 import io.netty.channel.EventLoop;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.local.LocalIoHandler;
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
+import io.netty.channel.SingleThreadIoEventLoop;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.concurrent.SingleThreadEventExecutor;
@@ -54,7 +57,7 @@ void directInstrumentationExample() throws Exception {
         Set<String> names = new LinkedHashSet<>();
         // tag::directInstrumentation[]
         // Create or get an existing resources
-        DefaultEventLoopGroup eventExecutors = new DefaultEventLoopGroup();
+        MultithreadEventLoopGroup eventExecutors = new MultiThreadIoEventLoopGroup(LocalIoHandler.newFactory());
         UnpooledByteBufAllocator unpooledByteBufAllocator = new UnpooledByteBufAllocator(false);
         // Use binders to instrument them
         new NettyEventExecutorMetrics(eventExecutors).bindTo(this.registry);
@@ -84,18 +87,18 @@ void directInstrumentationExample() throws Exception {
 
     @Test
     void shouldInstrumentEventLoopDuringChannelInit() throws Exception {
-        NioEventLoopGroup eventExecutors = new NioEventLoopGroup();
+        MultiThreadIoEventLoopGroup eventExecutors = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
         CustomChannelInitializer channelInitializer = new CustomChannelInitializer(this.registry);
         NioSocketChannel channel = new NioSocketChannel();
         eventExecutors.register(channel).await();
         channelInitializer.initChannel(channel);
         assertThat(this.registry.get(NettyMeters.EVENT_EXECUTOR_TASKS_PENDING.getName())
-            .tags(Tags.of("name", channel.eventLoop().threadProperties().name()))
+            .tags(Tags.of("name", ((SingleThreadIoEventLoop) channel.eventLoop()).threadProperties().name()))
             .gauge()
             .value()).isZero();
         ByteBuf buffer = channel.alloc().buffer();
         Tags tags = Tags.of("id", String.valueOf(channel.alloc().hashCode()), "allocator.type",
-                "PooledByteBufAllocator", "memory.type", "direct");
+                "AdaptiveByteBufAllocator", "memory.type", "direct");
         assertThat(this.registry.get(NettyMeters.ALLOCATOR_MEMORY_USED.getName()).tags(tags).gauge().value())
             .isPositive();
         buffer.release();

gradle/libs.versions.toml

@@ -58,7 +58,7 @@ maven-resolver = "1.9.22"
 mockito4 = "4.11.0"
 mockito5 = "5.11.0"
 mongo = "4.11.5"
-netty = "4.1.119.Final"
+netty = "4.2.0.Final"
 newrelic-api = "5.14.0"
 # Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
 okhttp = "4.11.0"

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/netty4/NettyEventExecutorMetricsTests.java

@@ -17,8 +17,10 @@
 
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import io.netty.channel.DefaultEventLoopGroup;
 import io.netty.channel.EventLoop;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.MultithreadEventLoopGroup;
+import io.netty.channel.local.LocalIoHandler;
 import io.netty.util.concurrent.SingleThreadEventExecutor;
 import org.junit.jupiter.api.Test;
 
@@ -40,7 +42,7 @@ class NettyEventExecutorMetricsTests {
     @Test
     void shouldHaveTasksPendingMetricForEachEventLoop() throws Exception {
         Set<String> names = new LinkedHashSet<>();
-        DefaultEventLoopGroup eventExecutors = new DefaultEventLoopGroup();
+        MultithreadEventLoopGroup eventExecutors = new MultiThreadIoEventLoopGroup(LocalIoHandler.newFactory());
         new NettyEventExecutorMetrics(eventExecutors).bindTo(this.registry);
         eventExecutors.spliterator().forEachRemaining(eventExecutor -> {
             if (eventExecutor instanceof SingleThreadEventExecutor) {
@@ -60,7 +62,7 @@ void shouldHaveTasksPendingMetricForEachEventLoop() throws Exception {
 
     @Test
     void shouldHaveTasksPendingMetricForSingleEventLoop() throws Exception {
-        DefaultEventLoopGroup eventExecutors = new DefaultEventLoopGroup();
+        MultithreadEventLoopGroup eventExecutors = new MultiThreadIoEventLoopGroup(LocalIoHandler.newFactory());
         EventLoop eventLoop = eventExecutors.next();
         new NettyEventExecutorMetrics(eventLoop).bindTo(this.registry);
         assertThat(eventLoop).isInstanceOf(SingleThreadEventExecutor.class);