Save tcpinfo and other rtt metrics

ndt5/s2c/s2c.go

@@ -11,6 +11,7 @@ import (
 	"github.com/m-lab/ndt-server/ndt5/metrics"
 	"github.com/m-lab/ndt-server/ndt5/ndt"
 	"github.com/m-lab/ndt-server/ndt5/protocol"
+	"github.com/m-lab/tcp-info/tcp"
 )
 
 // ArchivalData is the data saved by the S2C test. If a researcher wants deeper
@@ -35,11 +36,14 @@ type ArchivalData struct {
 	MeanThroughputMbps float64
 	MinRTT             time.Duration
 	MaxRTT             time.Duration
+	SumRTT             time.Duration
+	CountRTT           uint32
 	LossRate           float64
 	ClientReportedMbps float64
 	// TODO: Add TCPEngine (bbr, cubic, reno, etc.), MaxThroughputKbps, and Jitter
 
-	Error string `json:",omitempty"`
+	TCPInfo *tcp.LinuxTCPInfo `json:",omitempty"`
+	Error   string            `json:",omitempty"`
 }
 
 // ManageTest manages the s2c test lifecycle
@@ -123,8 +127,11 @@ func ManageTest(ctx context.Context, controlConn protocol.Connection, s ndt.Serv
 	kbps := bps / 1000
 	record.MinRTT = time.Duration(web100metrics.MinRTT) * time.Millisecond
 	record.MaxRTT = time.Duration(web100metrics.MaxRTT) * time.Millisecond
+	record.SumRTT = time.Duration(web100metrics.SumRTT) * time.Millisecond
+	record.CountRTT = web100metrics.CountRTT
 	record.MeanThroughputMbps = kbps / 1000 // Convert Kbps to Mbps
 	record.LossRate = float64(web100metrics.TCPInfo.BytesRetrans) / float64(web100metrics.TCPInfo.BytesSent)
+	record.TCPInfo = &web100metrics.TCPInfo
 
 	// Send download results to the client.
 	err = m.SendS2CResults(int64(kbps), 0, web100metrics.TCPInfo.BytesAcked)