JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/contact: send evenkit entry only with existing fields

Browse Source 
Change-Id: Ifdd6c14de5f99c3c9bb8b1e9e2dce8c1e1c3b1ed
This commit is contained in:
Márton Elek 2023-10-24 13:59:02 +02:00 committed by Elek, Márton
parent 6c2e66fa9e
commit bca46736bb
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
satellite/contact/endpoint.go
View File

@ -135,7 +135,7 @@ func (endpoint *Endpoint) CheckIn(ctx context.Context, req *pb.CheckInRequest) (
Version: req.Version,
}
endpoint.emitEvenkitEvent(ctx, req, pingNodeSuccess, pingNodeSuccessQUIC, nodeInfo)
emitEventkitEvent(ctx, req, pingNodeSuccess, pingNodeSuccessQUIC, nodeInfo)
err = endpoint.service.overlay.UpdateCheckIn(ctx, nodeInfo, time.Now().UTC())
if err != nil {
@ -151,7 +151,7 @@ func (endpoint *Endpoint) CheckIn(ctx context.Context, req *pb.CheckInRequest) (
}, nil
}
func (endpoint *Endpoint) emitEvenkitEvent(ctx context.Context, req *pb.CheckInRequest, pingNodeTCPSuccess bool, pingNodeQUICSuccess bool, nodeInfo overlay.NodeCheckInInfo) {
func emitEventkitEvent(ctx context.Context, req *pb.CheckInRequest, pingNodeTCPSuccess bool, pingNodeQUICSuccess bool, nodeInfo overlay.NodeCheckInInfo) {
var sourceAddr string
transport, found := drpcctx.Transport(ctx)
if found {
@ -163,18 +163,26 @@ func (endpoint *Endpoint) emitEvenkitEvent(ctx context.Context, req *pb.CheckInR
}
}
ek.Event("checkin",
tags := []eventkit.Tag{
eventkit.String("id", nodeInfo.NodeID.String()),
eventkit.String("addr", req.Address),
eventkit.String("resolved-addr", nodeInfo.LastIPPort),
eventkit.String("source-addr", sourceAddr),
eventkit.Timestamp("build-time", nodeInfo.Version.Timestamp),
eventkit.String("version", nodeInfo.Version.Version),
eventkit.String("country", nodeInfo.CountryCode.String()),
eventkit.Int64("free-disk", nodeInfo.Capacity.FreeDisk),
eventkit.Bool("ping-tpc-success", pingNodeTCPSuccess),
eventkit.Bool("ping-quic-success", pingNodeQUICSuccess),
)
}
if nodeInfo.Capacity != nil {
eventkit.Int64("free-disk", nodeInfo.Capacity.FreeDisk)
}
if nodeInfo.Version != nil {
eventkit.Timestamp("build-time", nodeInfo.Version.Timestamp)
eventkit.String("version", nodeInfo.Version.Version)
}
ek.Event("checkin", tags...)
}
// GetTime returns current timestamp.

19
satellite/contact/endpoint_test.go Normal file
View File

@ -0,0 +1,19 @@
// Copyright (C) 2023 Storj Labs, Inc.
// See LICENSE for copying information.
package contact
import (
"testing"
"storj.io/common/pb"
"storj.io/common/testcontext"
"storj.io/storj/satellite/overlay"
)
func TestEmitEventkitEvent(t *testing.T) {
ctx := testcontext.New(t)
emitEventkitEvent(ctx, &pb.CheckInRequest{
Address: "127.0.0.1:234",
}, false, false, overlay.NodeCheckInInfo{})
}