Changeset 710 in code for trunk

Timestamp:

Nov 17, 2021, 2:58:19 PM (4 years ago)

Author:

contact

Message:

Add number of upstream connections to metrics

Location:

trunk

Files:

• server.go (modified) (4 diffs)
• service.go (modified) (1 diff)
• user.go (modified) (2 diffs)

trunk/server.go

@@ -101 +101 @@
         metrics struct {
                 downstreams int64Gauge
+                upstreams   int64Gauge
         }
 }
@@ -165 +166 @@
                 Help: "Current number of downstream connections",
         }, s.metrics.downstreams.Float64)
+
+        factory.NewGaugeFunc(prometheus.GaugeOpts{
+                Name: "soju_upstreams_active",
+                Help: "Current number of upstream connections",
+        }, s.metrics.upstreams.Float64)
 }
 
@@ -344 +350 @@
         Users       int
         Downstreams int64
+        Upstreams   int64
 }
 
@@ -352 +359 @@
         s.lock.Unlock()
         stats.Downstreams = s.metrics.downstreams.Value()
+        stats.Upstreams = s.metrics.upstreams.Value()
         return &stats
 }

trunk/service.go

@@ -1036 +1036 @@
         }
         serverStats := dc.user.srv.Stats()
-        sendServicePRIVMSG(dc, fmt.Sprintf("%v/%v users, %v downstreams, %v networks, %v channels", serverStats.Users, dbStats.Users, serverStats.Downstreams, dbStats.Networks, dbStats.Channels))
+        sendServicePRIVMSG(dc, fmt.Sprintf("%v/%v users, %v downstreams, %v upstreams, %v networks, %v channels", serverStats.Users, dbStats.Users, serverStats.Downstreams, serverStats.Upstreams, dbStats.Networks, dbStats.Channels))
         return nil
 }

trunk/user.go

@@ -214 +214 @@
                 }
 
+                net.user.srv.metrics.upstreams.Add(1)
+
                 uc.register()
                 if err := uc.runUntilRegistered(); err != nil {
@@ -240 +242 @@
                         net.user.srv.Identd.Delete(uc.RemoteAddr().String(), uc.LocalAddr().String())
                 }
+
+                net.user.srv.metrics.upstreams.Add(-1)
         }
 }