b9b555ba68
* utils/geoip.go: use github.com/ooni/probe-engine Let's start using the engine by rewriting utils/geoip.go to be just a thin wrapper around the engine functionality. * Ready for review * Checkpoint: the im tests are converted Still have some doubts with respect to the variables that are passed to MK via probe-engine. Will double check. * fix(i/c/r/run.go): write the correct logic * nettests: one more comment and also fix a format string * Tweak previous * progress * Fix doofus * better comment * XXX => actionable comment * Add glue to simplify test keys management Making the concept of measurement more abstract in the engine is not feasible because, when submitting a measurement, we need to modify it to update the report ID and the measurement ID. Therefore, returning a serialized measurement is not a good idea. We will keep using a model.Measurement in the engine. Changing model.Measurement.TestKeys's type from a `interface{}` pointing to a well defined data structure to `map[string]interface{}` is a regression because means that we are moving from code that has a clear and defined structure to code that is more complicated to parse and validate. Since we're already suffering havily from the lack of a good schema, I'm not going to make the situation worst by worsening the engine. At least for ndt7 and psiphon, we now have a good schema and I don't want to lose that. However, the current code in this repository is expecting the test keys to be a `map[string]interface{}`. This choice was dictated by the fact that we receive a JSON from Measurement Kit and by the fact that there's not a clear schema. To solve this tension, in this commit I am going to write glue adapter code that makes sure that the TestKeys of a Measurement are converted to `map[string]interface{}`. This will be done using a type cast where possible and JSON serialization and parsing otherwise. In a perfect world, glue is not a good idea, but in a real world it may actually be useful. When all tests in the engine will have a clear Go data structure, we'll then remove the glue and just cast to the proper data structure from `interface{}` where required. * nettests/performance: use probe-engine * go.{mod,sum}: upgrade to latest probe-engine * nettests/middlebox: use ooni/probe-engine * Update to the latest probe-engine * web_connectivity: rewrite to use probe-engine * Cosmetic change suggested by @hellais * nettests/nettests.go: remove unused code * nettests/nettests.go: fix progress * nettests/nettests.go: remove go-measurement-kit code * We don't depend on go-measurement-kit anymore * Improve non-verbose output where possible See also: https://github.com/measurement-kit/measurement-kit/issues/1856 * Make web_connectivity output pleasant * Update to the latest probe-engine * nettests/nettests.go: honour sharing settings * Update to the latest probe-engine * Use log.WithFields for probe-engine * Update go.mod go.sum * Revert "Update go.mod go.sum" This reverts commit 5ecd38d8236f4a4e9b77ddb8e8a0d1e3cdd4b818. * Revert "Revert "Update go.mod go.sum"" This reverts commit 6114b31eca98826112032776bd0feff02d763ecd. * Upgrade ooni/probe-engine * Unset GOPATH before running go build commands * Dockefile: fix linux build by using latest * Update to the latest ooni/probe-engine ``` go get -u github.com/ooni/probe-engine go mod tidy ``` * Repair build
98 lines
2.5 KiB
Go
98 lines
2.5 KiB
Go
package performance
|
|
|
|
import (
|
|
"github.com/ooni/probe-cli/nettests"
|
|
"github.com/ooni/probe-engine/experiment/ndt"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// NDT test implementation
|
|
type NDT struct {
|
|
}
|
|
|
|
// Run starts the test
|
|
func (n NDT) Run(ctl *nettests.Controller) error {
|
|
experiment := ndt.NewExperiment(
|
|
ctl.Ctx.Session, ndt.Config{},
|
|
)
|
|
return ctl.Run(experiment, []string{""})
|
|
}
|
|
|
|
// NDTTestKeys for the test
|
|
type NDTTestKeys struct {
|
|
Upload float64 `json:"upload"`
|
|
Download float64 `json:"download"`
|
|
Ping float64 `json:"ping"`
|
|
MaxRTT float64 `json:"max_rtt"`
|
|
AvgRTT float64 `json:"avg_rtt"`
|
|
MinRTT float64 `json:"min_rtt"`
|
|
MSS float64 `json:"mss"`
|
|
OutOfOrder float64 `json:"out_of_order"`
|
|
PacketLoss float64 `json:"packet_loss"`
|
|
Timeouts float64 `json:"timeouts"`
|
|
IsAnomaly bool `json:"-"`
|
|
}
|
|
|
|
// GetTestKeys generates a summary for a test run
|
|
func (n NDT) GetTestKeys(tk map[string]interface{}) (interface{}, error) {
|
|
var err error
|
|
testKeys := NDTTestKeys{IsAnomaly: false}
|
|
|
|
simple, ok := tk["simple"].(map[string]interface{})
|
|
if !ok {
|
|
return testKeys, errors.New("simple key is invalid")
|
|
}
|
|
advanced, ok := tk["advanced"].(map[string]interface{})
|
|
if !ok {
|
|
return testKeys, errors.New("advanced key is invalid")
|
|
}
|
|
|
|
// XXX there is likely a better pattern for this
|
|
testKeys.Upload, ok = simple["upload"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "upload key invalid")
|
|
}
|
|
testKeys.Download, ok = simple["download"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "download key invalid")
|
|
}
|
|
testKeys.Ping, ok = simple["ping"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "ping key invalid")
|
|
}
|
|
testKeys.MaxRTT, ok = advanced["max_rtt"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "max_rtt key invalid")
|
|
}
|
|
testKeys.AvgRTT, ok = advanced["avg_rtt"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "avg_rtt key invalid")
|
|
}
|
|
testKeys.MinRTT, ok = advanced["min_rtt"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "min_rtt key invalid")
|
|
}
|
|
testKeys.MSS, ok = advanced["mss"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "mss key invalid")
|
|
}
|
|
testKeys.OutOfOrder, ok = advanced["out_of_order"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "out_of_order key invalid")
|
|
}
|
|
testKeys.PacketLoss, ok = advanced["packet_loss"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "packet_loss key invalid")
|
|
}
|
|
testKeys.Timeouts, ok = advanced["timeouts"].(float64)
|
|
if !ok {
|
|
err = errors.Wrap(err, "timeouts key invalid")
|
|
}
|
|
return testKeys, err
|
|
}
|
|
|
|
// LogSummary writes the summary to the standard output
|
|
func (n NDT) LogSummary(s string) error {
|
|
return nil
|
|
}
|