Properly include relay endpoints and senders in relay bitrate/packet …

…rate stats. (#1822)
jitsi · Mar 1, 2022 · ff8609a · ff8609a
1 parent 3ce3c1a
commit ff8609a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/jvb/src/main/java/org/jitsi/videobridge/stats/VideobridgeStatistics.java b/jvb/src/main/java/org/jitsi/videobridge/stats/VideobridgeStatistics.java
@@ -380,15 +380,11 @@ private void generate0()
 
             for (Relay relay : conference.getRelays())
             {
-                TransceiverStats transceiverStats = relay.getTransceiver().getTransceiverStats();
-                PacketStreamStats.Snapshot incomingPacketStreamStats
-                    = transceiverStats.getRtpReceiverStats().getPacketStreamStats();
-                relayBitrateIncomingBps += incomingPacketStreamStats.getBitrateBps();
-                relayPacketRateIncoming += incomingPacketStreamStats.getPacketRate();
+                relayBitrateIncomingBps += relay.getIncomingBitrateBps();
+                relayPacketRateIncoming += relay.getIncomingPacketRate();
 
-                PacketStreamStats.Snapshot outgoingStats = transceiverStats.getOutgoingPacketStreamStats();
-                relayBitrateOutgoingBps += outgoingStats.getBitrateBps();
-                relayPacketRateOutgoing += outgoingStats.getPacketRate();
+                relayBitrateOutgoingBps += relay.getOutgoingBitrateBps();
+                relayPacketRateOutgoing += relay.getOutgoingPacketRate();
 
                 /* TODO: report Relay RTT and loss, like we do for Endpoints? */
             }

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/Relay.kt
@@ -86,6 +86,7 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicLong
 import java.util.function.Supplier
+import kotlin.collections.sumOf
 
 /**
  * Models a relay (remote videobridge) in a [Conference].
@@ -763,6 +764,26 @@ class Relay @JvmOverloads constructor(
         s?.expire()
     }
 
+    val incomingBitrateBps: Double
+        get() = transceiver.getTransceiverStats().rtpReceiverStats.packetStreamStats.getBitrateBps() +
+            synchronized(endpointsLock) {
+                relayedEndpoints.values.sumOf { it.getIncomingStats().getBitrateBps() }
+            }
+
+    val incomingPacketRate: Long
+        get() = transceiver.getTransceiverStats().rtpReceiverStats.packetStreamStats.packetRate +
+            synchronized(endpointsLock) {
+                relayedEndpoints.values.sumOf { it.getIncomingStats().packetRate }
+            }
+
+    val outgoingBitrateBps: Double
+        get() = transceiver.getTransceiverStats().outgoingPacketStreamStats.getBitrateBps() +
+            senders.values.sumOf { it.getOutgoingStats().getBitrateBps() }
+
+    val outgoingPacketRate: Long
+        get() = transceiver.getTransceiverStats().outgoingPacketStreamStats.packetRate +
+            senders.values.sumOf { it.getOutgoingStats().packetRate }
+
     /**
      * Updates the conference statistics with value from this endpoint. Since
      * the values are cumulative this should execute only once when the endpoint

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayEndpointSender.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayEndpointSender.kt
@@ -96,6 +96,8 @@ class RelayEndpointSender(
         rtpSender.setFeature(feature, enabled)
     }
 
+    fun getOutgoingStats() = rtpSender.getPacketStreamStats()
+
     fun getNodeStats(): NodeStatsBlock {
         return NodeStatsBlock("Remote Endpoint $id").apply {
             addBlock(streamInformationStore.getNodeStats())

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt
@@ -194,6 +194,8 @@ class RelayedEndpoint(
         rtpReceiver.setFeature(feature, enabled)
     }
 
+    fun getIncomingStats() = rtpReceiver.getStats().packetStreamStats
+
     fun getNodeStats(): NodeStatsBlock {
         return NodeStatsBlock("Remote Endpoint $id").apply {
             addBlock(streamInformationStore.getNodeStats())