From 71c277993e8ee11ddaf7e070dfa85c571f8c147a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E4=B8=99?= Date: Sat, 18 Jan 2025 16:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=81=E9=87=8F=E6=8C=87?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/listener/ChannelHandlerParameter.java | 3 --- .../sanbing/jcpp/protocol/listener/Listener.java | 7 +------ .../protocol/listener/tcp/TcpChannelHandler.java | 13 ++----------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/ChannelHandlerParameter.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/ChannelHandlerParameter.java index b215156..d73764c 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/ChannelHandlerParameter.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/ChannelHandlerParameter.java @@ -5,7 +5,6 @@ package sanbing.jcpp.protocol.listener; import io.micrometer.core.instrument.Timer; -import sanbing.jcpp.infrastructure.stats.DefaultCounter; import sanbing.jcpp.infrastructure.stats.MessagesStats; import sanbing.jcpp.protocol.ProtocolMessageProcessor; @@ -16,7 +15,5 @@ public record ChannelHandlerParameter(String protocolName, AtomicInteger connectionsGauge, MessagesStats uplinkMsgStats, MessagesStats downlinkMsgStats, - DefaultCounter uplinkTrafficCounter, - DefaultCounter downlinkTrafficCounter, Timer downlinkTimer) { } \ No newline at end of file diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/Listener.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/Listener.java index 918f5df..bc733c7 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/Listener.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/Listener.java @@ -7,7 +7,6 @@ package sanbing.jcpp.protocol.listener; import io.micrometer.core.instrument.Timer; import lombok.Getter; import org.springframework.boot.actuate.health.Health; -import sanbing.jcpp.infrastructure.stats.DefaultCounter; import sanbing.jcpp.infrastructure.stats.MessagesStats; import sanbing.jcpp.infrastructure.stats.StatsFactory; import sanbing.jcpp.protocol.ProtocolMessageProcessor; @@ -28,8 +27,6 @@ public abstract class Listener { protected AtomicInteger connectionsGauge = new AtomicInteger(); protected MessagesStats uplinkMsgStats; protected MessagesStats downlinkMsgStats; - protected DefaultCounter uplinkTrafficCounter; - protected DefaultCounter downlinkTrafficCounter; protected Timer downlinkTimer; protected final ChannelHandlerParameter parameter; @@ -41,11 +38,9 @@ public abstract class Listener { statsFactory.createGauge("openConnections", connectionsGauge, "protocol", protocolName); this.uplinkMsgStats = statsFactory.createMessagesStats("listenerUplinkMessage", "protocol", protocolName); this.downlinkMsgStats = statsFactory.createMessagesStats("listenerDownlinkMessage", "protocol", protocolName); - this.uplinkTrafficCounter = statsFactory.createDefaultCounter("listenerUplinkTraffic", "protocol", protocolName); - this.downlinkTrafficCounter = statsFactory.createDefaultCounter("listenerDownlinkTraffic", "protocol", protocolName); this.downlinkTimer = statsFactory.createTimer("listenerDownlink", "protocol", protocolName); - this.parameter = new ChannelHandlerParameter(protocolName, protocolMessageProcessor, connectionsGauge, uplinkMsgStats, downlinkMsgStats, uplinkTrafficCounter, downlinkTrafficCounter, downlinkTimer); + this.parameter = new ChannelHandlerParameter(protocolName, protocolMessageProcessor, connectionsGauge, uplinkMsgStats, downlinkMsgStats, downlinkTimer); } public abstract Health health(); diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java index abeb467..02b8dd6 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/listener/tcp/TcpChannelHandler.java @@ -14,7 +14,6 @@ import io.netty.channel.SimpleChannelInboundHandler; import io.netty.util.concurrent.Future; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import sanbing.jcpp.infrastructure.stats.DefaultCounter; import sanbing.jcpp.infrastructure.stats.MessagesStats; import sanbing.jcpp.infrastructure.util.exception.DownlinkException; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; @@ -38,9 +37,7 @@ public class TcpChannelHandler extends SimpleChannelInboundHandler extends SimpleChannelInboundHandler extends SimpleChannelInboundHandler extends SimpleChannelInboundHandler ByteBufUtil.hexDump(byteBuf)); + logDownlinkStart(() -> ByteBufUtil.hexDump(byteBuf)); ctx.writeAndFlush(Unpooled.wrappedBuffer(byteBuf)) .addListener(this::logDownlinkUnsuccessful); @@ -171,9 +164,7 @@ public class TcpChannelHandler extends SimpleChannelInboundHandler logTransform) { - - downlinkTrafficCounter.add(payloadSize); + private void logDownlinkStart(Supplier logTransform) { if (log.isDebugEnabled()) { log.debug("[{}]{} 开始发送下行报文:{}", protocolName, tcpSession, logTransform.get());