From 32b530b60f37a53450d93aacf1a7a993d5f9e9b0 Mon Sep 17 00:00:00 2001 From: youhwsh Date: Wed, 4 Jun 2025 21:46:12 +0800 Subject: [PATCH] remove containerid from metrics --- pkg/monitoring/metrics.go | 4 ++-- pkg/server/docker/handler.go | 28 +++++++++++----------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/pkg/monitoring/metrics.go b/pkg/monitoring/metrics.go index ce0dfc8..aa70613 100644 --- a/pkg/monitoring/metrics.go +++ b/pkg/monitoring/metrics.go @@ -44,7 +44,7 @@ var ( Help: "Duration of requests in proxy in seconds", Buckets: prometheus.DefBuckets, }, - []string{"request", "containerid"}, + []string{"request"}, ) HookRequestDuration = promauto.NewHistogramVec( @@ -53,6 +53,6 @@ var ( Help: "Duration of requests in hook in seconds", Buckets: prometheus.DefBuckets, }, - []string{"hook", "containerid"}, + []string{"hook"}, ) ) diff --git a/pkg/server/docker/handler.go b/pkg/server/docker/handler.go index 7bcd456..3ae8b48 100644 --- a/pkg/server/docker/handler.go +++ b/pkg/server/docker/handler.go @@ -80,14 +80,13 @@ func (d *dockerHandler) HandleStartContainer() func(http.ResponseWriter, *http.R defer d.Mutex.Unlock() klog.V(3).InfoS("Start container", "url", req.URL.String()) start := time.Now() - var containerID string defer func() { duration := time.Since(start).Seconds() - monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyStartContainerRequest, containerID).Observe(duration) + monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyStartContainerRequest).Observe(duration) }() vars := mux.Vars(req) - containerID = vars["containerid"] + containerID := vars["containerid"] klog.V(5).InfoS("Start container", "containerId", containerID) @@ -101,14 +100,13 @@ func (d *dockerHandler) HandleStopContainer() func(http.ResponseWriter, *http.Re defer d.Mutex.Unlock() klog.V(3).InfoS("Stop container", "url", req.URL.String()) start := time.Now() - var containerID string defer func() { duration := time.Since(start).Seconds() - monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyStopContainerRequest, containerID).Observe(duration) + monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyStopContainerRequest).Observe(duration) }() vars := mux.Vars(req) - containerID = vars["containerid"] + containerID := vars["containerid"] klog.V(5).InfoS("Stop container", "containerId", containerID) @@ -122,15 +120,14 @@ func (d *dockerHandler) HandleUpdateContainer() func(http.ResponseWriter, *http. defer d.Mutex.Unlock() klog.V(3).InfoS("Update container", "url", req.URL.String()) start := time.Now() - var containerID string defer func() { duration := time.Since(start).Seconds() - monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyUpdateContainerRequest, containerID).Observe(duration) + monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyUpdateContainerRequest).Observe(duration) }() vars := mux.Vars(req) - containerID = vars["containerid"] + containerID := vars["containerid"] klog.V(5).InfoS("Update container", "containerId", containerID) @@ -144,14 +141,13 @@ func (d *dockerHandler) HandleDeleteContainer() func(http.ResponseWriter, *http. defer d.Mutex.Unlock() klog.V(3).InfoS("Delete container", "url", req.URL.String()) start := time.Now() - var containerID string defer func() { duration := time.Since(start).Seconds() - monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyRemoveContainerRequest, containerID).Observe(duration) + monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyRemoveContainerRequest).Observe(duration) }() vars := mux.Vars(req) - containerID = vars["containerid"] + containerID := vars["containerid"] klog.V(5).InfoS("Delete container", "containerId", containerID) @@ -183,11 +179,10 @@ func (d *dockerHandler) HandleCreateContainer() func(http.ResponseWriter, *http. klog.V(3).InfoS("Create container", "url", req.URL.String()) - var containerId string start := time.Now() defer func() { duration := time.Since(start).Seconds() - monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyCreateContainerRequest, containerId).Observe(duration) + monitoring.ProxyRequestDuration.WithLabelValues(monitoring.ProxyCreateContainerRequest).Observe(duration) }() // get create container config @@ -259,7 +254,7 @@ func (d *dockerHandler) HandleCreateContainer() func(http.ResponseWriter, *http. klog.ErrorS(err, "Error from PreCreateContainerHook") } hookDuration := time.Since(hookStartTime).Seconds() - monitoring.HookRequestDuration.WithLabelValues(monitoring.PreCreateContainerHook, containerId).Observe(hookDuration) + monitoring.HookRequestDuration.WithLabelValues(monitoring.PreCreateContainerHook).Observe(hookDuration) } else { podReq = &v1alpha1.PodSandboxHookRequest{ @@ -282,7 +277,7 @@ func (d *dockerHandler) HandleCreateContainer() func(http.ResponseWriter, *http. klog.ErrorS(err, "Error from PreRunPodSandboxHook") } hookDuration := time.Since(hookStartTime).Seconds() - monitoring.HookRequestDuration.WithLabelValues(monitoring.PreRunPodSandboxHook, containerId).Observe(hookDuration) + monitoring.HookRequestDuration.WithLabelValues(monitoring.PreRunPodSandboxHook).Observe(hookDuration) } cfgBody := utils.ConfigWrapper{ @@ -342,7 +337,6 @@ func (d *dockerHandler) HandleCreateContainer() func(http.ResponseWriter, *http. klog.V(5).InfoS("Response from create container", "response", resp) - containerId = createResp.ID if runtimeResourceType == utils.RuntimePodResource { _, err = d.cache.InsertPod(createResp.ID, podReq, nil) if err != nil { -- Gitee