Merge pull request #1154 from ripienaar/slow_breakdown

Support showing a breakdown of slow consumers
nats-io · Sep 17, 2024 · 29a66eb · 29a66eb
2 parents 0a41d0b + 85b941b
commit 29a66eb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/cli/server_list_command.go b/cli/server_list_command.go
@@ -243,6 +243,33 @@ func (c *SrvLsCmd) list(_ *fisk.ParseContext) error {
 			gwaysOk = "X"
 		}
 
+		var slow []string
+		if ssm.Stats.SlowConsumersStats != nil {
+			sstat := ssm.Stats.SlowConsumersStats
+			if sstat.Clients > 0 {
+				slow = append(slow, fmt.Sprintf("c: %s", f(sstat.Clients)))
+			}
+			if sstat.Routes > 0 {
+				slow = append(slow, fmt.Sprintf("r: %s", f(sstat.Routes)))
+			}
+			if sstat.Gateways > 0 {
+				slow = append(slow, fmt.Sprintf("g: %s", f(sstat.Gateways)))
+			}
+			if sstat.Leafs > 0 {
+				slow = append(slow, fmt.Sprintf("l: %s", f(sstat.Leafs)))
+			}
+
+			// only print details if non clients also had slow consumers
+			if len(slow) == 1 && sstat.Clients > 0 {
+				slow = []string{}
+			}
+		}
+
+		sc := f(ssm.Stats.SlowConsumers)
+		if len(slow) > 0 {
+			sc = fmt.Sprintf("%s (%s)", sc, strings.Join(slow, " "))
+		}
+
 		table.AddRow(
 			cNames[i],
 			cluster,
@@ -256,7 +283,7 @@ func (c *SrvLsCmd) list(_ *fisk.ParseContext) error {
 			humanize.IBytes(uint64(ssm.Stats.Mem)),
 			fmt.Sprintf("%.0f", ssm.Stats.CPU),
 			ssm.Stats.Cores,
-			ssm.Stats.SlowConsumers,
+			sc,
 			f(ssm.Server.Time.Sub(ssm.Stats.Start)),
 			f(ssm.rtt.Round(time.Millisecond)))
 	}

diff --git a/go.mod b/go.mod
@@ -21,8 +21,8 @@ require (
 	github.com/klauspost/compress v1.17.9
 	github.com/mattn/go-isatty v0.0.20
 	github.com/nats-io/jsm.go v0.1.1-0.20240910110459-a94b3842a419
-	github.com/nats-io/jwt/v2 v2.5.8
-	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240909173510-a07bde9fa7d4
+	github.com/nats-io/jwt/v2 v2.6.0
+	github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240917003858-cec21b7274f4
 	github.com/nats-io/nats.go v1.37.0
 	github.com/nats-io/nkeys v0.4.7
 	github.com/nats-io/nuid v1.0.1

diff --git a/go.sum b/go.sum
@@ -108,10 +108,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nats-io/jsm.go v0.1.1-0.20240910110459-a94b3842a419 h1:ahH+acQcvfgk8sqFzVlZcVPdK2jHMxqVnZSsLYBshOU=
 github.com/nats-io/jsm.go v0.1.1-0.20240910110459-a94b3842a419/go.mod h1:qarKt1X8221zgCOg+JcjkH1/i7+p3HQFRWNYv1lk3dI=
-github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE=
-github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
-github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240909173510-a07bde9fa7d4 h1:4ZtCJK+tZMXPcyzFGNWNkJSY1/twBs15DHwMFp7BHWw=
-github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240909173510-a07bde9fa7d4/go.mod h1:o07K/z9ovs02pREUUNWwGGuIYqL110VKnjbjHp+/TjE=
+github.com/nats-io/jwt/v2 v2.6.0 h1:yXoBTdEotZw3NujMT+Nnu1UPNlFWdKQ3d0JJF/+pJag=
+github.com/nats-io/jwt/v2 v2.6.0/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A=
+github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240917003858-cec21b7274f4 h1:uQXXAFEWb429/i0mKP7WSdW7UrUedkZmC1/fI3BFESQ=
+github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20240917003858-cec21b7274f4/go.mod h1:7ME9V++zVk2hoBe5VOvq/WMQuOuNeyhG63bOwWWokZY=
 github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE=
 github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
 github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=