From 71f13df1f0124af1d996846e410a1cbd65512382 Mon Sep 17 00:00:00 2001 From: Gaius Date: Tue, 16 May 2023 21:20:29 +0800 Subject: [PATCH] feat: remove traffic_type in DownloadPeerDuration metric (#2357) Signed-off-by: Gaius --- scheduler/metrics/metrics.go | 2 +- scheduler/service/service_v1.go | 4 ++-- scheduler/service/service_v2.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scheduler/metrics/metrics.go b/scheduler/metrics/metrics.go index abced5895..4ead31203 100644 --- a/scheduler/metrics/metrics.go +++ b/scheduler/metrics/metrics.go @@ -244,7 +244,7 @@ var ( Name: "download_peer_duration_milliseconds", Help: "Histogram of the time each peer downloading.", Buckets: []float64{100, 200, 500, 1000, 1500, 2 * 1000, 3 * 1000, 5 * 1000, 10 * 1000, 20 * 1000, 60 * 1000, 120 * 1000, 300 * 1000}, - }, []string{"priority", "task_type", "task_tag", "task_app", "host_type", "traffic_type"}) + }, []string{"priority", "task_type", "task_tag", "task_app", "host_type"}) ConcurrentScheduleGauge = promauto.NewGauge(prometheus.GaugeOpts{ Namespace: types.MetricsNamespace, diff --git a/scheduler/service/service_v1.go b/scheduler/service/service_v1.go index b8733dd59..b93479455 100644 --- a/scheduler/service/service_v1.go +++ b/scheduler/service/service_v1.go @@ -317,12 +317,12 @@ func (v *V1) ReportPeerResult(ctx context.Context, req *schedulerv1.PeerResult) v.handleTaskSuccess(ctx, peer.Task, req) v.handlePeerSuccess(ctx, peer) metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(), - peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_BACK_TO_SOURCE.String()).Observe(float64(req.Cost)) + peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(req.Cost)) return nil } metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(), - peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_REMOTE_PEER.String()).Observe(float64(req.Cost)) + peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(req.Cost)) go v.createDownloadRecord(peer, parents, req) v.handlePeerSuccess(ctx, peer) diff --git a/scheduler/service/service_v2.go b/scheduler/service/service_v2.go index e58623720..b98eb9a84 100644 --- a/scheduler/service/service_v2.go +++ b/scheduler/service/service_v2.go @@ -797,7 +797,7 @@ func (v *V2) handleDownloadPeerFinishedRequest(ctx context.Context, peerID strin peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Inc() // TODO to be determined which traffic type to use, temporarily use TrafficType_REMOTE_PEER instead metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(), - peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_REMOTE_PEER.String()).Observe(float64(peer.Cost.Load())) + peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(peer.Cost.Load())) return nil } @@ -848,7 +848,7 @@ func (v *V2) handleDownloadPeerBackToSourceFinishedRequest(ctx context.Context, peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Inc() // TODO to be determined which traffic type to use, temporarily use TrafficType_REMOTE_PEER instead metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(), - peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_REMOTE_PEER.String()).Observe(float64(peer.Cost.Load())) + peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(peer.Cost.Load())) return nil }