Skip to content

Commit

Permalink
feat(minipipeline): add ControlFinalResponseExpectations (2/2) (#1452)
Browse files Browse the repository at this point in the history 
This diff completes the work started by #1451 by adding support for
ControlFinalResponseExpectations to the analysis data structures, which
will enable us to use this information for Web Connectivity LTE.

Part of ooni/probe#2640.
  • Loading branch information
@bassosimone
bassosimone committed Jan 19, 2024
1 parent 0e44897 commit 64255d5
Show file tree
Hide file tree
Showing 69 changed files with 204 additions and 1 deletion.
3 changes: 3 additions & 0 deletions internal/cmd/minipipeline/testdata/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions internal/cmd/minipipeline/testdata/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
9 changes: 8 additions & 1 deletion internal/minipipeline/analysis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ func NewLinearWebAnalysis(input *WebObservationsContainer) (output []*WebObserva
// AnalyzeWebObservationsWithoutLinearAnalysis generates a [*WebAnalysis] from a [*WebObservationsContainer]
// but avoids calling [NewLinearyAnalysis] to generate a linear analysis.
func AnalyzeWebObservationsWithoutLinearAnalysis(container *WebObservationsContainer) *WebAnalysis {
analysis := &WebAnalysis{}
analysis := &WebAnalysis{
ControlFinalResponseExpectations: container.ControlFinalResponseExpectations,
}

analysis.dnsComputeSuccessMetrics(container)
analysis.dnsComputeSuccessMetricsClassic(container)
Expand All @@ -121,6 +123,11 @@ func AnalyzeWebObservationsWithLinearAnalysis(container *WebObservationsContaine
//
// The zero value of this struct is ready to use.
type WebAnalysis struct {
// ControlFinalResponseExpectations summarizes the expectations we have
// for the control based on the final response. You should use this field
// to determine whether unexplained failures are expected or unexpected.
ControlFinalResponseExpectations optional.Value[*WebObservationsControlFinalResponseExpectation]

// DNSLookupSuccessWithInvalidAddresses contains DNS transactions with invalid IP addresses by
// taking into account control info, bogons, and TLS handshakes.
DNSLookupSuccessWithInvalidAddresses Set[int64]
Expand Down
3 changes: 3 additions & 0 deletions ...inipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": "unknown_error"
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...ine/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": "unknown_error"
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
3 changes: 3 additions & 0 deletions ...tdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": "unknown_error"
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...bconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": "unknown_error"
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
3 changes: 3 additions & 0 deletions ...ata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
1,
2
Expand Down
3 changes: 3 additions & 0 deletions ...onnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
2
],
Expand Down
3 changes: 3 additions & 0 deletions ...l/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": "unknown_error"
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...peline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": "unknown_error"
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
1 change: 1 addition & 0 deletions ...testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"ControlFinalResponseExpectations": null,
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
1 change: 1 addition & 0 deletions .../webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"ControlFinalResponseExpectations": null,
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
1 change: 1 addition & 0 deletions .../testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"ControlFinalResponseExpectations": null,
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
1 change: 1 addition & 0 deletions ...a/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"ControlFinalResponseExpectations": null,
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [],
"DNSLookupSuccessWithBogonAddresses": [],
Expand Down
3 changes: 3 additions & 0 deletions ...ipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [],
"DNSLookupSuccessWithBogonAddresses": [],
Expand Down
3 changes: 3 additions & 0 deletions internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
1
],
Expand Down
3 changes: 3 additions & 0 deletions ...al/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
1
],
Expand Down
3 changes: 3 additions & 0 deletions internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
3 changes: 3 additions & 0 deletions ...minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [],
"DNSLookupSuccessWithBogonAddresses": [],
Expand Down
3 changes: 3 additions & 0 deletions ...pipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
1
],
Expand Down
3 changes: 3 additions & 0 deletions .../testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...ipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
1
],
Expand Down
3 changes: 3 additions & 0 deletions ...e/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
2
],
Expand Down
3 changes: 3 additions & 0 deletions ...minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...line/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...l/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...peline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
1
],
Expand Down
3 changes: 3 additions & 0 deletions ...line/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [
2
],
Expand Down
3 changes: 3 additions & 0 deletions ...ectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions .../generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...ctivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...nnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...ty/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...nectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...y/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
3 changes: 3 additions & 0 deletions ...stdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...ebconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...tdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...bconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
2
Expand Down
3 changes: 3 additions & 0 deletions ...testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions .../webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...ta/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...nnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
3 changes: 3 additions & 0 deletions ...a/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1,
Expand Down
3 changes: 3 additions & 0 deletions ...nectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"ControlFinalResponseExpectations": {
"Failure": ""
},
"DNSLookupSuccessWithInvalidAddresses": [],
"DNSLookupSuccessWithValidAddress": [
1
Expand Down
Loading

0 comments on commit 64255d5

Please sign in to comment.