feat: 轮询观测入库异步化,调网关与入库分离,采集记录经消息攒批写入
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 16m2s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 16m2s
- 轮询步骤异步模式下只调网关并发布 card.ingest 入库消息,入库消费者固定并发 30、按采集 ID 去重、可重试错误不限次数退避重投 - 采集记录经 card.collection 攒批写入,失败整批重投,新增 (observation_id, observed_at) 唯一索引 - 网络、实名观测增加乱序保护;轮询读查询走缓存,套餐状态查询各自计时且失败不缓存 - 入库积压告警与反压;系统配置 polling.ingest.mode 默认 sync 可回退;测试环境 nsqd 消息全部落盘 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -69,8 +69,8 @@ func (h *PollingCarddataHandler) Step(ctx context.Context, cardID uint) StepOutc
|
||||
return stepDefer(0)
|
||||
}
|
||||
|
||||
h.base.invalidateCardCache(ctx, cardID)
|
||||
card, err := h.base.iotCardStore.GetByID(ctx, cardID)
|
||||
// 卡任务只用到 ICCID、运营商账户与轮询开关;读缓存即可,入库段写库后会失效缓存。
|
||||
card, err := h.base.getCardWithCache(ctx, cardID)
|
||||
if err != nil {
|
||||
if isNotFound(err) {
|
||||
priority.FailFinal(ctx, "卡不存在")
|
||||
@@ -95,6 +95,7 @@ func (h *PollingCarddataHandler) Step(ctx context.Context, cardID uint) StepOutc
|
||||
queryStartedAt := time.Now()
|
||||
result, err := h.gateway.QueryFlow(queryCtx, &gateway.FlowQueryReq{CardNo: card.ICCID})
|
||||
unreadable := unreadableDetail{raw: domainGatewayRaw(rawCapture), failure: collectionFailure(err, time.Since(queryStartedAt))}
|
||||
unreadable.iccid, unreadable.carrierID = card.ICCID, card.CarrierID
|
||||
if gateway.IsRateLimited(err) {
|
||||
h.recordUnreadable(ctx, cardID, attempt.IntegrationID, constants.TrafficCollectionResultRateLimited, unreadable)
|
||||
priority.FailRetryable(ctx, "运营商账户网关限流,稍后重试")
|
||||
@@ -120,10 +121,25 @@ func (h *PollingCarddataHandler) Step(ctx context.Context, cardID uint) StepOutc
|
||||
return h.fail(ctx, cardID, startedAt, "卡流量观测能力未配置", nil)
|
||||
}
|
||||
now := time.Now()
|
||||
resetDay := h.base.carrierResetDay(ctx, card.CarrierID)
|
||||
durationMS := int(time.Since(queryStartedAt).Milliseconds())
|
||||
if h.base.publishIngest(ctx, priority, IngestMessage{
|
||||
Kind: ingestKindTraffic, CardID: cardID, CarrierID: card.CarrierID, ICCID: card.ICCID,
|
||||
ObservationID: attempt.IntegrationID, ObservedAt: now, Source: constants.CardObservationSourcePolling,
|
||||
Scene: constants.CardObservationSceneTrafficPolling, CorrelationID: attempt.IntegrationID,
|
||||
TaskType: constants.TaskTypePollingCarddata, Raw: unreadable.raw,
|
||||
Traffic: &IngestTrafficPayload{ReadingMB: float64(result.Used), ReadingResult: gatewayReadingResult(result),
|
||||
ResetDay: resetDay, DurationMS: durationMS},
|
||||
}) {
|
||||
// 异步入库:网关已成功,入库由入库消费者完成与重试,本步骤按成功结束。
|
||||
h.base.configMgr.RecordPreResetCheck(ctx, card, now)
|
||||
h.base.updateStats(ctx, constants.TaskTypePollingCarddata, true, time.Since(startedAt))
|
||||
return stepOK()
|
||||
}
|
||||
decision, err := h.observation.ApplyTrafficObservation(ctx, carddomain.TrafficObservation{
|
||||
CardID: cardID, GatewayReadingMB: float64(result.Used), ReadingResult: gatewayReadingResult(result),
|
||||
ResetDay: h.carrier.GetDataResetDay(ctx, card.CarrierID), Raw: unreadable.raw,
|
||||
Failure: &carddomain.CollectionFailure{DurationMS: int(time.Since(queryStartedAt).Milliseconds())},
|
||||
ResetDay: resetDay, Raw: unreadable.raw, ICCID: card.ICCID, CarrierID: card.CarrierID,
|
||||
Failure: &carddomain.CollectionFailure{DurationMS: durationMS},
|
||||
Metadata: carddomain.ObservationMetadata{
|
||||
ObservationID: attempt.IntegrationID, Source: constants.CardObservationSourcePolling,
|
||||
Scene: constants.CardObservationSceneTrafficPolling, ObservedAt: now, CorrelationID: attempt.IntegrationID,
|
||||
@@ -168,8 +184,10 @@ func (h *PollingCarddataHandler) fail(ctx context.Context, cardID uint, startedA
|
||||
// recordUnreadable 为没拿到有效读数的采集写采集记录(只记采集时刻有套餐的卡),失败只影响留痕。
|
||||
// unreadableDetail 是读数不可用时随采集失败记录保存的原始数据与错误详情。
|
||||
type unreadableDetail struct {
|
||||
raw *carddomain.GatewayRaw
|
||||
failure *carddomain.CollectionFailure
|
||||
raw *carddomain.GatewayRaw
|
||||
failure *carddomain.CollectionFailure
|
||||
iccid string
|
||||
carrierID uint
|
||||
}
|
||||
|
||||
func (h *PollingCarddataHandler) recordUnreadable(ctx context.Context, cardID uint, observationID, result string, detail unreadableDetail) {
|
||||
@@ -178,6 +196,7 @@ func (h *PollingCarddataHandler) recordUnreadable(ctx context.Context, cardID ui
|
||||
}
|
||||
if _, err := h.observation.ApplyTrafficObservation(ctx, carddomain.TrafficObservation{
|
||||
CardID: cardID, ReadingResult: result, ResetDay: 1, Raw: detail.raw, Failure: detail.failure,
|
||||
ICCID: detail.iccid, CarrierID: detail.carrierID,
|
||||
Metadata: carddomain.ObservationMetadata{
|
||||
ObservationID: observationID, Source: constants.CardObservationSourcePolling,
|
||||
Scene: constants.CardObservationSceneTrafficPolling, ObservedAt: time.Now(), CorrelationID: observationID,
|
||||
|
||||
Reference in New Issue
Block a user