Changeset 711 in code for trunk

Timestamp:

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

Author:

contact

Message:

Add message counter metrics

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• server.go (modified) (2 diffs)
• upstream.go (modified) (2 diffs)

trunk/downstream.go

@@ -445 +445 @@
 }
 
+func (dc *downstreamConn) ReadMessage() (*irc.Message, error) {
+        msg, err := dc.conn.ReadMessage()
+        if err != nil {
+                return nil, err
+        }
+        dc.srv.metrics.downstreamInMessagesTotal.Inc()
+        return msg, nil
+}
+
 func (dc *downstreamConn) readMessages(ch chan<- event) error {
         for {
@@ -499 +508 @@
         }
 
+        dc.srv.metrics.downstreamOutMessagesTotal.Inc()
         dc.conn.SendMessage(msg)
 }

trunk/server.go

@@ -102 +102 @@
                 downstreams int64Gauge
                 upstreams   int64Gauge
+
+                upstreamOutMessagesTotal   prometheus.Counter
+                upstreamInMessagesTotal    prometheus.Counter
+                downstreamOutMessagesTotal prometheus.Counter
+                downstreamInMessagesTotal  prometheus.Counter
         }
 }
@@ -171 +176 @@
                 Help: "Current number of upstream connections",
         }, s.metrics.upstreams.Float64)
+
+        s.metrics.upstreamOutMessagesTotal = factory.NewCounter(prometheus.CounterOpts{
+                Name: "soju_upstream_out_messages_total",
+                Help: "Total number of outgoing messages sent to upstream servers",
+        })
+
+        s.metrics.upstreamInMessagesTotal = factory.NewCounter(prometheus.CounterOpts{
+                Name: "soju_upstream_in_messages_total",
+                Help: "Total number of incoming messages received from upstream servers",
+        })
+
+        s.metrics.downstreamOutMessagesTotal = factory.NewCounter(prometheus.CounterOpts{
+                Name: "soju_downstream_out_messages_total",
+                Help: "Total number of outgoing messages sent to downstream clients",
+        })
+
+        s.metrics.downstreamInMessagesTotal = factory.NewCounter(prometheus.CounterOpts{
+                Name: "soju_downstream_in_messages_total",
+                Help: "Total number of incoming messages received from downstream clients",
+        })
 }
 

trunk/upstream.go

@@ -1807 +1807 @@
 }
 
+func (uc *upstreamConn) ReadMessage() (*irc.Message, error) {
+        msg, err := uc.conn.ReadMessage()
+        if err != nil {
+                return nil, err
+        }
+        uc.srv.metrics.upstreamInMessagesTotal.Inc()
+        return msg, nil
+}
+
 func (uc *upstreamConn) runUntilRegistered() error {
         for !uc.registered {
@@ -1857 +1866 @@
         }
 
+        uc.srv.metrics.upstreamOutMessagesTotal.Inc()
         uc.conn.SendMessage(msg)
 }