metrics: utp metrics

Author: ScottyPoi

packages/portalnetwork/src/util/metrics.ts

@@ -85,15 +85,25 @@ const ultralightMetrics = [
     help: 'how many total UTP streams were opened',
   },
   {
-    name: 'utpWriteStreams',
+    name: 'utpWriteStreamsOpened',
     metric: MetricType.Gauge,
     help: 'how many UTP write streams were opened',
   },
   {
-    name: 'utpReadStreams',
+    name: 'utpWriteStreamsCompleted',
+    metric: MetricType.Gauge,
+    help: 'how many UTP write streams were completed',
+  },
+  {
+    name: 'utpReadStreamsOpened',
     metric: MetricType.Gauge,
     help: 'how many UTP read streams were opened',
   },
+  {
+    name: 'utpReadStreamsCompleted',
+    metric: MetricType.Gauge,
+    help: 'how many UTP read streams were completed',
+  },
 ]
 
 export const setupMetrics = (

packages/portalnetwork/src/wire/utp/PortalNetworkUtp/index.ts

@@ -99,11 +99,11 @@ export class PortalNetworkUTP {
         requestCode === RequestCode.OFFER_WRITE
       ) {
         const utpWriteMetric = (NetworkNames[params.networkId] +
-          '_utpWriteStreams') as keyof PortalNetworkMetrics
+          '_utpWriteStreamsOpened') as keyof PortalNetworkMetrics
         this.client.metrics[utpWriteMetric].inc()
       } else {
         const utpReadMetric = (NetworkNames[params.networkId] +
-          '_utpReadStreams') as keyof PortalNetworkMetrics
+          '_utpReadStreamsOpened') as keyof PortalNetworkMetrics
         this.client.metrics[utpReadMetric].inc()
       }
     }

packages/portalnetwork/src/wire/utp/Socket/ReadSocket.ts

@@ -1,9 +1,11 @@
+import { NetworkNames } from '../../../networks/types.js'
 import { UtpSocketType } from '../Packets/index.js'
 
 import { ContentReader } from './ContentReader.js'
 import { UtpSocket } from './UtpSocket.js'
 import { ConnectionState } from './socketTyping.js'
 
+import type { PortalNetworkMetrics } from '../../../client/types.js'
 import type { Packet, PacketType, UtpSocketOptions } from '../Packets/index.js'
 
 export class ReadSocket extends UtpSocket {
@@ -122,5 +124,10 @@ export class ReadSocket extends UtpSocket {
       this.logger.extend('CLOSE')(`Running compiler.`)
       return this.compile()
     }
+    if (this.utp.client.metrics) {
+      const utpReadMetric = (NetworkNames[this.networkId] +
+        '_utpReadStreamsCompleted') as keyof PortalNetworkMetrics
+      this.utp.client.metrics[utpReadMetric].inc()
+    }
   }
 }

packages/portalnetwork/src/wire/utp/Socket/WriteSocket.ts

@@ -1,7 +1,9 @@
+import { NetworkNames } from '../../../networks/types.js'
 import { ConnectionState, ContentWriter, PacketType, UtpSocketType, randUint16 } from '../index.js'
 
 import { UtpSocket } from './UtpSocket.js'
 
+import type { PortalNetworkMetrics } from '../../../client/types.js'
 import type { ICreateData, UtpSocketOptions } from '../index.js'
 
 export class WriteSocket extends UtpSocket {
@@ -66,6 +68,11 @@ export class WriteSocket extends UtpSocket {
     return false
   }
   close(): void {
+    if (this.utp.client.metrics) {
+      const metric = (NetworkNames[this.networkId] +
+        '_utpWriteStreamsCompleted') as keyof PortalNetworkMetrics
+      this.utp.client.metrics[metric].inc()
+    }
     clearInterval(this.packetManager.congestionControl.timeoutCounter)
     this.packetManager.congestionControl.removeAllListeners()
     this._clearTimeout()