diff --git a/fireflies/src/main/java/com/salesforce/apollo/fireflies/FireflyMetricsImpl.java b/fireflies/src/main/java/com/salesforce/apollo/fireflies/FireflyMetricsImpl.java index c470b6ace..4b6c06223 100644 --- a/fireflies/src/main/java/com/salesforce/apollo/fireflies/FireflyMetricsImpl.java +++ b/fireflies/src/main/java/com/salesforce/apollo/fireflies/FireflyMetricsImpl.java @@ -51,14 +51,14 @@ public class FireflyMetricsImpl extends EndpointMetricsImpl implements FireflyMe public FireflyMetricsImpl(Digest context, MetricRegistry registry) { super(registry); - inboundGateway = registry.histogram(name(context.shortString(), "ff.gateway.inbound")); - inboundJoin = registry.histogram(name(context.shortString(), "ff.join.inbound")); + inboundGateway = registry.histogram(name(context.shortString(), "ff.gateway.inbound.bytes")); + inboundJoin = registry.histogram(name(context.shortString(), "ff.join.inbound.bytes")); inboundJoinDuration = registry.timer(name(context.shortString(), "ff.join.inbound.duration")); inboundSeedDuration = registry.timer(name(context.shortString(), "ff.seed.inbound.duration")); - outboundJoin = registry.histogram(name(context.shortString(), "ff.join.outbound")); + outboundJoin = registry.histogram(name(context.shortString(), "ff.join.outbound.bytes")); joinDuration = registry.timer(name(context.shortString(), "ff.join.duration")); - outboundGateway = registry.histogram(name(context.shortString(), "ff.gateway.outbound")); - outboundRedirect = registry.histogram(name(context.shortString(), "ff.redirect.outbound")); + outboundGateway = registry.histogram(name(context.shortString(), "ff.gateway.outbound.bytes")); + outboundRedirect = registry.histogram(name(context.shortString(), "ff.redirect.outbound.bytes")); outboundUpdateTimer = registry.timer(name(context.shortString(), "ff.update.outbound.duration")); inboundUpdateTimer = registry.timer(name(context.shortString(), "ff.update.inbound.duration")); outboundUpdate = registry.histogram(name(context.shortString(), "ff.update.outbound.bytes")); @@ -74,11 +74,11 @@ public FireflyMetricsImpl(Digest context, MetricRegistry registry) { joining = registry.meter(name(context.shortString(), "ff.joining")); leaving = registry.meter(name(context.shortString(), "ff.leaving")); filteredNotes = registry.meter(name(context.shortString(), "ff.gossip.notes.filtered")); - inboundRedirect = registry.histogram(name(context.shortString(), "ff.redirect.inbound")); - outboundSeed = registry.histogram(name(context.shortString(), "ff.seed.outbound")); + inboundRedirect = registry.histogram(name(context.shortString(), "ff.redirect.inbound.bytes")); + outboundSeed = registry.histogram(name(context.shortString(), "ff.seed.outbound.bytes")); seedDuration = registry.timer(name(context.shortString(), "ff.seed.duration")); shunnedGossip = registry.meter(name(context.shortString(), "ff.gossip.shunned")); - inboundSeed = registry.histogram(name(context.shortString(), "ff.seed.inbound")); + inboundSeed = registry.histogram(name(context.shortString(), "ff.seed.inbound.bytes")); viewChanges = registry.meter(name(context.shortString(), "ff.view.change")); } diff --git a/protocols/src/main/java/com/salesforce/apollo/protocols/EndpointMetrics.java b/protocols/src/main/java/com/salesforce/apollo/protocols/EndpointMetrics.java index 60bff8407..6a7acef5b 100644 --- a/protocols/src/main/java/com/salesforce/apollo/protocols/EndpointMetrics.java +++ b/protocols/src/main/java/com/salesforce/apollo/protocols/EndpointMetrics.java @@ -14,8 +14,8 @@ */ public interface EndpointMetrics { - String INBOUND_BANDWIDTH = "bandwidth.inbound"; - String OUTBOUND_BANDWIDTH = "bandwidth.outbound"; + String INBOUND_BANDWIDTH = "bandwidth.inbound.bytes"; + String OUTBOUND_BANDWIDTH = "bandwidth.outbound.bytes"; Meter inboundBandwidth();