Merge branch 'master' into issue/2634

internal/experiment/webconnectivitylte/analysisclassic.go

@@ -68,16 +68,23 @@ func analysisClassicDNSConsistency(woa *minipipeline.WebAnalysis) optional.Value
 func (tk *TestKeys) setHTTPDiffValues(woa *minipipeline.WebAnalysis) {
 	const bodyProportionFactor = 0.7
 	if !woa.HTTPFinalResponseDiffBodyProportionFactor.IsNone() {
-		tk.BodyLengthMatch = optional.Some(woa.HTTPFinalResponseDiffBodyProportionFactor.Unwrap() > bodyProportionFactor)
+		value := woa.HTTPFinalResponseDiffBodyProportionFactor.Unwrap() > bodyProportionFactor
+		tk.BodyLengthMatch = &value
 	}
 
 	if !woa.HTTPFinalResponseDiffUncommonHeadersIntersection.IsNone() {
-		tk.HeadersMatch = optional.Some(len(woa.HTTPFinalResponseDiffUncommonHeadersIntersection.Unwrap()) > 0)
+		value := len(woa.HTTPFinalResponseDiffUncommonHeadersIntersection.Unwrap()) > 0
+		tk.HeadersMatch = &value
+	}
+
+	if !woa.HTTPFinalResponseDiffStatusCodeMatch.IsNone() {
+		value := woa.HTTPFinalResponseDiffStatusCodeMatch.Unwrap()
+		tk.StatusCodeMatch = &value
 	}
 
-	tk.StatusCodeMatch = woa.HTTPFinalResponseDiffStatusCodeMatch
 	if !woa.HTTPFinalResponseDiffTitleDifferentLongWords.IsNone() {
-		tk.TitleMatch = optional.Some(len(woa.HTTPFinalResponseDiffTitleDifferentLongWords.Unwrap()) <= 0)
+		value := len(woa.HTTPFinalResponseDiffTitleDifferentLongWords.Unwrap()) <= 0
+		tk.TitleMatch = &value
 	}
 }
 
@@ -99,14 +106,14 @@ var _ analysisClassicTestKeysProxy = &TestKeys{}
 
 // httpDiff implements analysisClassicTestKeysProxy.
 func (tk *TestKeys) httpDiff() bool {
-	if !tk.StatusCodeMatch.IsNone() && tk.StatusCodeMatch.Unwrap() {
-		if !tk.BodyLengthMatch.IsNone() && tk.BodyLengthMatch.Unwrap() {
+	if tk.StatusCodeMatch != nil && *tk.StatusCodeMatch {
+		if tk.BodyLengthMatch != nil && *tk.BodyLengthMatch {
 			return false
 		}
-		if !tk.HeadersMatch.IsNone() && tk.HeadersMatch.Unwrap() {
+		if tk.HeadersMatch != nil && *tk.HeadersMatch {
 			return false
 		}
-		if !tk.TitleMatch.IsNone() && tk.TitleMatch.Unwrap() {
+		if tk.TitleMatch != nil && *tk.TitleMatch {
 			return false
 		}
 		// fallthrough

internal/experiment/webconnectivitylte/analysiscore.go

@@ -38,7 +38,7 @@ const (
 
 // AnalysisEngineFn is the function that runs the analysis engine for
 // processing and scoring measurements collected by LTE.
-var AnalysisEngineFn func(tk *TestKeys, logger model.Logger) = AnalysisEngineClassic
+var AnalysisEngineFn func(tk *TestKeys, logger model.Logger) = AnalysisEngineOrig
 
 // analysisToplevel is the toplevel function that analyses the results
 // of the experiment once all network tasks have completed.

internal/experiment/webconnectivitylte/analysisdns.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
+	"github.com/ooni/probe-cli/v3/internal/optional"
 )
 
 const (
@@ -62,13 +63,11 @@ func (tk *TestKeys) analysisDNSToplevel(logger model.Logger, lookupper model.Geo
 	tk.analysisDNSUnexpectedAddrs(logger, lookupper)
 	if tk.DNSFlags != 0 {
 		logger.Warn("DNSConsistency: inconsistent")
-		//v := "inconsistent"
-		//tk.DNSConsistency = &v
+		tk.DNSConsistency = optional.Some("inconsistent")
 		tk.BlockingFlags |= analysisFlagDNSBlocking
 	} else {
 		logger.Info("DNSConsistency: consistent")
-		//v := "consistent"
-		//tk.DNSConsistency = &v
+		tk.DNSConsistency = optional.Some("consistent")
 	}
 }
 

internal/experiment/webconnectivitylte/testkeys.go

@@ -356,7 +356,7 @@ func NewTestKeys() *TestKeys {
 		DNSFlags:              0,
 		DNSExperimentFailure:  nil,
 		DNSConsistency:        optional.None[string](),
-		HTTPExperimentFailure: optional.None[string](),
+		HTTPExperimentFailure: nil,
 		BlockingFlags:         0,
 		NullNullFlags:         0,
 		BodyLengthMatch:       optional.None[bool](),