feat(fodc): support multiple ports for polling metrics in watchdog #945

Fine0830 · 2026-01-16T06:42:02Z

Add pod-name, container-name, poll-metrics-ports flags to agent for metric labels.
Support multiple ports for polling metrics in watchdog.

Signed-off-by: Qiuxia Fan qiuxiafan@apache.org

…into feat/watchdog

codecov-commenter · 2026-01-16T06:54:43Z

Codecov Report

❌ Patch coverage is 77.01863% with 37 lines in your changes missing coverage. Please review.
✅ Project coverage is 47.08%. Comparing base (3530dd9) to head (a1c7515).
⚠️ Report is 113 commits behind head on main.

Files with missing lines	Patch %	Lines
fodc/agent/internal/cmd/root.go	20.68%	23 Missing ⚠️
fodc/agent/internal/watchdog/watchdog.go	85.10%	5 Missing and 2 partials ⚠️
fodc/proxy/internal/api/server.go	57.14%	6 Missing ⚠️
fodc/proxy/internal/registry/registry.go	96.87%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #945      +/-   ##
==========================================
+ Coverage   45.97%   47.08%   +1.10%     
==========================================
  Files         328      383      +55     
  Lines       55505    59470    +3965     
==========================================
+ Hits        25520    28002    +2482     
- Misses      27909    28854     +945     
- Partials     2076     2614     +538

Flag	Coverage Δ
banyand	`49.53% <ø> (?)`
bydbctl	`81.91% <ø> (?)`
fodc	`78.68% <77.01%> (?)`
integration-distributed	`80.00% <ø> (?)`
pkg	`29.20% <ø> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot

Pull request overview

This PR adds support for polling metrics from multiple ports in the watchdog component and enhances agent identification with pod and container metadata. The changes enable agents to poll metrics from multiple endpoints (e.g., different containers) and automatically enrich metrics with agent identity labels (node_role, pod_name, container_name) for better traceability in distributed environments.

Changes:

Added pod-name, container-name, and poll-metrics-ports flags to the agent for configuring multiple metrics endpoints and identity metadata
Modified watchdog to poll from multiple endpoints and enrich metrics with agent identity labels
Removed redundant NodeRole and agent_id fields from aggregated metrics in favor of using labels
Updated all tests to include the new required identity fields

Reviewed changes

Copilot reviewed 29 out of 29 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
fodc/agent/internal/cmd/root.go	Added new CLI flags and validation for poll-metrics-ports, pod-name, and container-name
fodc/agent/internal/watchdog/watchdog.go	Refactored to support polling from multiple endpoints with per-endpoint container names
fodc/agent/internal/metrics/parse.go	Added ParseWithAgentLabels function to enrich metrics with agent identity labels
fodc/agent/internal/proxy/client.go	Updated to include pod_name and container_names in agent registration
fodc/proxy/internal/registry/registry.go	Added PodName and ContainerNames fields to AgentIdentity
fodc/proxy/internal/metrics/aggregator.go	Removed redundant NodeRole field from AggregatedMetric struct
fodc/proxy/internal/api/server.go	Updated to use labels["node_role"] instead of NodeRole field
api/proto/banyandb/fodc/v1/rpc.proto	Added pod_name and container_names fields to RegisterAgentRequest
All test files	Updated test cases to provide required pod_name and container_names values

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-16T07:20:39Z

fodc/agent/internal/cmd/root.go

 	}
+	if len(containerNames) > 0 && len(containerNames) != len(pollMetricsPorts) {
+		return fmt.Errorf("container-name count (%d) must match poll-metrics-ports count (%d)", len(containerNames), len(pollMetricsPorts))
+	}


The validation allows container-name to be optional (length 0), but the watchdog.pollMetrics function at line 206-207 will use an empty string for containerName when the slice is shorter than urls. This could lead to inconsistent behavior where some metrics have container_name labels and others don't. Consider either requiring container-name to always match the count of poll-metrics-ports, or explicitly document that omitting container-name is valid and will result in metrics without container_name labels.

Suggested change

}

}

if len(containerNames) == 0 {

// When no container names are provided, initialize a slice of the same length

// as pollMetricsPorts so that downstream usage always has matching lengths.

// Each entry will be an empty string, indicating no explicit container name.

containerNames = make([]string, len(pollMetricsPorts))

}

Copilot · 2026-01-16T07:20:39Z

fodc/agent/internal/watchdog/watchdog.go

+		containerName := ""
+		if idx < len(w.containerNames) {
+			containerName = w.containerNames[idx]
+		}


This logic silently uses an empty string for containerName when containerNames is shorter than urls. This could lead to confusion when debugging why some metrics lack container_name labels. Consider logging a warning when containerNames length doesn't match urls length, or document this fallback behavior clearly.

Copilot · 2026-01-16T07:20:39Z

fodc/proxy/internal/registry/registry.go

 	Labels         map[string]string
-	RegisteredAt   time.Time
-	LastHeartbeat  time.Time
 	AgentID        string
 	NodeRole       string
 	Status         AgentStatus
-	AgentIdentity  AgentIdentity
+	RegisteredAt   time.Time
+	LastHeartbeat  time.Time
 	PrimaryAddress Address
+	AgentIdentity  AgentIdentity


The field ordering in AgentInfo struct has been changed inconsistently - some fields are reordered while others aren't. The reordering doesn't follow any clear pattern (not alphabetical, not by type, not by importance). Consider keeping the original field order or applying a consistent ordering principle to avoid unnecessary diff noise.

Copilot · 2026-01-16T07:20:39Z

fodc/agent/internal/metrics/parse_test.go

+	// Verify first metric has agent identity labels
+	cpuMetric := metrics[0]
+	assert.Equal(t, "cpu_usage", cpuMetric.Name)
+	require.Len(t, cpuMetric.Labels, 4) // instance + 3 agent labels


The test verifies label count but uses magic number 4 in multiple places (lines 1086, 1119). If the agent labels change in the future, these tests could become brittle. Consider calculating the expected count dynamically based on the number of provided agent labels plus original labels, or using a constant.

Copilot · 2026-01-16T07:20:40Z

fodc/proxy/internal/metrics/aggregator.go

 	Timestamp   time.Time
 	Name        string
 	AgentID     string
-	NodeRole    string
 	Description string
 	Value       float64


The AggregatedMetric struct field ordering has been changed, which creates unnecessary diff noise. The fields NodeRole was removed and the remaining fields were reordered. Unless there's a specific reason for reordering (e.g., memory alignment), consider keeping the original field order for fields that weren't removed.

Copilot · 2026-01-16T07:20:40Z

fodc/agent/internal/proxy/client.go

+	logger             *logger.Logger
 	heartbeatTicker    *time.Ticker
 	flightRecorder     *flightrecorder.FlightRecorder
-	logger             *logger.Logger
+	connManager        *connManager
 	stopCh             chan struct{}
 	reconnectCh        chan struct{}
 	labels             map[string]string
-	client             fodcv1.FODCServiceClient
-	registrationStream fodcv1.FODCService_RegisterAgentClient
 	metricsStream      fodcv1.FODCService_StreamMetricsClient
+	registrationStream fodcv1.FODCService_RegisterAgentClient
+	client             fodcv1.FODCServiceClient

-	proxyAddr string
-	nodeIP    string
-	nodeRole  string
-	agentID   string
+	proxyAddr      string
+	nodeIP         string
+	nodeRole       string
+	podName        string
+	agentID        string
+	containerNames []string

-	nodePort          int
 	heartbeatInterval time.Duration
 	reconnectInterval time.Duration
-	disconnected      bool
 	streamsMu         sync.RWMutex   // Protects streams only
 	heartbeatWg       sync.WaitGroup // Tracks heartbeat goroutine
+	nodePort          int
+	disconnected      bool


The Client struct fields have been extensively reordered, creating significant diff noise. The reordering doesn't follow a consistent pattern and makes the changes harder to review. Consider adding new fields (podName, containerNames) without reordering existing fields, unless there's a specific technical reason (e.g., memory alignment optimization) that should be documented.

Copilot · 2026-01-16T07:20:40Z

fodc/agent/internal/watchdog/watchdog.go

+	nodeRole       string
+	podName        string
+	urls           []string
+	containerNames []string
+
 	interval     time.Duration
 	retryBackoff time.Duration
+	mu           sync.RWMutex
+	wg           sync.WaitGroup
 	isRunning    bool


The Watchdog struct fields have been reordered, creating unnecessary diff noise. The reordering groups related fields together (which is good) but changes the original structure significantly. Consider adding new fields at the end or in logical groups without extensively reordering existing fields, unless there's a documented reason for the reorganization.

Suggested change

nodeRole string

podName string

urls []string

containerNames []string

interval time.Duration

retryBackoff time.Duration

mu sync.RWMutex

wg sync.WaitGroup

isRunning bool

interval time.Duration

retryBackoff time.Duration

mu sync.RWMutex

wg sync.WaitGroup

isRunning bool

nodeRole string

podName string

urls []string

containerNames []string

…g-banyandb into feat/watchdog

Fine0830 added 8 commits January 15, 2026 11:20

support multiple ports for watchdog

14df142

add pod name and container name

021519d

update tests

4b0410e

add agent identity labels

e593674

Merge branch 'main' of https://github.com/apache/skywalking-banyandb …

bee2c8c

…into feat/watchdog

update containerNames

d7dc1a0

update tests

af12f3e

update tests

6483c12

wu-sheng requested review from Copilot and hanahmily January 16, 2026 07:16

wu-sheng added this to the 0.10.0 milestone Jan 16, 2026

wu-sheng added the enhancement New feature or request label Jan 16, 2026

Copilot started reviewing on behalf of wu-sheng January 16, 2026 07:16 View session

wu-sheng added the fodc First Occurance Data Collection label Jan 16, 2026

Copilot AI reviewed Jan 16, 2026

View reviewed changes

Fine0830 and others added 3 commits January 16, 2026 20:18

remove node ip and port

f71e6d5

update tests

4c87548

Merge branch 'main' into feat/watchdog

9f1ce03

hanahmily previously approved these changes Jan 19, 2026

View reviewed changes

Fine0830 added 2 commits January 19, 2026 09:53

add StatusNotFound condition

156cef2

Merge branch 'feat/watchdog' of https://github.com/Fine0830/skywalkin…

6b8fece

…g-banyandb into feat/watchdog

Fine0830 dismissed hanahmily’s stale review via 6b8fece January 19, 2026 01:54

Fine0830 added 4 commits January 19, 2026 10:25

fix linter errors

3178d2d

Merge branch 'main' into feat/watchdog

65b253a

format

f939ff1

Merge branch 'feat/watchdog' of https://github.com/Fine0830/skywalkin…

907a38d

…g-banyandb into feat/watchdog

Fine0830 requested a review from hanahmily January 19, 2026 03:03

Merge branch 'main' into feat/watchdog

a1c7515

hanahmily approved these changes Jan 19, 2026

View reviewed changes

Fine0830 merged commit 0f30073 into apache:main Jan 19, 2026
22 checks passed

Fine0830 deleted the feat/watchdog branch January 19, 2026 03:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(fodc): support multiple ports for polling metrics in watchdog #945

feat(fodc): support multiple ports for polling metrics in watchdog #945

Uh oh!

Fine0830 commented Jan 16, 2026

Uh oh!

codecov-commenter commented Jan 16, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Copilot AI Jan 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

-	}
+	}
+	if len(containerNames) == 0 {
+		// When no container names are provided, initialize a slice of the same length
+		// as pollMetricsPorts so that downstream usage always has matching lengths.
+		// Each entry will be an empty string, indicating no explicit container name.
+		containerNames = make([]string, len(pollMetricsPorts))
+	}

feat(fodc): support multiple ports for polling metrics in watchdog #945

feat(fodc): support multiple ports for polling metrics in watchdog #945

Uh oh!

Conversation

Fine0830 commented Jan 16, 2026

Uh oh!

codecov-commenter commented Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov-commenter commented Jan 16, 2026 •

edited

Loading