feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
// Package engine contains the engine API.
|
2021-02-02 12:05:47 +01:00
|
|
|
package engine
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"encoding/json"
|
|
|
|
"errors"
|
|
|
|
"net/http"
|
|
|
|
"os"
|
|
|
|
"time"
|
|
|
|
|
2021-06-22 13:00:29 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/bytecounter"
|
2021-02-02 12:05:47 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/geolocate"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/dialer"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/httptransport"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
2021-02-04 11:00:27 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/version"
|
2021-02-02 12:05:47 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
const dateFormat = "2006-01-02 15:04:05"
|
|
|
|
|
|
|
|
func formatTimeNowUTC() string {
|
|
|
|
return time.Now().UTC().Format(dateFormat)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Experiment is an experiment instance.
|
|
|
|
type Experiment struct {
|
|
|
|
byteCounter *bytecounter.Counter
|
|
|
|
callbacks model.ExperimentCallbacks
|
|
|
|
measurer model.ExperimentMeasurer
|
|
|
|
report probeservices.ReportChannel
|
|
|
|
session *Session
|
|
|
|
testName string
|
|
|
|
testStartTime string
|
|
|
|
testVersion string
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewExperiment creates a new experiment given a measurer. The preferred
|
|
|
|
// way to create an experiment is the ExperimentBuilder. Though this function
|
|
|
|
// allows the programmer to create a custom, external experiment.
|
|
|
|
func NewExperiment(sess *Session, measurer model.ExperimentMeasurer) *Experiment {
|
|
|
|
return &Experiment{
|
|
|
|
byteCounter: bytecounter.New(),
|
|
|
|
callbacks: model.NewPrinterCallbacks(sess.Logger()),
|
|
|
|
measurer: measurer,
|
|
|
|
session: sess,
|
|
|
|
testName: measurer.ExperimentName(),
|
|
|
|
testStartTime: formatTimeNowUTC(),
|
|
|
|
testVersion: measurer.ExperimentVersion(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// KibiBytesReceived accounts for the KibiBytes received by the HTTP clients
|
|
|
|
// managed by this session so far, including experiments.
|
|
|
|
func (e *Experiment) KibiBytesReceived() float64 {
|
|
|
|
return e.byteCounter.KibiBytesReceived()
|
|
|
|
}
|
|
|
|
|
|
|
|
// KibiBytesSent is like KibiBytesReceived but for the bytes sent.
|
|
|
|
func (e *Experiment) KibiBytesSent() float64 {
|
|
|
|
return e.byteCounter.KibiBytesSent()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Name returns the experiment name.
|
|
|
|
func (e *Experiment) Name() string {
|
|
|
|
return e.testName
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetSummaryKeys returns a data structure containing a
|
|
|
|
// summary of the test keys for probe-cli.
|
|
|
|
func (e *Experiment) GetSummaryKeys(m *model.Measurement) (interface{}, error) {
|
|
|
|
return e.measurer.GetSummaryKeys(m)
|
|
|
|
}
|
|
|
|
|
|
|
|
// OpenReport is an idempotent method to open a report. We assume that
|
|
|
|
// you have configured the available probe services, either manually or
|
|
|
|
// through using the session's MaybeLookupBackends method.
|
|
|
|
func (e *Experiment) OpenReport() (err error) {
|
|
|
|
return e.OpenReportContext(context.Background())
|
|
|
|
}
|
|
|
|
|
|
|
|
// ReportID returns the open reportID, if we have opened a report
|
|
|
|
// successfully before, or an empty string, otherwise.
|
|
|
|
func (e *Experiment) ReportID() string {
|
|
|
|
if e.report == nil {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return e.report.ReportID()
|
|
|
|
}
|
|
|
|
|
|
|
|
// Measure performs a measurement with input. We assume that you have
|
|
|
|
// configured the available test helpers, either manually or by calling
|
|
|
|
// the session's MaybeLookupBackends() method.
|
|
|
|
func (e *Experiment) Measure(input string) (*model.Measurement, error) {
|
|
|
|
return e.MeasureWithContext(context.Background(), input)
|
|
|
|
}
|
|
|
|
|
|
|
|
// MeasureWithContext is like Measure but with context.
|
|
|
|
func (e *Experiment) MeasureWithContext(
|
|
|
|
ctx context.Context, input string,
|
|
|
|
) (measurement *model.Measurement, err error) {
|
|
|
|
err = e.session.MaybeLookupLocationContext(ctx) // this already tracks session bytes
|
|
|
|
if err != nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ctx = dialer.WithSessionByteCounter(ctx, e.session.byteCounter)
|
|
|
|
ctx = dialer.WithExperimentByteCounter(ctx, e.byteCounter)
|
|
|
|
measurement = e.newMeasurement(input)
|
|
|
|
start := time.Now()
|
|
|
|
err = e.measurer.Run(ctx, e.session, measurement, e.callbacks)
|
|
|
|
stop := time.Now()
|
|
|
|
measurement.MeasurementRuntime = stop.Sub(start).Seconds()
|
|
|
|
scrubErr := measurement.Scrub(e.session.ProbeIP())
|
|
|
|
if err == nil {
|
|
|
|
err = scrubErr
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// SaveMeasurement saves a measurement on the specified file path.
|
|
|
|
func (e *Experiment) SaveMeasurement(measurement *model.Measurement, filePath string) error {
|
|
|
|
return e.saveMeasurement(
|
|
|
|
measurement, filePath, json.Marshal, os.OpenFile,
|
|
|
|
func(fp *os.File, b []byte) (int, error) {
|
|
|
|
return fp.Write(b)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
// SubmitAndUpdateMeasurement submits a measurement and updates the
|
|
|
|
// fields whose value has changed as part of the submission.
|
|
|
|
func (e *Experiment) SubmitAndUpdateMeasurement(measurement *model.Measurement) error {
|
|
|
|
return e.SubmitAndUpdateMeasurementContext(context.Background(), measurement)
|
|
|
|
}
|
|
|
|
|
|
|
|
// SubmitAndUpdateMeasurementContext submits a measurement and updates the
|
|
|
|
// fields whose value has changed as part of the submission.
|
|
|
|
func (e *Experiment) SubmitAndUpdateMeasurementContext(
|
|
|
|
ctx context.Context, measurement *model.Measurement) error {
|
|
|
|
if e.report == nil {
|
|
|
|
return errors.New("Report is not open")
|
|
|
|
}
|
|
|
|
return e.report.SubmitMeasurement(ctx, measurement)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e *Experiment) newMeasurement(input string) *model.Measurement {
|
|
|
|
utctimenow := time.Now().UTC()
|
|
|
|
m := &model.Measurement{
|
|
|
|
DataFormatVersion: probeservices.DefaultDataFormatVersion,
|
|
|
|
Input: model.MeasurementTarget(input),
|
|
|
|
MeasurementStartTime: utctimenow.Format(dateFormat),
|
|
|
|
MeasurementStartTimeSaved: utctimenow,
|
|
|
|
ProbeIP: geolocate.DefaultProbeIP,
|
|
|
|
ProbeASN: e.session.ProbeASNString(),
|
|
|
|
ProbeCC: e.session.ProbeCC(),
|
|
|
|
ProbeNetworkName: e.session.ProbeNetworkName(),
|
|
|
|
ReportID: e.ReportID(),
|
|
|
|
ResolverASN: e.session.ResolverASNString(),
|
|
|
|
ResolverIP: e.session.ResolverIP(),
|
|
|
|
ResolverNetworkName: e.session.ResolverNetworkName(),
|
|
|
|
SoftwareName: e.session.SoftwareName(),
|
|
|
|
SoftwareVersion: e.session.SoftwareVersion(),
|
|
|
|
TestName: e.testName,
|
|
|
|
TestStartTime: e.testStartTime,
|
|
|
|
TestVersion: e.testVersion,
|
|
|
|
}
|
|
|
|
m.AddAnnotation("engine_name", "ooniprobe-engine")
|
|
|
|
m.AddAnnotation("engine_version", version.Version)
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
m.AddAnnotation("platform", e.session.Platform())
|
2021-02-02 12:05:47 +01:00
|
|
|
return m
|
|
|
|
}
|
|
|
|
|
|
|
|
// OpenReportContext will open a report using the given context
|
|
|
|
// to possibly limit the lifetime of this operation.
|
|
|
|
func (e *Experiment) OpenReportContext(ctx context.Context) error {
|
|
|
|
if e.report != nil {
|
|
|
|
return nil // already open
|
|
|
|
}
|
|
|
|
// use custom client to have proper byte accounting
|
|
|
|
httpClient := &http.Client{
|
|
|
|
Transport: &httptransport.ByteCountingTransport{
|
|
|
|
RoundTripper: e.session.httpDefaultTransport, // proxy is OK
|
|
|
|
Counter: e.byteCounter,
|
|
|
|
},
|
|
|
|
}
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
client, err := e.session.NewProbeServicesClient(ctx)
|
2021-02-02 12:05:47 +01:00
|
|
|
if err != nil {
|
|
|
|
e.session.logger.Debugf("%+v", err)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
client.HTTPClient = httpClient // patch HTTP client to use
|
|
|
|
template := e.newReportTemplate()
|
|
|
|
e.report, err = client.OpenReport(ctx, template)
|
|
|
|
if err != nil {
|
|
|
|
e.session.logger.Debugf("experiment: probe services error: %s", err.Error())
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e *Experiment) newReportTemplate() probeservices.ReportTemplate {
|
|
|
|
return probeservices.ReportTemplate{
|
|
|
|
DataFormatVersion: probeservices.DefaultDataFormatVersion,
|
|
|
|
Format: probeservices.DefaultFormat,
|
|
|
|
ProbeASN: e.session.ProbeASNString(),
|
|
|
|
ProbeCC: e.session.ProbeCC(),
|
|
|
|
SoftwareName: e.session.SoftwareName(),
|
|
|
|
SoftwareVersion: e.session.SoftwareVersion(),
|
|
|
|
TestName: e.testName,
|
|
|
|
TestStartTime: e.testStartTime,
|
|
|
|
TestVersion: e.testVersion,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (e *Experiment) saveMeasurement(
|
|
|
|
measurement *model.Measurement, filePath string,
|
|
|
|
marshal func(v interface{}) ([]byte, error),
|
|
|
|
openFile func(name string, flag int, perm os.FileMode) (*os.File, error),
|
|
|
|
write func(fp *os.File, b []byte) (n int, err error),
|
|
|
|
) error {
|
|
|
|
data, err := marshal(measurement)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
data = append(data, byte('\n'))
|
|
|
|
filep, err := openFile(filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if _, err := write(filep, data); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return filep.Close()
|
|
|
|
}
|