Merge pull request #1084 from jfernandez/jfernandez/fix-allocator-met…

…rics Register the allocator memory metric polled gauge only once
Netflix · Aug 9, 2021 · e266f19 · e266f19
2 parents c295aa9 + c43fbbd
commit e266f19
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/zuul-core/src/main/java/com/netflix/zuul/netty/server/Server.java b/zuul-core/src/main/java/com/netflix/zuul/netty/server/Server.java
@@ -203,6 +203,19 @@ public void start()
                 addressesToChannels.put(requestedNamedAddr.withNewSocket(chan.localAddress()), chan);
                 allBindFutures.add(nettyServerFuture);
             }
+
+            // All channels should share a single ByteBufAllocator instance.
+            // Add metrics to monitor that allocator's memory usage.
+            if (!allBindFutures.isEmpty()) {
+                ByteBufAllocator alloc = allBindFutures.get(0).channel().alloc();
+                if (alloc instanceof ByteBufAllocatorMetricProvider) {
+                    ByteBufAllocatorMetric metrics = ((ByteBufAllocatorMetricProvider) alloc).metric();
+                    PolledMeter.using(registry).withId(registry.createId("zuul.nettybuffermem.live", "type", "heap"))
+                            .monitorValue(metrics, ByteBufAllocatorMetric::usedHeapMemory);
+                    PolledMeter.using(registry).withId(registry.createId("zuul.nettybuffermem.live", "type", "direct"))
+                            .monitorValue(metrics, ByteBufAllocatorMetric::usedDirectMemory);
+                }
+            }
         }
         catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -277,15 +290,6 @@ private ChannelFuture setupServerBootstrap(
         // Bind and start to accept incoming connections.
         ChannelFuture bindFuture = serverBootstrap.bind(listenAddress.unwrap());
 
-        ByteBufAllocator alloc = bindFuture.channel().alloc();
-        if (alloc instanceof ByteBufAllocatorMetricProvider) {
-            ByteBufAllocatorMetric metrics = ((ByteBufAllocatorMetricProvider) alloc).metric();
-            PolledMeter.using(registry).withId(registry.createId("zuul.nettybuffermem.live", "type", "heap"))
-                    .monitorValue(metrics, ByteBufAllocatorMetric::usedHeapMemory);
-            PolledMeter.using(registry).withId(registry.createId("zuul.nettybuffermem.live", "type", "direct"))
-                    .monitorValue(metrics, ByteBufAllocatorMetric::usedDirectMemory);
-        }
-
         try {
             return bindFuture.sync();
         } catch (Exception e) {