Skip to content

move the position of "mqtt.tsub.latency" measured to the MQTTransient… #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2025
Merged

move the position of "mqtt.tsub.latency" measured to the MQTTransient… #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2DistBytes;
import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2ExternalLatency;
import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2IngressBytes;
import static org.apache.bifromq.metrics.TenantMetric.MqttTransientSubLatency;
import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT;
import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.packetId;
import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId;
Expand Down Expand Up @@ -570,12 +569,10 @@ protected final CompletableFuture<IMQTTProtocolHelper.SubResult> checkAndSubscri
.setUserProperties(grantedUserProps);
subTask.subId().ifPresent(optionBuilder::setSubId);
TopicFilterOption tfOption = optionBuilder.build();
Timer.Sample start = Timer.start();
return addFgTask(subTopicFilter(reqId, topicFilter, tfOption))
.thenComposeAsync(subResult -> {
switch (subResult) {
case OK, EXISTS -> {
start.stop(tenantMeter.timer(MqttTransientSubLatency));
if (!isSharedSubscription(topicFilter) && settings.retainEnabled
&& (tfOption.getRetainHandling() == SEND_AT_SUBSCRIBE
|| (subResult == IMQTTProtocolHelper.SubResult.OK
Expand Down
3 changes: 3 additions & 0 deletions ...qtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTTransientSessionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1InternalLatency;
import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2InternalLatency;
import static org.apache.bifromq.metrics.TenantMetric.MqttTransientSubCount;
import static org.apache.bifromq.metrics.TenantMetric.MqttTransientSubLatency;
import static org.apache.bifromq.metrics.TenantMetric.MqttTransientUnsubCount;
import static org.apache.bifromq.metrics.TenantMetric.MqttTransientUnsubLatency;
import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT;
Expand Down Expand Up @@ -181,10 +182,12 @@ protected final CompletableFuture<IMQTTProtocolHelper.SubResult> subTopicFilter(
memUsage.addAndGet(topicFilter.length());
memUsage.addAndGet(option.getSerializedSize());
}
Timer.Sample start = Timer.start();
return addMatchRecord(reqId, topicFilter, option.getIncarnation())
.thenApplyAsync(matchResult -> {
switch (matchResult) {
case OK -> {
start.stop(tenantMeter.timer(MqttTransientSubLatency));
if (prevOption == null) {
return OK;
} else {
Expand Down
Loading