Update to stable m-lab/ndt7-client-go@v0.1.0 (#95)

experiment/ndt7/ndt7.go

@@ -89,13 +89,17 @@ func measure(
 	callbacks.OnProgress(0, fmt.Sprintf("server: %s", client.FQDN))
 	for ev := range ch {
 		testkeys.Download = append(testkeys.Download, ev)
-		percentage := ev.Elapsed / maxRuntime / 2.0
-		message := fmt.Sprintf(
-			"max-bandwidth (download) %s (RTT min/smoothed/var %.1f/%.1f/%.1f ms)",
-			humanize.SI(float64(ev.BBRInfo.MaxBandwidth), "bit/s"),
-			ev.BBRInfo.MinRTT, ev.TCPInfo.SmoothedRTT, ev.TCPInfo.RTTVar,
-		)
-		callbacks.OnProgress(percentage, message)
+		if ev.AppInfo != nil && ev.Origin == "client" {
+			elapsed := float64(ev.AppInfo.ElapsedTime) / 1e06 // to seconds
+			// The percentage of completion of download goes from 0 to
+			// 50% of the whole experiment, hence the `/2.0`.
+			percentage := elapsed / maxRuntime / 2.0
+			speed := float64(ev.AppInfo.NumBytes) * 8.0 / elapsed
+			message := fmt.Sprintf(
+				"download-speed %s", humanize.SI(float64(speed), "bit/s"),
+			)
+			callbacks.OnProgress(percentage, message)
+		}
 		data, err := json.Marshal(ev)
 		if err != nil {
 			testkeys.Failure = err.Error()
@@ -110,12 +114,17 @@ func measure(
 	}
 	for ev := range ch {
 		testkeys.Upload = append(testkeys.Upload, ev)
-		percentage := 0.5 + ev.Elapsed/maxRuntime/2.0
-		speed := float64(ev.AppInfo.NumBytes) * 8.0 / ev.Elapsed
-		message := fmt.Sprintf(
-			"upload-speed %s", humanize.SI(float64(speed), "bit/s"),
-		)
-		callbacks.OnProgress(percentage, message)
+		if ev.AppInfo != nil && ev.Origin == "client" {
+			elapsed := float64(ev.AppInfo.ElapsedTime) / 1e06 // to seconds
+			// The percentage of completion of upload goes from 50% to 100% of
+			// the whole experiment, hence `0.5 +` and `/2.0`.
+			percentage := 0.5 + elapsed/maxRuntime/2.0
+			speed := float64(ev.AppInfo.NumBytes) * 8.0 / elapsed
+			message := fmt.Sprintf(
+				"upload-speed %s", humanize.SI(float64(speed), "bit/s"),
+			)
+			callbacks.OnProgress(percentage, message)
+		}
 		data, err := json.Marshal(ev)
 		if err != nil {
 			testkeys.Failure = err.Error()

go.mod

@@ -32,7 +32,7 @@ require (
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/lucas-clemente/quic-go v0.10.2 // indirect
 	github.com/m-lab/go v1.1.0
-	github.com/m-lab/ndt7-client-go v0.0.0-20190724152841-ad7eefc52fe1
+	github.com/m-lab/ndt7-client-go v0.1.0
 	github.com/marusama/semaphore v0.0.0-20190110074507-6952cef993b2 // indirect
 	github.com/miekg/dns v1.1.12 // indirect
 	github.com/montanaflynn/stats v0.5.0

go.sum

@@ -136,8 +136,14 @@ github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cce
 github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
 github.com/m-lab/go v1.1.0 h1:BB1llaNFa2CbrqmDpRhwFGQCY726PtpqxlZykJrRN3Q=
 github.com/m-lab/go v1.1.0/go.mod h1:FcVx/N8dL5J5TVQ2L0d8/cAw/ljR6fhwZqvqZHrb5/Q=
+github.com/m-lab/ndt-server v0.13.2 h1:ISasCjeOXaKcHjRo//Q2A2THbwoC2Pp01d8a2OnPC6Y=
+github.com/m-lab/ndt-server v0.13.2/go.mod h1:ZLVRCEbCBkhh0pwNjnLpwaZnHOHGEH76H/fzIIVFRWw=
 github.com/m-lab/ndt7-client-go v0.0.0-20190724152841-ad7eefc52fe1 h1:lPFK+4ojybg/9OEaTfoJFteZnSnaiB5bo41GZ9Pn1ew=
 github.com/m-lab/ndt7-client-go v0.0.0-20190724152841-ad7eefc52fe1/go.mod h1:nD9WTkxP4/mV2ph5uUpVPD2ZOJdZ9QKPTKu3tJGkM9o=
+github.com/m-lab/ndt7-client-go v0.1.0 h1:O8vTLytuEhd9d6kHntfU7izehymojBSEMEtWPxhA0PA=
+github.com/m-lab/ndt7-client-go v0.1.0/go.mod h1:HgsUcW4nj8irv7vjpOumAOWebbH3RDs2CatHuMXFcqo=
+github.com/m-lab/tcp-info v1.1.0 h1:+IzCxTd/IVRjt+EXyi4Nj1bIhuX/iftbQCFB2itrB8M=
+github.com/m-lab/tcp-info v1.1.0/go.mod h1:bkvI4qbjB6QVC2tsLSHqf5OnIYcmuLEVjo7+8YA56Kg=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
 github.com/marusama/semaphore v0.0.0-20190110074507-6952cef993b2 h1:sq+a5mb8zHbmHhrIH06oqIMGsanjpbxNgxEgZVfgpvQ=