feat: add traffic type of peer task download duration

dragonflyoss · May 13, 2023 · 7812089 · 7812089
1 parent cd0b95d
commit 7812089
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git 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"})
+	}, []string{"priority", "task_type", "task_tag", "task_app", "host_type", "traffic_type"})
 
 	ConcurrentScheduleGauge = promauto.NewGauge(prometheus.GaugeOpts{
 		Namespace: types.MetricsNamespace,

diff --git a/scheduler/service/service_v1.go b/scheduler/service/service_v1.go
@@ -311,18 +311,19 @@ func (v *V1) ReportPeerResult(ctx context.Context, req *schedulerv1.PeerResult)
 		return nil
 	}
 
-	// Collect DownloadPeerDuration metrics.
-	metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(),
-		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(req.Cost))
-
 	peer.Log.Info("report success peer")
 	if peer.FSM.Is(resource.PeerStateBackToSource) {
 		go v.createDownloadRecord(peer, parents, req)
 		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))
 		return nil
 	}
 
+	metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(),
+		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_LOCAL_PEER.String()).Observe(float64(req.Cost))
+
 	go v.createDownloadRecord(peer, parents, req)
 	v.handlePeerSuccess(ctx, peer)
 	return nil

diff --git a/scheduler/service/service_v2.go b/scheduler/service/service_v2.go
@@ -795,8 +795,13 @@ func (v *V2) handleDownloadPeerFinishedRequest(ctx context.Context, peerID strin
 	priority := peer.CalculatePriority(v.dynconfig)
 	metrics.DownloadPeerCount.WithLabelValues(priority.String(), peer.Task.Type.String(),
 		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Inc()
+	if peer.FSM.Is(resource.PeerStateBackToSource) {
+		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(peer.Cost.Load()))
+		return nil
+	}
 	metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(),
-		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(peer.Cost.Load()))
+		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_LOCAL_PEER.String()).Observe(float64(peer.Cost.Load()))
 
 	return nil
 }
@@ -845,8 +850,13 @@ func (v *V2) handleDownloadPeerBackToSourceFinishedRequest(ctx context.Context,
 	priority := peer.CalculatePriority(v.dynconfig)
 	metrics.DownloadPeerCount.WithLabelValues(priority.String(), peer.Task.Type.String(),
 		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Inc()
+	if peer.FSM.Is(resource.PeerStateBackToSource) {
+		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(peer.Cost.Load()))
+		return nil
+	}
 	metrics.DownloadPeerDuration.WithLabelValues(priority.String(), peer.Task.Type.String(),
-		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name()).Observe(float64(peer.Cost.Load()))
+		peer.Task.Tag, peer.Task.Application, peer.Host.Type.Name(), commonv2.TrafficType_LOCAL_PEER.String()).Observe(float64(peer.Cost.Load()))
 
 	return nil
 }