x

internal/experiment/dash/measurer.go

@@ -127,27 +127,23 @@ func NewExperimentMeasurer(config Config) model.ExperimentMeasurer {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	Latency   float64 `json:"connect_latency"`
 	Bitrate   float64 `json:"median_bitrate"`
 	Delay     float64 `json:"min_playout_delay"`
 	IsAnomaly bool    `json:"-"`
 }
 
+// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
+func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
+	sk.Latency = tk.Simple.ConnectLatency
+	sk.Bitrate = float64(tk.Simple.MedianBitrate)
+	sk.Delay = tk.Simple.MinPlayoutDelay
+	return sk
+}
+
 // Anomaly implements model.MeasurementSummary.
 func (sk *SummaryKeys) Anomaly() bool {
 	return sk.IsAnomaly
 }
-
-// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
-func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	return &SummaryKeys{
-		Latency:   tk.Simple.ConnectLatency,
-		Bitrate:   float64(tk.Simple.MedianBitrate),
-		Delay:     tk.Simple.MinPlayoutDelay,
-		IsAnomaly: false,
-	}
-}

internal/experiment/fbmessenger/fbmessenger.go

@@ -210,27 +210,24 @@ func NewExperimentMeasurer(config Config) model.ExperimentMeasurer {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	DNSBlocking bool `json:"facebook_dns_blocking"`
 	TCPBlocking bool `json:"facebook_tcp_blocking"`
 	IsAnomaly   bool `json:"-"`
 }
 
-// Anomaly implements model.MeasurementSummary.
-func (sk *SummaryKeys) Anomaly() bool {
-	return sk.IsAnomaly
-}
-
 // MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
 func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
 	dnsBlocking := tk.FacebookDNSBlocking != nil && *tk.FacebookDNSBlocking
 	tcpBlocking := tk.FacebookTCPBlocking != nil && *tk.FacebookTCPBlocking
-	return &SummaryKeys{
-		DNSBlocking: dnsBlocking,
-		TCPBlocking: tcpBlocking,
-		IsAnomaly:   dnsBlocking || tcpBlocking,
-	}
+	sk.DNSBlocking = dnsBlocking
+	sk.TCPBlocking = tcpBlocking
+	sk.IsAnomaly = dnsBlocking || tcpBlocking
+	return sk
+}
+
+// Anomaly implements model.MeasurementSummary.
+func (sk *SummaryKeys) Anomaly() bool {
+	return sk.IsAnomaly
 }

internal/experiment/hhfm/hhfm.go

@@ -343,26 +343,23 @@ func (c Conn) Write(b []byte) (int, error) {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	IsAnomaly bool `json:"-"`
 }
 
+// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
+func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
+	sk.IsAnomaly = (tk.Tampering.HeaderFieldName ||
+		tk.Tampering.HeaderFieldNumber ||
+		tk.Tampering.HeaderFieldValue ||
+		tk.Tampering.HeaderNameCapitalization ||
+		tk.Tampering.RequestLineCapitalization ||
+		tk.Tampering.Total)
+	return sk
+}
+
 // Anomaly implements model.MeasurementSummaryKeys.
 func (sk *SummaryKeys) Anomaly() bool {
 	return sk.IsAnomaly
 }
-
-// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
-func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	return &SummaryKeys{
-		IsAnomaly: (tk.Tampering.HeaderFieldName ||
-			tk.Tampering.HeaderFieldNumber ||
-			tk.Tampering.HeaderFieldValue ||
-			tk.Tampering.HeaderNameCapitalization ||
-			tk.Tampering.RequestLineCapitalization ||
-			tk.Tampering.Total),
-	}
-}

internal/experiment/hirl/hirl.go

@@ -308,19 +308,18 @@ func RunMethod(ctx context.Context, config RunMethodConfig) {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	IsAnomaly bool `json:"-"`
 }
 
+// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
+func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
+	sk.IsAnomaly = tk.Tampering
+	return sk
+}
+
 // Anomaly implements model.MeasurementSummaryKeys.
 func (sk *SummaryKeys) Anomaly() bool {
 	return sk.IsAnomaly
 }
-
-// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
-func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	return &SummaryKeys{IsAnomaly: tk.Tampering}
-}

internal/experiment/ndt7/ndt7.go

@@ -266,9 +266,6 @@ func failureFromError(err error) (failure *string) {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	Upload         float64 `json:"upload"`
 	Download       float64 `json:"download"`
@@ -281,22 +278,22 @@ type SummaryKeys struct {
 	IsAnomaly      bool    `json:"-"`
 }
 
+// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
+func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
+	sk.Upload = tk.Summary.Upload
+	sk.Download = tk.Summary.Download
+	sk.Ping = tk.Summary.Ping
+	sk.MaxRTT = tk.Summary.MaxRTT
+	sk.AvgRTT = tk.Summary.AvgRTT
+	sk.MinRTT = tk.Summary.MinRTT
+	sk.MSS = float64(tk.Summary.MSS)
+	sk.RetransmitRate = tk.Summary.RetransmitRate
+	sk.IsAnomaly = false
+	return sk
+}
+
 // Anomaly implements model.MeasurementSummaryKeys.
 func (sk *SummaryKeys) Anomaly() bool {
 	return sk.IsAnomaly
 }
-
-// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
-func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	return &SummaryKeys{
-		Upload:         tk.Summary.Upload,
-		Download:       tk.Summary.Download,
-		Ping:           tk.Summary.Ping,
-		MaxRTT:         tk.Summary.MaxRTT,
-		AvgRTT:         tk.Summary.AvgRTT,
-		MinRTT:         tk.Summary.MinRTT,
-		MSS:            float64(tk.Summary.MSS),
-		RetransmitRate: tk.Summary.RetransmitRate,
-		IsAnomaly:      false,
-	}
-}

internal/experiment/psiphon/psiphon.go

@@ -109,29 +109,24 @@ func NewExperimentMeasurer(config Config) model.ExperimentMeasurer {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	BootstrapTime float64 `json:"bootstrap_time"`
 	Failure       string  `json:"failure"`
 	IsAnomaly     bool    `json:"-"`
 }
 
-// Anomaly implements model.MeasurementSummaryKeys.
-func (sk *SummaryKeys) Anomaly() bool {
-	return sk.IsAnomaly
-}
-
 // MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
 func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	var failure string
+	sk := &SummaryKeys{IsAnomaly: false}
 	if tk.Failure != nil {
-		failure = *tk.Failure
-	}
-	return &SummaryKeys{
-		BootstrapTime: tk.BootstrapTime,
-		Failure:       failure,
-		IsAnomaly:     tk.Failure != nil,
+		sk.Failure = *tk.Failure
+		sk.IsAnomaly = true
 	}
+	sk.BootstrapTime = tk.BootstrapTime
+	return sk
+}
+
+// Anomaly implements model.MeasurementSummaryKeys.
+func (sk *SummaryKeys) Anomaly() bool {
+	return sk.IsAnomaly
 }

internal/experiment/signal/signal.go

@@ -207,25 +207,22 @@ func NewExperimentMeasurer(config Config) model.ExperimentMeasurer {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	SignalBackendStatus  string  `json:"signal_backend_status"`
 	SignalBackendFailure *string `json:"signal_backend_failure"`
 	IsAnomaly            bool    `json:"-"`
 }
 
+// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
+func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
+	sk.SignalBackendStatus = tk.SignalBackendStatus
+	sk.SignalBackendFailure = tk.SignalBackendFailure
+	sk.IsAnomaly = tk.SignalBackendStatus == "blocked"
+	return sk
+}
+
 // Anomaly implements model.MeasurementSummaryKeys.
 func (tk *SummaryKeys) Anomaly() bool {
 	return tk.IsAnomaly
 }
-
-// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
-func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	return &SummaryKeys{
-		SignalBackendStatus:  tk.SignalBackendStatus,
-		SignalBackendFailure: tk.SignalBackendFailure,
-		IsAnomaly:            tk.SignalBackendStatus == "blocked",
-	}
-}

internal/experiment/telegram/telegram.go

@@ -138,30 +138,27 @@ func NewExperimentMeasurer(config Config) model.ExperimentMeasurer {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	HTTPBlocking bool `json:"telegram_http_blocking"`
 	TCPBlocking  bool `json:"telegram_tcp_blocking"`
 	WebBlocking  bool `json:"telegram_web_blocking"`
 	IsAnomaly    bool `json:"-"`
 }
 
-// Anomaly implements model.MeasurementSummaryKeys.
-func (sk *SummaryKeys) Anomaly() bool {
-	return sk.IsAnomaly
-}
-
 // MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
 func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
 	tcpBlocking := tk.TelegramTCPBlocking
 	httpBlocking := tk.TelegramHTTPBlocking
 	webBlocking := tk.TelegramWebFailure != nil
-	return &SummaryKeys{
-		HTTPBlocking: httpBlocking,
-		TCPBlocking:  tcpBlocking,
-		WebBlocking:  webBlocking,
-		IsAnomaly:    webBlocking || httpBlocking || tcpBlocking,
-	}
+	sk.HTTPBlocking = httpBlocking
+	sk.TCPBlocking = tcpBlocking
+	sk.WebBlocking = webBlocking
+	sk.IsAnomaly = webBlocking || httpBlocking || tcpBlocking
+	return sk
+}
+
+// Anomaly implements model.MeasurementSummaryKeys.
+func (sk *SummaryKeys) Anomaly() bool {
+	return sk.IsAnomaly
 }

internal/experiment/tor/tor.go

@@ -383,9 +383,6 @@ func failureString(failure *string) (s string) {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	DirPortTotal            int64 `json:"dir_port_total"`
 	DirPortAccessible       int64 `json:"dir_port_accessible"`
@@ -398,25 +395,25 @@ type SummaryKeys struct {
 	IsAnomaly               bool  `json:"-"`
 }
 
+// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
+func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
+	sk := &SummaryKeys{IsAnomaly: false}
+	sk.DirPortTotal = tk.DirPortTotal
+	sk.DirPortAccessible = tk.DirPortAccessible
+	sk.OBFS4Total = tk.OBFS4Total
+	sk.OBFS4Accessible = tk.OBFS4Accessible
+	sk.ORPortDirauthTotal = tk.ORPortDirauthTotal
+	sk.ORPortDirauthAccessible = tk.ORPortDirauthAccessible
+	sk.ORPortTotal = tk.ORPortTotal
+	sk.ORPortAccessible = tk.ORPortAccessible
+	sk.IsAnomaly = ((sk.DirPortAccessible <= 0 && sk.DirPortTotal > 0) ||
+		(sk.OBFS4Accessible <= 0 && sk.OBFS4Total > 0) ||
+		(sk.ORPortDirauthAccessible <= 0 && sk.ORPortDirauthTotal > 0) ||
+		(sk.ORPortAccessible <= 0 && sk.ORPortTotal > 0))
+	return sk
+}
+
 // Anomaly implements model.MeasurementSummaryKeys.
 func (sk *SummaryKeys) Anomaly() bool {
 	return sk.IsAnomaly
 }
-
-// MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
-func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
-	return &SummaryKeys{
-		DirPortTotal:            tk.DirPortTotal,
-		DirPortAccessible:       tk.DirPortAccessible,
-		OBFS4Total:              tk.OBFS4Total,
-		OBFS4Accessible:         tk.OBFS4Accessible,
-		ORPortDirauthTotal:      tk.ORPortDirauthTotal,
-		ORPortDirauthAccessible: tk.ORPortDirauthAccessible,
-		ORPortTotal:             tk.ORPortTotal,
-		ORPortAccessible:        tk.ORPortAccessible,
-		IsAnomaly: ((tk.DirPortAccessible <= 0 && tk.DirPortTotal > 0) ||
-			(tk.OBFS4Accessible <= 0 && tk.OBFS4Total > 0) ||
-			(tk.ORPortDirauthAccessible <= 0 && tk.ORPortDirauthTotal > 0) ||
-			(tk.ORPortAccessible <= 0 && tk.ORPortTotal > 0)),
-	}
-}

internal/experiment/torsf/torsf.go

@@ -306,19 +306,16 @@ func NewExperimentMeasurer(config Config) model.ExperimentMeasurer {
 var _ model.MeasurementSummaryKeysProvider = &TestKeys{}
 
 // SummaryKeys contains summary keys for this experiment.
-//
-// Note that this structure is part of the ABI contract with ooniprobe
-// therefore we should be careful when changing it.
 type SummaryKeys struct {
 	IsAnomaly bool `json:"-"`
 }
 
-// Anomaly implements model.MeasurementSummaryKeys.
-func (sk *SummaryKeys) Anomaly() bool {
-	return sk.IsAnomaly
-}
-
 // MeasurementSummaryKeys implements model.MeasurementSummaryKeysProvider.
 func (tk *TestKeys) MeasurementSummaryKeys() model.MeasurementSummaryKeys {
 	return &SummaryKeys{IsAnomaly: tk.Failure != nil}
 }
+
+// Anomaly implements model.MeasurementSummaryKeys.
+func (sk *SummaryKeys) Anomaly() bool {
+	return sk.IsAnomaly
+}