Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: handle metric for peer connection failure #27

Merged
merged 1 commit into from
Aug 3, 2024
Merged

feat: handle metric for peer connection failure #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions telemetry/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions telemetry/peer_count.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,34 @@ func (r *PeerCount) put(db *sql.DB) error {

return nil
}

type PeerConnFailure struct {
ID int `json:"id"`
CreatedAt int64 `json:"createdAt"`
Timestamp int64 `json:"timestamp"`
NodeName string `json:"nodeName"`
NodeKeyUid string `json:"nodeKeyUid"`
PeerId string `json:"peerId"`
StatusVersion string `json:"statusVersion"`
FailedPeerId string `json:"failedPeerId"`
FailureCount int `json:"failureCount"`
}

func (r *PeerConnFailure) put(db *sql.DB) error {
stmt, err := db.Prepare("INSERT INTO peerConnFailure (timestamp, nodeName, nodeKeyUid, peerId, failedPeerId, failureCount, statusVersion, createdAt) VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id;")
if err != nil {
return err
}

defer stmt.Close()

r.CreatedAt = time.Now().Unix()
lastInsertId := 0
err = stmt.QueryRow(r.Timestamp, r.NodeName, r.NodeKeyUid, r.PeerId, r.FailedPeerId, r.FailureCount, r.StatusVersion, r.CreatedAt).Scan(&lastInsertId)
if err != nil {
return err
}
r.ID = lastInsertId

return nil
}
11 changes: 11 additions & 0 deletions telemetry/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ const (
ReceivedMessagesMetric TelemetryType = "ReceivedMessages"
ErrorSendingEnvelopeMetric TelemetryType = "ErrorSendingEnvelope"
PeerCountMetric TelemetryType = "PeerCount"
PeerConnFailureMetric TelemetryType = "PeerConnFailure"
)

type TelemetryRequest struct {
Expand Down Expand Up @@ -139,6 +140,16 @@ func (s *Server) createTelemetryData(w http.ResponseWriter, r *http.Request) {
errorDetails = append(errorDetails, map[string]interface{}{"Id": data.Id, "Error": fmt.Sprintf("Error saving peer count: %v", err)})
continue
}
case PeerConnFailureMetric:
var peerConnFailure PeerConnFailure
if err := json.Unmarshal(*data.TelemetryData, &peerConnFailure); err != nil {
errorDetails = append(errorDetails, map[string]interface{}{"Id": data.Id, "Error": fmt.Sprintf("Error decoding peer connection failure: %v", err)})
continue
}
if err := peerConnFailure.put(s.DB); err != nil {
errorDetails = append(errorDetails, map[string]interface{}{"Id": data.Id, "Error": fmt.Sprintf("Error saving peer connection failure: %v", err)})
continue
}
default:
errorDetails = append(errorDetails, map[string]interface{}{"Id": data.Id, "Error": fmt.Sprintf("Unknown telemetry type: %s", data.TelemetryType)})
}
Expand Down
12 changes: 12 additions & 0 deletions telemetry/sql/000013_peer_conn_failure.up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CREATE TABLE IF NOT EXISTS peerConnFailure (
id SERIAL PRIMARY KEY,
createdAt INTEGER NOT NULL,
peerId VARCHAR(255) NOT NULL,
nodeName VARCHAR(255) NOT NULL,
nodeKeyUid VARCHAR(255) NOT NULL,
timestamp INTEGER NOT NULL,
statusVersion VARCHAR(31),
failureCount INTEGER NOT NULL,
failedPeerId VARCHAR(255) NOT NULL,
CONSTRAINT peerConnFailure_unique unique(timestamp, peerId, failedPeerId, failureCount)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about this index - the chance that the same peer will report the same failing peer with the same failure count is slim, but definitely not non-existent - any particular reason for this constraint?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Including the timestamp should make it unique enough imo. It's mostly to prevent obvious duplicates (like if for whatever reason the client reports the same exact data twice).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, sorry, I missed the timestamp in there 🤦‍♂️

);
Loading