Skip to content

Commit

Permalink
Avoid Nil Pointer with JetstreamAPIPending (#220)
Browse files Browse the repository at this point in the history
* Avoid potential nil pointer with JetstreamAPIPending metric

* Counter -> Gauge
  • Loading branch information
samuelattwood authored Oct 28, 2024
1 parent 042f762 commit c847275
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion surveyor/collector_statz.go
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,6 @@ func (sc *StatzCollector) Collect(ch chan<- prometheus.Metric) {
metrics.newGaugeMetric(sc.descs.JetstreamHAAssets, float64(sm.Stats.JetStream.Stats.HAAssets), lblServerID)
// At present, Total does not include Errors. Keeping them separate
metrics.newCounterMetric(sc.descs.JetstreamAPIRequests, float64(sm.Stats.JetStream.Stats.API.Total), lblServerID)
metrics.newCounterMetric(sc.descs.JetstreamAPIPending, float64(sm.Stats.JetStream.Meta.Pending), lblServerID)
metrics.newCounterMetric(sc.descs.JetstreamAPIErrors, float64(sm.Stats.JetStream.Stats.API.Errors), lblServerID)
}

Expand All @@ -1000,6 +999,7 @@ func (sc *StatzCollector) Collect(ch chan<- prometheus.Metric) {
jsRaftGroupLabelValues := []string{sm.Server.ID, serverName(&sm.Server), sm.Server.Cluster}
// FIXME: add labels needed or remove...

metrics.newGaugeMetric(sc.descs.JetstreamAPIPending, float64(sm.Stats.JetStream.Meta.Pending), jsRaftGroupLabelValues)
metrics.newGaugeMetric(sc.descs.JetstreamClusterRaftGroupSize, float64(sm.Stats.JetStream.Meta.Size), jsRaftGroupLabelValues)

// Could provide false positive if two server have the same server_name in the same or different clusters in the super-cluster...
Expand Down

0 comments on commit c847275

Please sign in to comment.