yumoqing/host-metrics-collector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop: 补齐 agent 上报 HTTP 常量并修复测试编译

Browse Source
This commit is contained in:
Pipeline Agent 2026-08-15 11:32:45 +08:00
parent fb9ff25563
commit 26e56fb2e8
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/agent/reporter.go
View File

@ -35,9 +35,7 @@ type Reporter struct {
// NewReporter 创建上报客户端。 // NewReporter 创建上报客户端。
func NewReporter(gatewayURL, agentToken, hostID, agentVersion string) *Reporter { func NewReporter(gatewayURL, agentToken, hostID, agentVersion string) *Reporter {
return &Reporter{ return &Reporter{
client: &http.Client{ client: &http.Client{Timeout: 10 * time.Second},
Timeout: 10 * time.Second,
},
gatewayURL: gatewayURL, gatewayURL: gatewayURL,
agentToken: agentToken, agentToken: agentToken,
hostID: hostID, hostID: hostID,
@ -49,11 +47,7 @@ func NewReporter(gatewayURL, agentToken, hostID, agentVersion string) *Reporter
// Heartbeat 发送心跳，返回服务端时间与下发配置。 // Heartbeat 发送心跳，返回服务端时间与下发配置。
func (r *Reporter) Heartbeat(ctx context.Context, configVersion int64) (*collectorpb.HeartbeatResponse, error) { func (r *Reporter) Heartbeat(ctx context.Context, configVersion int64) (*collectorpb.HeartbeatResponse, error) {
req := &collectorpb.HeartbeatRequest{ req := &collectorpb.HeartbeatRequest{HostId: r.hostID, AgentVersion: r.agentVersion, ConfigVersion: configVersion}
HostId: r.hostID,
AgentVersion: r.agentVersion,
ConfigVersion: configVersion,
}
out := &collectorpb.HeartbeatResponse{} out := &collectorpb.HeartbeatResponse{}
if err := r.sendWithRetry(ctx, "/v1/agent/heartbeat", req, out); err != nil { if err := r.sendWithRetry(ctx, "/v1/agent/heartbeat", req, out); err != nil {
return nil, err return nil, err
@ -93,7 +87,6 @@ func (r *Reporter) sendWithRetry(ctx context.Context, path string, req proto.Mes
case <-time.After(backoff): case <-time.After(backoff):
} }
} }
err := r.post(ctx, path, req, out) err := r.post(ctx, path, req, out)
if err == nil { if err == nil {
if ack, ok := out.(*collectorpb.Ack); ok && !ack.Ok { if ack, ok := out.(*collectorpb.Ack); ok && !ack.Ok {
@ -112,7 +105,6 @@ func (r *Reporter) post(ctx context.Context, path string, req proto.Message, out
if err != nil { if err != nil {
return fmt.Errorf("marshal request: %w", err) return fmt.Errorf("marshal request: %w", err)
} }
httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, r.gatewayURL+path, bytes.NewReader(body)) httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, r.gatewayURL+path, bytes.NewReader(body))
if err != nil { if err != nil {
return fmt.Errorf("new request: %w", err) return fmt.Errorf("new request: %w", err)