修复节点详情 OpenResty 连接数与吞吐显示为「—」：节点可观测 API 将 OpenResty 观测数据合并进 metric_snapshots；指标文案改为「请求/分钟」（近 60 秒窗口），连接数为 0 时正常显示 0。

2026-10-12 10:16:37 +08:00 · 2026-06-21 10:52:06 +08:00
parent 42896a8473
commit 6e86901a58
9 changed files with 344 additions and 165 deletions
@@ -51,4 +51,67 @@ func TestBuildTrafficTrendPointsBucketsByHour(t *testing.T) {
 	if currentHour.ErrorCount != 0 {
 		t.Fatalf("current hour error_count = %d, want 0", currentHour.ErrorCount)
 	}
-}
+}
+
+func TestBuildMetricSnapshotViewsMergesOpenrestyObservation(t *testing.T) {
+	t.Parallel()
+
+	capturedAt := time.Date(2026, 6, 19, 12, 0, 0, 0, time.UTC)
+	snapshots := []*model.OpenFlareMetricSnapshot{
+		{
+			ID:              1,
+			NodeID:          "node-a",
+			CapturedAt:      capturedAt,
+			CPUUsagePercent: 12.5,
+		},
+	}
+	openrestyObs := []*model.OpenFlareNodeObservationOpenresty{
+		{
+			NodeID:               "node-a",
+			CapturedAt:           capturedAt.Add(5 * time.Second),
+			OpenrestyRxBytes:     4096,
+			OpenrestyTxBytes:     8192,
+			OpenrestyConnections: 7,
+		},
+	}
+
+	views := BuildMetricSnapshotViews(snapshots, openrestyObs)
+	if len(views) != 1 {
+		t.Fatalf("BuildMetricSnapshotViews() len = %d, want 1", len(views))
+	}
+	if views[0].OpenrestyRxBytes != 4096 {
+		t.Fatalf("OpenrestyRxBytes = %d, want 4096", views[0].OpenrestyRxBytes)
+	}
+	if views[0].OpenrestyTxBytes != 8192 {
+		t.Fatalf("OpenrestyTxBytes = %d, want 8192", views[0].OpenrestyTxBytes)
+	}
+	if views[0].OpenrestyConnections != 7 {
+		t.Fatalf("OpenrestyConnections = %d, want 7", views[0].OpenrestyConnections)
+	}
+}
+
+func TestLatestTrafficReportUsesLatestWindowEndedAt(t *testing.T) {
+	t.Parallel()
+
+	older := &model.OpenFlareRequestReport{
+		WindowEndedAt: time.Date(2026, 6, 19, 10, 0, 0, 0, time.UTC),
+		RequestCount:  3,
+	}
+	newer := &model.OpenFlareRequestReport{
+		WindowEndedAt: time.Date(2026, 6, 19, 11, 0, 0, 0, time.UTC),
+		RequestCount:  9,
+	}
+
+	latest := latestTrafficReport([]*model.OpenFlareRequestReport{older, newer})
+	if latest == nil || latest.RequestCount != 9 {
+		t.Fatalf("latestTrafficReport() = %#v, want newer report with request_count 9", latest)
+	}
+}
+
+func TestBuildTrafficWindowSummaryNilWithoutReport(t *testing.T) {
+	t.Parallel()
+
+	if summary := buildTrafficWindowSummary(nil); summary != nil {
+		t.Fatalf("buildTrafficWindowSummary(nil) = %#v, want nil", summary)
+	}
+}