feat(telemetry)_: track missed messages
This commit is contained in:
parent
916376d3b3
commit
5d9680253b
|
@ -19,27 +19,30 @@ import (
|
|||
|
||||
wakuv2common "github.com/status-im/status-go/wakuv2/common"
|
||||
wps "github.com/waku-org/go-waku/waku/v2/peerstore"
|
||||
v2protocol "github.com/waku-org/go-waku/waku/v2/protocol"
|
||||
|
||||
v1protocol "github.com/status-im/status-go/protocol/v1"
|
||||
v2common "github.com/status-im/status-go/wakuv2/common"
|
||||
v2protocol "github.com/waku-org/go-waku/waku/v2/protocol"
|
||||
)
|
||||
|
||||
type TelemetryType string
|
||||
|
||||
const (
|
||||
ProtocolStatsMetric TelemetryType = "ProtocolStats"
|
||||
SentEnvelopeMetric TelemetryType = "SentEnvelope"
|
||||
UpdateEnvelopeMetric TelemetryType = "UpdateEnvelope"
|
||||
ReceivedMessagesMetric TelemetryType = "ReceivedMessages"
|
||||
ErrorSendingEnvelopeMetric TelemetryType = "ErrorSendingEnvelope"
|
||||
PeerCountMetric TelemetryType = "PeerCount"
|
||||
PeerConnFailuresMetric TelemetryType = "PeerConnFailure"
|
||||
MessageCheckSuccessMetric TelemetryType = "MessageCheckSuccess"
|
||||
MessageCheckFailureMetric TelemetryType = "MessageCheckFailure"
|
||||
PeerCountByShardMetric TelemetryType = "PeerCountByShard"
|
||||
PeerCountByOriginMetric TelemetryType = "PeerCountByOrigin"
|
||||
DialFailureMetric TelemetryType = "DialFailure"
|
||||
MaxRetryCache = 5000
|
||||
ProtocolStatsMetric TelemetryType = "ProtocolStats"
|
||||
SentEnvelopeMetric TelemetryType = "SentEnvelope"
|
||||
UpdateEnvelopeMetric TelemetryType = "UpdateEnvelope"
|
||||
ReceivedMessagesMetric TelemetryType = "ReceivedMessages"
|
||||
ErrorSendingEnvelopeMetric TelemetryType = "ErrorSendingEnvelope"
|
||||
PeerCountMetric TelemetryType = "PeerCount"
|
||||
PeerConnFailuresMetric TelemetryType = "PeerConnFailure"
|
||||
MessageCheckSuccessMetric TelemetryType = "MessageCheckSuccess"
|
||||
MessageCheckFailureMetric TelemetryType = "MessageCheckFailure"
|
||||
PeerCountByShardMetric TelemetryType = "PeerCountByShard"
|
||||
PeerCountByOriginMetric TelemetryType = "PeerCountByOrigin"
|
||||
DialFailureMetric TelemetryType = "DialFailure"
|
||||
MissedMessageMetric TelemetryType = "MissedMessage"
|
||||
MissedRelevantMessageMetric TelemetryType = "MissedRelevantMessage"
|
||||
MaxRetryCache = 5000
|
||||
)
|
||||
|
||||
type TelemetryRequest struct {
|
||||
|
@ -113,6 +116,14 @@ func (c *Client) PushDialFailure(ctx context.Context, dialFailure wakuv2common.D
|
|||
c.processAndPushTelemetry(ctx, DialFailure{ErrorType: dialFailure.ErrType, ErrorMsg: errorMessage, Protocols: dialFailure.Protocols})
|
||||
}
|
||||
|
||||
func (c *Client) PushMissedMessage(ctx context.Context, envelope *v2protocol.Envelope) {
|
||||
c.processAndPushTelemetry(ctx, MissedMessage{Envelope: envelope})
|
||||
}
|
||||
|
||||
func (c *Client) PushMissedRelevantMessage(ctx context.Context, receivedMessage *v2common.ReceivedMessage) {
|
||||
c.processAndPushTelemetry(ctx, MissedRelevantMessage{ReceivedMessage: receivedMessage})
|
||||
}
|
||||
|
||||
type ReceivedMessages struct {
|
||||
Filter transport.Filter
|
||||
SSHMessage *types.Message
|
||||
|
@ -152,6 +163,14 @@ type DialFailure struct {
|
|||
Protocols string
|
||||
}
|
||||
|
||||
type MissedMessage struct {
|
||||
Envelope *v2protocol.Envelope
|
||||
}
|
||||
|
||||
type MissedRelevantMessage struct {
|
||||
ReceivedMessage *v2common.ReceivedMessage
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
serverURL string
|
||||
httpClient *http.Client
|
||||
|
@ -330,6 +349,18 @@ func (c *Client) processAndPushTelemetry(ctx context.Context, data interface{})
|
|||
TelemetryType: DialFailureMetric,
|
||||
TelemetryData: c.ProcessDialFailure(v),
|
||||
}
|
||||
case MissedMessage:
|
||||
telemetryRequest = TelemetryRequest{
|
||||
Id: c.nextId,
|
||||
TelemetryType: MissedMessageMetric,
|
||||
TelemetryData: c.ProcessMissedMessage(v),
|
||||
}
|
||||
case MissedRelevantMessage:
|
||||
telemetryRequest = TelemetryRequest{
|
||||
Id: c.nextId,
|
||||
TelemetryType: MissedRelevantMessageMetric,
|
||||
TelemetryData: c.ProcessMissedRelevantMessage(v),
|
||||
}
|
||||
default:
|
||||
c.logger.Error("Unknown telemetry data type")
|
||||
return
|
||||
|
@ -499,6 +530,28 @@ func (c *Client) ProcessDialFailure(dialFailure DialFailure) *json.RawMessage {
|
|||
return &jsonRawMessage
|
||||
}
|
||||
|
||||
func (c *Client) ProcessMissedMessage(missedMessage MissedMessage) *json.RawMessage {
|
||||
postBody := c.commonPostBody()
|
||||
postBody["messageHash"] = missedMessage.Envelope.Hash().String()
|
||||
postBody["sentAt"] = uint32(missedMessage.Envelope.Message().GetTimestamp() / int64(time.Second))
|
||||
postBody["pubsubTopic"] = missedMessage.Envelope.PubsubTopic()
|
||||
postBody["contentTopic"] = missedMessage.Envelope.Message().ContentTopic
|
||||
body, _ := json.Marshal(postBody)
|
||||
jsonRawMessage := json.RawMessage(body)
|
||||
return &jsonRawMessage
|
||||
}
|
||||
|
||||
func (c *Client) ProcessMissedRelevantMessage(missedMessage MissedRelevantMessage) *json.RawMessage {
|
||||
postBody := c.commonPostBody()
|
||||
postBody["messageHash"] = missedMessage.ReceivedMessage.Envelope.Hash().String()
|
||||
postBody["sentAt"] = missedMessage.ReceivedMessage.Sent
|
||||
postBody["pubsubTopic"] = missedMessage.ReceivedMessage.PubsubTopic
|
||||
postBody["contentTopic"] = missedMessage.ReceivedMessage.ContentTopic
|
||||
body, _ := json.Marshal(postBody)
|
||||
jsonRawMessage := json.RawMessage(body)
|
||||
return &jsonRawMessage
|
||||
}
|
||||
|
||||
func (c *Client) UpdateEnvelopeProcessingError(shhMessage *types.Message, processingError error) {
|
||||
defer common.LogOnPanic()
|
||||
c.logger.Debug("Pushing envelope update to telemetry server", zap.String("hash", types.EncodeHex(shhMessage.Hash)))
|
||||
|
|
|
@ -114,6 +114,8 @@ type ITelemetryClient interface {
|
|||
PushPeerCountByShard(ctx context.Context, peerCountByShard map[uint16]uint)
|
||||
PushPeerCountByOrigin(ctx context.Context, peerCountByOrigin map[wps.Origin]uint)
|
||||
PushDialFailure(ctx context.Context, dialFailure common.DialError)
|
||||
PushMissedMessage(ctx context.Context, envelope *protocol.Envelope)
|
||||
PushMissedRelevantMessage(ctx context.Context, message *common.ReceivedMessage)
|
||||
}
|
||||
|
||||
// Waku represents a dark communication interface through the Ethereum
|
||||
|
@ -1146,7 +1148,6 @@ func (w *Waku) Start() error {
|
|||
go w.runPeerExchangeLoop()
|
||||
|
||||
if w.cfg.EnableMissingMessageVerification {
|
||||
|
||||
w.missingMsgVerifier = missing.NewMissingMessageVerifier(
|
||||
w.node.Store(),
|
||||
w,
|
||||
|
@ -1424,6 +1425,12 @@ func (w *Waku) OnNewEnvelopes(envelope *protocol.Envelope, msgType common.Messag
|
|||
return nil
|
||||
}
|
||||
|
||||
if w.statusTelemetryClient != nil {
|
||||
if msgType == common.MissingMessageType {
|
||||
w.statusTelemetryClient.PushMissedMessage(w.ctx, envelope)
|
||||
}
|
||||
}
|
||||
|
||||
logger := w.logger.With(
|
||||
zap.String("messageType", msgType),
|
||||
zap.Stringer("envelopeHash", envelope.Hash()),
|
||||
|
@ -1542,6 +1549,9 @@ func (w *Waku) processMessage(e *common.ReceivedMessage) {
|
|||
w.storeMsgIDsMu.Unlock()
|
||||
} else {
|
||||
logger.Debug("filters did match")
|
||||
if w.statusTelemetryClient != nil && e.MsgType == common.MissingMessageType {
|
||||
w.statusTelemetryClient.PushMissedRelevantMessage(w.ctx, e)
|
||||
}
|
||||
e.Processed.Store(true)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue