Added num of connected clients and subscription request/sec

This commit is contained in:
andsel
2017-06-20 21:55:59 +02:00
parent 53ec8e5b60
commit 04a82c4a63
@@ -15,10 +15,12 @@
*/ */
package io.moquette.server.netty.metrics; package io.moquette.server.netty.metrics;
import com.codahale.metrics.Counter;
import com.codahale.metrics.Meter; import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricRegistry;
import com.librato.metrics.reporter.Librato; import com.librato.metrics.reporter.Librato;
import io.moquette.server.config.IConfig; import io.moquette.server.config.IConfig;
import io.moquette.server.netty.NettyUtils;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessage;
@@ -26,9 +28,7 @@ import io.netty.handler.codec.mqtt.MqttMessageType;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static io.moquette.BrokerConstants.METRICS_LIBRATO_EMAIL_PROPERTY_NAME; import static io.moquette.BrokerConstants.*;
import static io.moquette.BrokerConstants.METRICS_LIBRATO_TOKEN_PROPERTY_NAME;
import static io.moquette.BrokerConstants.METRICS_LIBRATO_SOURCE_PROPERTY_NAME;
import static io.netty.channel.ChannelHandler.Sharable; import static io.netty.channel.ChannelHandler.Sharable;
/** /**
@@ -36,12 +36,16 @@ import static io.netty.channel.ChannelHandler.Sharable;
*/ */
@Sharable @Sharable
public final class DropWizardMetricsHandler extends ChannelInboundHandlerAdapter { public final class DropWizardMetricsHandler extends ChannelInboundHandlerAdapter {
private MetricRegistry metrics = new MetricRegistry(); private MetricRegistry metrics;
private Meter publishesMetrics = metrics.meter("publish.requests"); private Meter publishesMetrics;
private Meter subscribeMetrics;
private Counter connectedClientsMetrics;
public void init(IConfig props) { public void init(IConfig props) {
this.metrics = new MetricRegistry(); this.metrics = new MetricRegistry();
this.publishesMetrics = metrics.meter("publish.requests"); this.publishesMetrics = metrics.meter("publish.requests");
this.subscribeMetrics = metrics.meter("subscribe.requests");
this.connectedClientsMetrics = metrics.counter("connect.num_clients");
// ConsoleReporter reporter = ConsoleReporter.forRegistry(metrics) // ConsoleReporter reporter = ConsoleReporter.forRegistry(metrics)
// .convertRatesTo(TimeUnit.SECONDS) // .convertRatesTo(TimeUnit.SECONDS)
// .convertDurationsTo(TimeUnit.MILLISECONDS) // .convertDurationsTo(TimeUnit.MILLISECONDS)
@@ -62,7 +66,16 @@ public final class DropWizardMetricsHandler extends ChannelInboundHandlerAdapter
MqttMessageType messageType = msg.fixedHeader().messageType(); MqttMessageType messageType = msg.fixedHeader().messageType();
switch (messageType) { switch (messageType) {
case PUBLISH: case PUBLISH:
publishesMetrics.mark(); this.publishesMetrics.mark();
break;
case SUBSCRIBE:
this.subscribeMetrics.mark();
break;
case CONNECT:
this.connectedClientsMetrics.inc();
break;
case DISCONNECT:
this.connectedClientsMetrics.dec();
break; break;
default: default:
break; break;
@@ -70,4 +83,13 @@ public final class DropWizardMetricsHandler extends ChannelInboundHandlerAdapter
ctx.fireChannelRead(message); ctx.fireChannelRead(message);
} }
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
String clientID = NettyUtils.clientID(ctx.channel());
if (clientID != null && !clientID.isEmpty()) {
this.connectedClientsMetrics.dec();
}
ctx.fireChannelInactive();
}
} }