@@ -102,7 +102,7 @@ type MetricsCollector struct {
102
102
103
103
latestState atomic.Pointer [metricsState ]
104
104
105
- replacementsCounter map [replacementKey ]* atomic. Int64
105
+ replacementsCounter map [replacementKey ]float64
106
106
replacementsCounterMu sync.Mutex
107
107
}
108
108
@@ -114,7 +114,7 @@ func NewMetricsCollector(db database.Store, logger slog.Logger, snapshotter preb
114
114
database : db ,
115
115
logger : log ,
116
116
snapshotter : snapshotter ,
117
- replacementsCounter : make (map [replacementKey ]* atomic. Int64 ),
117
+ replacementsCounter : make (map [replacementKey ]float64 ),
118
118
}
119
119
}
120
120
@@ -148,7 +148,7 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {
148
148
149
149
mc .replacementsCounterMu .Lock ()
150
150
for key , val := range mc .replacementsCounter {
151
- metricsCh <- prometheus .MustNewConstMetric (resourceReplacementsDesc , prometheus .CounterValue , float64 ( val . Load ()) , key .templateName , key .presetName , key .orgName )
151
+ metricsCh <- prometheus .MustNewConstMetric (resourceReplacementsDesc , prometheus .CounterValue , val , key .templateName , key .presetName , key .orgName )
152
152
}
153
153
mc .replacementsCounterMu .Unlock ()
154
154
@@ -236,13 +236,10 @@ func (mc *MetricsCollector) trackResourceReplacement(orgName, templateName, pres
236
236
defer mc .replacementsCounterMu .Unlock ()
237
237
238
238
key := replacementKey {orgName : orgName , templateName : templateName , presetName : presetName }
239
- if _ , ok := mc .replacementsCounter [key ]; ! ok {
240
- mc .replacementsCounter [key ] = & atomic.Int64 {}
241
- }
242
239
243
240
// We only track _that_ a resource replacement occurred, not how many.
244
241
// Just one is enough to ruin a prebuild, but we can't know apriori which replacement would cause this.
245
242
// For example, say we have 2 replacements: a docker_container and a null_resource; we don't know which one might
246
243
// cause an issue (or indeed if either would), so we just track the replacement.
247
- mc .replacementsCounter [key ]. Add ( 1 )
244
+ mc .replacementsCounter [key ] += 1
248
245
}
0 commit comments