Skip to content

Commit d6f1b06

Browse files
committed
change to use type
Signed-off-by: Yijie Qin <qinyijie@amazon.com>
1 parent 0365063 commit d6f1b06

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

pkg/alertmanager/state_replication.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ func newReplicatedStates(userID string, rf int, re Replicator, st alertstore.Ale
8080
partialStateMergesTotal: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
8181
Name: "alertmanager_partial_state_merges_total",
8282
Help: "Number of times we have received a partial state to merge for a key.",
83-
}, []string{"key"}),
83+
}, []string{"type"}),
8484
partialStateMergesFailed: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
8585
Name: "alertmanager_partial_state_merges_failed_total",
8686
Help: "Number of times we have failed to merge a partial state received for a key.",
87-
}, []string{"key"}),
87+
}, []string{"type"}),
8888
stateReplicationTotal: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
8989
Name: "alertmanager_state_replication_total",
9090
Help: "Number of times we have tried to replicate a state to other alertmanagers.",
91-
}, []string{"key"}),
91+
}, []string{"type"}),
9292
stateReplicationFailed: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
9393
Name: "alertmanager_state_replication_failed_total",
9494
Help: "Number of times we have failed to replicate a state to other alertmanagers.",
95-
}, []string{"key"}),
95+
}, []string{"type"}),
9696
fetchReplicaStateTotal: promauto.With(r).NewCounter(prometheus.CounterOpts{
9797
Name: "alertmanager_state_fetch_replica_state_total",
9898
Help: "Number of times we have tried to read and merge the full state from another replica.",
@@ -132,10 +132,10 @@ func (s *state) AddState(key string, cs cluster.State, _ prometheus.Registerer)
132132

133133
s.states[key] = cs
134134

135-
s.partialStateMergesTotal.WithLabelValues(getKeyWithoutUser(key))
136-
s.partialStateMergesFailed.WithLabelValues(getKeyWithoutUser(key))
137-
s.stateReplicationTotal.WithLabelValues(getKeyWithoutUser(key))
138-
s.stateReplicationFailed.WithLabelValues(getKeyWithoutUser(key))
135+
s.partialStateMergesTotal.WithLabelValues(getStateTypeFromKey(key))
136+
s.partialStateMergesFailed.WithLabelValues(getStateTypeFromKey(key))
137+
s.stateReplicationTotal.WithLabelValues(getStateTypeFromKey(key))
138+
s.stateReplicationFailed.WithLabelValues(getStateTypeFromKey(key))
139139

140140
return &stateChannel{
141141
s: s,
@@ -145,18 +145,18 @@ func (s *state) AddState(key string, cs cluster.State, _ prometheus.Registerer)
145145

146146
// MergePartialState merges a received partial message with an internal state.
147147
func (s *state) MergePartialState(p *clusterpb.Part) error {
148-
s.partialStateMergesTotal.WithLabelValues(getKeyWithoutUser(p.Key)).Inc()
148+
s.partialStateMergesTotal.WithLabelValues(getStateTypeFromKey(p.Key)).Inc()
149149

150150
s.mtx.Lock()
151151
defer s.mtx.Unlock()
152152
st, ok := s.states[p.Key]
153153
if !ok {
154-
s.partialStateMergesFailed.WithLabelValues(getKeyWithoutUser(p.Key)).Inc()
154+
s.partialStateMergesFailed.WithLabelValues(getStateTypeFromKey(p.Key)).Inc()
155155
return fmt.Errorf("key not found while merging")
156156
}
157157

158158
if err := st.Merge(p.Data); err != nil {
159-
s.partialStateMergesFailed.WithLabelValues(getKeyWithoutUser(p.Key)).Inc()
159+
s.partialStateMergesFailed.WithLabelValues(getStateTypeFromKey(p.Key)).Inc()
160160
return err
161161
}
162162

@@ -286,9 +286,9 @@ func (s *state) running(ctx context.Context) error {
286286
return nil
287287
}
288288

289-
s.stateReplicationTotal.WithLabelValues(getKeyWithoutUser(p.Key)).Inc()
289+
s.stateReplicationTotal.WithLabelValues(getStateTypeFromKey(p.Key)).Inc()
290290
if err := s.replicator.ReplicateStateForUser(ctx, s.userID, p); err != nil {
291-
s.stateReplicationFailed.WithLabelValues(getKeyWithoutUser(p.Key)).Inc()
291+
s.stateReplicationFailed.WithLabelValues(getStateTypeFromKey(p.Key)).Inc()
292292
level.Error(s.logger).Log("msg", "failed to replicate state to other alertmanagers", "user", s.userID, "key", p.Key, "err", err)
293293
}
294294
case <-ctx.Done():
@@ -316,8 +316,8 @@ func (c *stateChannel) Broadcast(b []byte) {
316316
c.s.broadcast(c.key, b)
317317
}
318318

319-
// getKeyWithoutUser used for trim the userID out of the metric label value.
320-
func getKeyWithoutUser(key string) string {
319+
// getStateTypeFromKey used for get the state type out of the state key.
320+
func getStateTypeFromKey(key string) string {
321321
if strings.IndexByte(key, ':') < 0 {
322322
return key
323323
}

pkg/alertmanager/state_replication_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ alertmanager_state_fetch_replica_state_failed_total 0
166166
alertmanager_state_fetch_replica_state_total 1
167167
# HELP alertmanager_partial_state_merges_failed_total Number of times we have failed to merge a partial state received for a key.
168168
# TYPE alertmanager_partial_state_merges_failed_total counter
169-
alertmanager_partial_state_merges_failed_total{key="nflog"} 0
169+
alertmanager_partial_state_merges_failed_total{type="nflog"} 0
170170
# HELP alertmanager_partial_state_merges_total Number of times we have received a partial state to merge for a key.
171171
# TYPE alertmanager_partial_state_merges_total counter
172-
alertmanager_partial_state_merges_total{key="nflog"} 0
172+
alertmanager_partial_state_merges_total{type="nflog"} 0
173173
# HELP alertmanager_state_initial_sync_completed_total Number of times we have completed syncing initial state for each possible outcome.
174174
# TYPE alertmanager_state_initial_sync_completed_total counter
175175
alertmanager_state_initial_sync_completed_total{outcome="failed"} 0
@@ -181,10 +181,10 @@ alertmanager_state_initial_sync_completed_total{outcome="user-not-found"} 0
181181
alertmanager_state_initial_sync_total 1
182182
# HELP alertmanager_state_replication_failed_total Number of times we have failed to replicate a state to other alertmanagers.
183183
# TYPE alertmanager_state_replication_failed_total counter
184-
alertmanager_state_replication_failed_total{key="nflog"} 0
184+
alertmanager_state_replication_failed_total{type="nflog"} 0
185185
# HELP alertmanager_state_replication_total Number of times we have tried to replicate a state to other alertmanagers.
186186
# TYPE alertmanager_state_replication_total counter
187-
alertmanager_state_replication_total{key="nflog"} 1
187+
alertmanager_state_replication_total{type="nflog"} 1
188188
`),
189189
"alertmanager_state_fetch_replica_state_failed_total",
190190
"alertmanager_state_fetch_replica_state_total",

0 commit comments

Comments
 (0)