github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106289 from CatherineF-dev/fix-metrics-AlreadyRegisteredError-in-unit-test

Browse Source 
Fix metrics AlreadyRegisteredError on TestRecordOperation and TestGetHistogramVecFromGatherer unit test
This commit is contained in:
Kubernetes Prow Robot
2021-11-16 16:36:15 -08:00
committed by GitHub
parent 165b581759 5646120fbb
commit 42d8b2f3b9
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/kuberuntime/instrumented_services_test.go
View File

@@ -24,15 +24,21 @@ import (
"github.com/stretchr/testify/assert"
"k8s.io/component-base/metrics/legacyregistry"
compbasemetrics "k8s.io/component-base/metrics"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"k8s.io/kubernetes/pkg/kubelet/metrics"
)
func TestRecordOperation(t *testing.T) {
legacyregistry.MustRegister(metrics.RuntimeOperations)
legacyregistry.MustRegister(metrics.RuntimeOperationsDuration)
legacyregistry.MustRegister(metrics.RuntimeOperationsErrors)
// Use local registry
var registry = compbasemetrics.NewKubeRegistry()
var gather compbasemetrics.Gatherer = registry
registry.MustRegister(metrics.RuntimeOperations)
registry.MustRegister(metrics.RuntimeOperationsDuration)
registry.MustRegister(metrics.RuntimeOperationsErrors)
registry.Reset()
l, err := net.Listen("tcp", "127.0.0.1:0")
assert.NoError(t, err)
@@ -40,8 +46,8 @@ func TestRecordOperation(t *testing.T) {
prometheusURL := "http://" + l.Addr().String() + "/metrics"
mux := http.NewServeMux()
//lint:ignore SA1019 ignore deprecated warning until we move off of global registries
mux.Handle("/metrics", legacyregistry.Handler())
handler := compbasemetrics.HandlerFor(gather, compbasemetrics.HandlerOpts{})
mux.Handle("/metrics", handler)
server := &http.Server{
Addr: l.Addr().String(),
Handler: mux,