Skip to content

Commit fd9fe83

Browse files
authored
Fix panic on metrics init (#2805)
2 parents a22f00b + d0ad412 commit fd9fe83

File tree

3 files changed

+28
-35
lines changed

3 files changed

+28
-35
lines changed

pkg/metrics/engine.go

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ import (
88

99
type (
1010
engineMetrics struct {
11-
listContainersDurationCounter prometheus.Counter
12-
estimateContainerSizeDurationCounter prometheus.Counter
13-
deleteDurationCounter prometheus.Counter
14-
existsDurationCounter prometheus.Counter
15-
getDurationCounter prometheus.Counter
16-
headDurationCounter prometheus.Counter
17-
inhumeDurationCounter prometheus.Counter
18-
putDurationCounter prometheus.Counter
19-
rangeDurationCounter prometheus.Counter
20-
searchDurationCounter prometheus.Counter
21-
listObjectsDurationCounter prometheus.Counter
22-
2311
listContainersDuration prometheus.Histogram
2412
estimateContainerSizeDuration prometheus.Histogram
2513
deleteDuration prometheus.Histogram
@@ -166,72 +154,49 @@ func (m engineMetrics) register() {
166154
prometheus.MustRegister(m.listObjectsDuration)
167155
prometheus.MustRegister(m.containerSize)
168156
prometheus.MustRegister(m.payloadSize)
169-
170-
prometheus.MustRegister(m.listContainersDurationCounter)
171-
prometheus.MustRegister(m.estimateContainerSizeDurationCounter)
172-
prometheus.MustRegister(m.deleteDurationCounter)
173-
prometheus.MustRegister(m.existsDurationCounter)
174-
prometheus.MustRegister(m.getDurationCounter)
175-
prometheus.MustRegister(m.headDurationCounter)
176-
prometheus.MustRegister(m.inhumeDurationCounter)
177-
prometheus.MustRegister(m.putDurationCounter)
178-
prometheus.MustRegister(m.rangeDurationCounter)
179-
prometheus.MustRegister(m.searchDurationCounter)
180-
prometheus.MustRegister(m.listObjectsDurationCounter)
181157
}
182158

183159
func (m engineMetrics) AddListContainersDuration(d time.Duration) {
184-
m.listObjectsDurationCounter.Add(float64(d))
185160
m.listObjectsDuration.Observe(d.Seconds())
186161
}
187162

188163
func (m engineMetrics) AddEstimateContainerSizeDuration(d time.Duration) {
189-
m.estimateContainerSizeDurationCounter.Add(float64(d))
190164
m.estimateContainerSizeDuration.Observe(d.Seconds())
191165
}
192166

193167
func (m engineMetrics) AddDeleteDuration(d time.Duration) {
194-
m.deleteDurationCounter.Add(float64(d))
195168
m.deleteDuration.Observe(d.Seconds())
196169
}
197170

198171
func (m engineMetrics) AddExistsDuration(d time.Duration) {
199-
m.existsDurationCounter.Add(float64(d))
200172
m.existsDuration.Observe(d.Seconds())
201173
}
202174

203175
func (m engineMetrics) AddGetDuration(d time.Duration) {
204-
m.getDurationCounter.Add(float64(d))
205176
m.getDuration.Observe(d.Seconds())
206177
}
207178

208179
func (m engineMetrics) AddHeadDuration(d time.Duration) {
209-
m.headDurationCounter.Add(float64(d))
210180
m.headDuration.Observe(d.Seconds())
211181
}
212182

213183
func (m engineMetrics) AddInhumeDuration(d time.Duration) {
214-
m.inhumeDurationCounter.Add(float64(d))
215184
m.inhumeDuration.Observe(d.Seconds())
216185
}
217186

218187
func (m engineMetrics) AddPutDuration(d time.Duration) {
219-
m.putDurationCounter.Add(float64(d))
220188
m.putDuration.Observe(d.Seconds())
221189
}
222190

223191
func (m engineMetrics) AddRangeDuration(d time.Duration) {
224-
m.rangeDurationCounter.Add(float64(d))
225192
m.rangeDuration.Observe(d.Seconds())
226193
}
227194

228195
func (m engineMetrics) AddSearchDuration(d time.Duration) {
229-
m.searchDurationCounter.Add(float64(d))
230196
m.searchDuration.Observe(d.Seconds())
231197
}
232198

233199
func (m engineMetrics) AddListObjectsDuration(d time.Duration) {
234-
m.listObjectsDurationCounter.Add(float64(d))
235200
m.listObjectsDuration.Observe(d.Seconds())
236201
}
237202

pkg/metrics/innerring_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package metrics_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/nspcc-dev/neofs-node/pkg/metrics"
7+
"github.com/stretchr/testify/require"
8+
)
9+
10+
func TestNewInnerRingMetrics(t *testing.T) {
11+
require.NotPanics(t, func() {
12+
_ = metrics.NewInnerRingMetrics("any_version")
13+
})
14+
}

pkg/metrics/metrics_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package metrics_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/nspcc-dev/neofs-node/pkg/metrics"
7+
"github.com/stretchr/testify/require"
8+
)
9+
10+
func TestNewNodeMetrics(t *testing.T) {
11+
require.NotPanics(t, func() {
12+
_ = metrics.NewNodeMetrics("any_version")
13+
})
14+
}

0 commit comments

Comments
 (0)