diff --git a/internal/cmd/minipipeline/testdata/analysis.json b/internal/cmd/minipipeline/testdata/analysis.json index 703a01a7bd..1d155bd485 100644 --- a/internal/cmd/minipipeline/testdata/analysis.json +++ b/internal/cmd/minipipeline/testdata/analysis.json @@ -1,7 +1,15 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "130.192.16.171" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2, + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -20,12 +28,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/cmd/minipipeline/testdata/analysis_classic.json b/internal/cmd/minipipeline/testdata/analysis_classic.json index 4f7917db4d..3554213331 100644 --- a/internal/cmd/minipipeline/testdata/analysis_classic.json +++ b/internal/cmd/minipipeline/testdata/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "130.192.16.171" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -17,12 +23,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/cmd/minipipeline/testdata/observations.json b/internal/cmd/minipipeline/testdata/observations.json index cd49a24e29..6f909994cb 100644 --- a/internal/cmd/minipipeline/testdata/observations.json +++ b/internal/cmd/minipipeline/testdata/observations.json @@ -382,7 +382,10 @@ "ControlHTTPResponseTitle": "Nexa Center for Internet \u0026 Society | Il centro Nexa è un centro di ricerca del Dipartimento di Automatica e Informatica del Politecnico di Torino" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "130.192.16.171" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/cmd/minipipeline/testdata/observations_classic.json b/internal/cmd/minipipeline/testdata/observations_classic.json index bed6c4d3e4..f84ce7758e 100644 --- a/internal/cmd/minipipeline/testdata/observations_classic.json +++ b/internal/cmd/minipipeline/testdata/observations_classic.json @@ -141,7 +141,10 @@ "ControlHTTPResponseTitle": "Nexa Center for Internet \u0026 Society | Il centro Nexa è un centro di ricerca del Dipartimento di Automatica e Informatica del Politecnico di Torino" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "130.192.16.171" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/experiment/webconnectivitylte/analysiscore.go b/internal/experiment/webconnectivitylte/analysiscore.go index 15305413f8..5a671ad46a 100644 --- a/internal/experiment/webconnectivitylte/analysiscore.go +++ b/internal/experiment/webconnectivitylte/analysiscore.go @@ -234,28 +234,25 @@ func (tk *TestKeys) analysisOrig(logger model.Logger) { } const ( - // analysisFlagNullNullNoAddrs indicates neither the probe nor the TH were - // able to get any IP addresses from any resolver. - analysisFlagNullNullNoAddrs = 1 << iota - - // analysisFlagNullNullAllConnectsFailed indicates that all the connect + // AnalysisFlagNullNullExpectedDNSLookupFailure indicates some of the DNS lookup // attempts failed both in the probe and in the test helper. - analysisFlagNullNullAllConnectsFailed + AnalysisFlagNullNullExpectedDNSLookupFailure = 1 << iota - // analysisFlagNullNullTLSMisconfigured indicates that all the TLS handshake + // AnalysisFlagNullNullExpectedTCPConnectFailure indicates that some of the connect // attempts failed both in the probe and in the test helper. - analysisFlagNullNullTLSMisconfigured + AnalysisFlagNullNullExpectedTCPConnectFailure + + // AnalysisFlagNullNullExpectedTLSHandshakeFailure indicates that we have seen some TLS + // handshakes failing consistently for both the probe and the TH. + AnalysisFlagNullNullExpectedTLSHandshakeFailure - // analysisFlagNullNullSuccessfulHTTPS indicates that we had no TH data + // AnalysisFlagNullNullSuccessfulHTTPS indicates that we had no TH data // but all the HTTP requests used always HTTPS and never failed. - analysisFlagNullNullSuccessfulHTTPS - - // analysisFlagNullNullNXDOMAINWithCensorship indicates that we have - // seen no error with local DNS resolutions but, at the same time, the - // control failed with NXDOMAIN. When this happens, we probably have - // DNS interception locally, so all cleartext queries return the same - // bogus answers based on a rule applied on a now-expired domain. - analysisFlagNullNullNXDOMAINWithCensorship + AnalysisFlagNullNullSuccessfulHTTPS + + // AnalysisFlagNullNullUnexpectedDNSLookupSuccess indicates the case + // where the TH resolved no addresses while the probe did. + AnalysisFlagNullNullUnexpectedDNSLookupSuccess ) // analysisNullNullDetectTHDNSNXDOMAIN runs when .Blocking = nil and @@ -303,7 +300,7 @@ func (tk *TestKeys) analysisNullNullDetectTHDNSNXDOMAIN(logger model.Logger) boo failure := tk.Control.DNS.Failure if failure != nil && *failure == model.THDNSNameError { logger.Info("DNS censorship: local DNS success with remote NXDOMAIN") - tk.NullNullFlags |= analysisFlagNullNullNXDOMAINWithCensorship + tk.NullNullFlags |= AnalysisFlagNullNullUnexpectedDNSLookupSuccess return true } @@ -358,7 +355,7 @@ func (tk *TestKeys) analysisNullNullDetectSuccessfulHTTPS(logger model.Logger) b // only if we have at least one request if len(tk.Requests) > 0 { logger.Info("website likely accessible: seen successful chain of HTTPS transactions") - tk.NullNullFlags |= analysisFlagNullNullSuccessfulHTTPS + tk.NullNullFlags |= AnalysisFlagNullNullSuccessfulHTTPS return true } @@ -406,7 +403,7 @@ func (tk *TestKeys) analysisNullNullDetectTLSMisconfigured(logger model.Logger) // only if we have had some TLS handshakes for both probe and TH if len(tk.TLSHandshakes) > 0 && len(tk.Control.TLSHandshake) > 0 { logger.Info("website likely down: all TLS handshake attempts failed for both probe and TH") - tk.NullNullFlags |= analysisFlagNullNullTLSMisconfigured + tk.NullNullFlags |= AnalysisFlagNullNullExpectedTLSHandshakeFailure return true } @@ -448,7 +445,7 @@ func (tk *TestKeys) analysisNullNullDetectAllConnectsFailed(logger model.Logger) // only if we have had some addresses to connect if len(tk.TCPConnect) > 0 && len(tk.Control.TCPConnect) > 0 { logger.Info("website likely down: all TCP connect attempts failed for both probe and TH") - tk.NullNullFlags |= analysisFlagNullNullAllConnectsFailed + tk.NullNullFlags |= AnalysisFlagNullNullExpectedTCPConnectFailure return true } @@ -498,6 +495,6 @@ func (tk *TestKeys) analysisNullNullDetectNoAddrs(logger model.Logger) bool { return false } logger.Infof("website likely down: all DNS lookups failed for both probe and TH") - tk.NullNullFlags |= analysisFlagNullNullNoAddrs + tk.NullNullFlags |= AnalysisFlagNullNullExpectedDNSLookupFailure return true } diff --git a/internal/experiment/webconnectivitylte/analysisext.go b/internal/experiment/webconnectivitylte/analysisext.go index 0a03c95202..f25cee14b4 100644 --- a/internal/experiment/webconnectivitylte/analysisext.go +++ b/internal/experiment/webconnectivitylte/analysisext.go @@ -40,7 +40,9 @@ func analysisExtMain(tk *TestKeys, container *minipipeline.WebObservationsContai // HTTP success analysis (i.e., only if we manage to get an HTTP response) analysisExtHTTPFinalResponse(tk, analysis, &info) - // TODO(bassosimone): we need to also compute the null-null flags here + // handle the cases where the probe and the TH both failed, which we can confidently + // only evaluate for DNS, TCP, and TLS during the 0-th redirect. + analysisExtExpectedFailures(tk, analysis, &info) // print the content of the analysis only if there's some content to print if content := info.String(); content != "" { @@ -120,6 +122,7 @@ func analysisExtHTTPFinalResponse(tk *TestKeys, analysis *minipipeline.WebAnalys // this is automatic success. if success := analysis.HTTPFinalResponseSuccessTLSWithoutControl; !success.IsNone() { fmt.Fprintf(info, "- the final response (transaction: %d) uses TLS: automatic success\n", success.Unwrap()) + tk.NullNullFlags |= AnalysisFlagNullNullSuccessfulHTTPS tk.BlockingFlags |= AnalysisBlockingFlagSuccess return } @@ -174,14 +177,14 @@ func analysisExtRedirectErrors(tk *TestKeys, analysis *minipipeline.WebAnalysis, } // we care about cases in which the TH succeeded - if analysis.ControlFinalResponseExpectations.IsNone() { + if analysis.ControlExpectations.IsNone() { return } - expect := analysis.ControlFinalResponseExpectations.Unwrap() - if expect.Failure.IsNone() { + expect := analysis.ControlExpectations.Unwrap() + if expect.FinalResponseFailure.IsNone() { return } - if expect.Failure.Unwrap() != "" { + if expect.FinalResponseFailure.Unwrap() != "" { return } @@ -221,3 +224,57 @@ func analysisExtRedirectErrors(tk *TestKeys, analysis *minipipeline.WebAnalysis, ) } } + +func analysisExtExpectedFailures(tk *TestKeys, analysis *minipipeline.WebAnalysis, info io.Writer) { + // Implementation note: in the "orig" engine this was called the "null-null" analysis + // because it aimed to address the cases in which failure and accessible were both set + // to null. We're keeping the original name so we can also keep the same flag we were + // using before. The flag is a "x_" kind of flag anyway. + // + // Also note that these cases ARE NOT MUTUALLY EXCLUSIVE meaning that these conditions + // could actually happen simultaneously in a bunch of cases. + + if expected := analysis.DNSLookupExpectedFailure; expected.Len() > 0 { + tk.NullNullFlags |= AnalysisFlagNullNullExpectedDNSLookupFailure + fmt.Fprintf( + info, "- transactions with expected DNS lookup failures: %s\n", + expected.String(), + ) + } + + if expected := analysis.TCPConnectExpectedFailure; expected.Len() > 0 { + tk.NullNullFlags |= AnalysisFlagNullNullExpectedTCPConnectFailure + fmt.Fprintf( + info, "- transactions with expected TCP connect failures: %s\n", + expected.String(), + ) + } + + if expected := analysis.TLSHandshakeExpectedFailure; expected.Len() > 0 { + tk.NullNullFlags |= AnalysisFlagNullNullExpectedTLSHandshakeFailure + fmt.Fprintf( + info, "- transactions with expected TLS handshake failures: %s\n", + expected.String(), + ) + } + + // Note: the following flag + // + // tk.NullNullFlags |= AnalysisFlagNullNullSuccessfulHTTPS + // + // is set by analysisExtHTTPFinalResponse + + // if the control did not resolve any address but the probe could, this is + // quite likely censorship injecting addrs for otherwise "down" or nonexisting + // domains, which lives on as a ghost haunting people + if !analysis.ControlExpectations.IsNone() { + expect := analysis.ControlExpectations.Unwrap() + if expect.DNSAddresses.Len() <= 0 && analysis.DNSLookupSuccess.Len() > 0 { + tk.NullNullFlags |= AnalysisFlagNullNullUnexpectedDNSLookupSuccess + fmt.Fprintf( + info, "- transactions that unexpectedly resolved IP addresses: %s\n", + analysis.DNSLookupSuccess.String(), + ) + } + } +} diff --git a/internal/experiment/webconnectivityqa/badssl.go b/internal/experiment/webconnectivityqa/badssl.go index e5fb4ccf89..17e6efc5fc 100644 --- a/internal/experiment/webconnectivityqa/badssl.go +++ b/internal/experiment/webconnectivityqa/badssl.go @@ -94,6 +94,7 @@ func badSSLWithUnknownAuthorityWithInconsistentDNS() *TestCase { XStatus: 9248, // StatusExperimentHTTP | StatusAnomalyTLSHandshake | StatusAnomalyDNS XDNSFlags: 4, // AnalysisDNSFlagUnexpectedAddrs XBlockingFlags: 33, // AnalysisBlockingFlagSuccess | AnalysisBlockingFlagDNSBlocking + XNullNullFlags: 4, // AnalysisFlagNullNullExpectedTLSHandshakeFailure Accessible: false, Blocking: "dns", }, diff --git a/internal/experiment/webconnectivityqa/testkeys.go b/internal/experiment/webconnectivityqa/testkeys.go index 35508bdded..1fa5138f12 100644 --- a/internal/experiment/webconnectivityqa/testkeys.go +++ b/internal/experiment/webconnectivityqa/testkeys.go @@ -77,9 +77,6 @@ func compareTestKeys(expected, got *testKeys) error { // ignore the fields that are specific to v0.4 options = append(options, cmpopts.IgnoreFields(testKeys{}, "XStatus")) - // TODO(bassosimone): ignore fields used by the v0.5 "orig" local analysis engine - options = append(options, cmpopts.IgnoreFields(testKeys{}, "XNullNullFlags")) - default: return fmt.Errorf("unknown experiment version: %s", got.XExperimentVersion) } diff --git a/internal/minipipeline/analysis.go b/internal/minipipeline/analysis.go index dc8be4019f..5f2fe2caf4 100644 --- a/internal/minipipeline/analysis.go +++ b/internal/minipipeline/analysis.go @@ -96,7 +96,7 @@ func NewLinearWebAnalysis(input *WebObservationsContainer) (output []*WebObserva // but avoids calling [NewLinearyAnalysis] to generate a linear analysis. func AnalyzeWebObservationsWithoutLinearAnalysis(container *WebObservationsContainer) *WebAnalysis { analysis := &WebAnalysis{ - ControlFinalResponseExpectations: container.ControlFinalResponseExpectations, + ControlExpectations: container.ControlExpectations, } analysis.dnsComputeSuccessMetrics(container) @@ -123,10 +123,14 @@ 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] + // ControlExpectations summarizes the expectations we have for the control. You should + // use this field to determine (a) whether unexplained failures are expected or unexpected + // and (b) whether we expect to see any resolved IP address and (c) possibly more flags. + ControlExpectations optional.Value[*WebObservationsControlExpectations] + + // DNSLookupSuccess contains all DNS lookups that were successful and for which + // we potentially have control information (i.e., in the 0-th redirect). + DNSLookupSuccess Set[int64] // DNSLookupSuccessWithInvalidAddresses contains DNS transactions with invalid IP addresses by // taking into account control info, bogons, and TLS handshakes. @@ -156,12 +160,17 @@ type WebAnalysis struct { // before hitting redirects (i.e., when TagDepth==0). DNSExperimentFailure optional.Value[string] - // DNSLookupExpectedFailure contains DNS transactions with expected failures. + // DNSLookupExpectedFailure contains DNS transactions with expected failures, i.e., + // failures that are consistent for the probe and the TH. DNSLookupExpectedFailure Set[int64] // DNSLookupExpectedSuccess contains DNS transactions with expected successes. DNSLookupExpectedSuccess Set[int64] + // TCPConnectExpectedFailure contains TCP connect transactions that failed + // consistently for the probe and the test helper. + TCPConnectExpectedFailure Set[int64] + // TCPConnectUnexpectedFailure contains TCP endpoint transactions with unexpected failures. TCPConnectUnexpectedFailure Set[int64] @@ -185,6 +194,10 @@ type WebAnalysis struct { // while checking for connectivity, as opposed to fetching a webpage. TCPConnectUnexplainedFailureDuringConnectivityCheck Set[int64] + // TLSHandshakeExpectedFailure contains TLS endpoint transactions that failed + // consistently for the probe and the test helper. + TLSHandshakeExpectedFailure Set[int64] + // TLSHandshakeUnexpectedFailure contains TLS endpoint transactions with unexpected failures. TLSHandshakeUnexpectedFailure Set[int64] @@ -264,6 +277,10 @@ func (wa *WebAnalysis) dnsComputeSuccessMetrics(c *WebObservationsContainer) { continue } + // track all the 0-th redirect lookups that succeded which helps to + // determine whether the probe UNEXPECTEDLY resolved any address. + wa.DNSLookupSuccess.Add(obs.DNSTransactionID.Unwrap()) + // if there's a bogon, mark as invalid if !obs.IPAddressBogon.IsNone() && obs.IPAddressBogon.Unwrap() { wa.DNSLookupSuccessWithInvalidAddresses.Add(obs.DNSTransactionID.Unwrap()) @@ -462,8 +479,12 @@ func (wa *WebAnalysis) tcpComputeMetrics(c *WebObservationsContainer) { continue } - // handle the case where only the control fails + // handle the case where the control fails if obs.ControlTCPConnectFailure.Unwrap() != "" { + // if also the probe failed mark this failure as expected + if obs.TCPConnectFailure.Unwrap() != "" { + wa.TCPConnectExpectedFailure.Add(obs.EndpointTransactionID.Unwrap()) + } continue } @@ -517,8 +538,12 @@ func (wa *WebAnalysis) tlsComputeMetrics(c *WebObservationsContainer) { continue } - // handle the case where only the control fails + // handle the case where the control fails if obs.ControlTLSHandshakeFailure.Unwrap() != "" { + // if also the probe failed mark this failure as expected + if obs.TLSHandshakeFailure.Unwrap() != "" { + wa.TLSHandshakeExpectedFailure.Add(obs.EndpointTransactionID.Unwrap()) + } continue } diff --git a/internal/minipipeline/classic.go b/internal/minipipeline/classic.go index 1a33eb1208..a50fd1ae49 100644 --- a/internal/minipipeline/classic.go +++ b/internal/minipipeline/classic.go @@ -53,7 +53,7 @@ func ClassicFilter(input *WebObservationsContainer) (output *WebObservationsCont } // ControlFinalResponseExpectations - output.ControlFinalResponseExpectations = input.ControlFinalResponseExpectations + output.ControlExpectations = input.ControlExpectations return } diff --git a/internal/minipipeline/observation.go b/internal/minipipeline/observation.go index b1f0994ef7..c78a839102 100644 --- a/internal/minipipeline/observation.go +++ b/internal/minipipeline/observation.go @@ -253,12 +253,14 @@ type WebObservation struct { ControlHTTPResponseTitle optional.Value[string] } -// WebObservationsControlFinalResponseExpectation summarizes the expectations -// on the final response based on what the control has observed. -type WebObservationsControlFinalResponseExpectation struct { - // Failure is the failure observed by the control when attempting +// WebObservationsControlExpectations summarizes the expectations based on the control. +type WebObservationsControlExpectations struct { + // DNSAddresses contains the addresses resolved by the control. + DNSAddresses Set[string] + + // FinalResponseFailure is the failure observed by the control when attempting // to fetch the final webpage associated with a URL. - Failure optional.Value[string] + FinalResponseFailure optional.Value[string] } // WebObservationsContainer contains [*WebObservations]. @@ -281,9 +283,8 @@ type WebObservationsContainer struct { // KnownTCPEndpoints maps transaction IDs to TCP observations. KnownTCPEndpoints map[int64]*WebObservation - // ControlFinalResponseExpectations summarizes the expectations we have - // for the control based on the final response. - ControlFinalResponseExpectations optional.Value[*WebObservationsControlFinalResponseExpectation] + // ControlExpectations summarizes the expectations we have based on the control results. + ControlExpectations optional.Value[*WebObservationsControlExpectations] // knownIPAddresses is an internal field that maps an IP address to the // corresponding DNS observation that discovered it. @@ -609,8 +610,9 @@ func (c *WebObservationsContainer) controlSetHTTPFinalResponseExpectation(resp * // make sure we have a final expectation based on what the control observed, which // is in turn necessary to figure out whether unexplained probe failures during redirects // are expected or unexpected. - c.ControlFinalResponseExpectations = optional.Some(&WebObservationsControlFinalResponseExpectation{ - Failure: optional.Some(utilsStringPointerToString(resp.HTTPRequest.Failure)), + c.ControlExpectations = optional.Some(&WebObservationsControlExpectations{ + DNSAddresses: NewSet(resp.DNS.Addrs...), + FinalResponseFailure: optional.Some(utilsStringPointerToString(resp.HTTPRequest.Failure)), }) for _, obs := range observations { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json index 1f9b914c7a..560235a846 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 3 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json index 9c34a768c2..c7498ebeb0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +22,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 3 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json index bb26cc34bf..380dc667ed 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json @@ -187,7 +187,10 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json index 1bc7739442..fcc6b62fab 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json @@ -96,7 +96,10 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json index 39c3e448a7..dd1025d882 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json @@ -1,7 +1,15 @@ { - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" }, + "DNSLookupSuccess": [ + 1, + 2, + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -20,12 +28,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 4 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json index 5a5195564c..f7c57aaf35 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +22,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 4 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json index 3f4d9f3101..95b987d6fb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json @@ -277,7 +277,10 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json index 2afd327d1f..30fec04795 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json @@ -96,7 +96,10 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json index 62241c8f16..5b4d18bc47 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1, 2 @@ -18,12 +25,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 3 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json index 62c15a1ea8..85295f77af 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 2 ], @@ -16,12 +22,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 3 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json index 27f9f07469..eb081be6dd 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json @@ -261,7 +261,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json index eb22e9061d..8881ce6ae9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json index d44fa00333..8a8694a62e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 3 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json index 7859ab5714..b77b5f73cd 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +22,16 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [ + 3 + ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json index fd5f0ac1ba..b2c33e2879 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json @@ -187,7 +187,10 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json index c5016b0600..30cd369216 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json @@ -96,7 +96,10 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "unknown_error" + "ControlExpectations": { + "DNSAddresses": [ + "104.154.89.105" + ], + "FinalResponseFailure": "unknown_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json index b6432acb8f..5a54be6bad 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json @@ -1,5 +1,9 @@ { - "ControlFinalResponseExpectations": null, + "ControlExpectations": null, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -12,12 +16,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json index 1bcbb60016..dce998188d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json @@ -1,5 +1,8 @@ { - "ControlFinalResponseExpectations": null, + "ControlExpectations": null, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -12,12 +15,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json index fc391f6d20..d7fbb1195b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json @@ -184,5 +184,5 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": null + "ControlExpectations": null } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json index 1faa1bc1fc..f224b458b8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json @@ -97,5 +97,5 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": null + "ControlExpectations": null } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json index 46df72cd22..8a7d628ac3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json @@ -1,5 +1,9 @@ { - "ControlFinalResponseExpectations": null, + "ControlExpectations": null, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -12,12 +16,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json index f51382719e..8c2550dc2e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json @@ -1,5 +1,8 @@ { - "ControlFinalResponseExpectations": null, + "ControlExpectations": null, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], @@ -10,12 +13,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json index 0827d39e43..17a00805b5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json @@ -228,5 +228,5 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": null + "ControlExpectations": null } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json index 9c0ffd52f3..29c09b36e2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json @@ -97,5 +97,5 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": null + "ControlExpectations": null } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json index cb399c6920..045efddbb4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -18,12 +24,14 @@ "DNSExperimentFailure": "android_dns_cache_no_data", "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json index 48cc2233c8..d77e1ba9d9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json @@ -1,7 +1,11 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], @@ -14,12 +18,14 @@ "DNSExperimentFailure": "android_dns_cache_no_data", "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json index 774630e51d..87f40a6e2d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json @@ -210,7 +210,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json index 54006bd26b..1e49b74dd6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json @@ -52,7 +52,10 @@ ], "DNSLookupSuccesses": [], "KnownTCPEndpoints": {}, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json index ede5642d3c..4fab92a58d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1 ], @@ -22,12 +29,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json index b68b68f6c5..504ebe7d84 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1 ], @@ -18,12 +24,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json index 1638443793..f957375101 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json @@ -263,7 +263,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json index f7b0256860..cb775c01ed 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json index dacdab8930..c1b1649dc1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -18,12 +24,14 @@ "DNSExperimentFailure": "dns_nxdomain_error", "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json index bb2e67ddec..b87ce9ce5f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json @@ -1,7 +1,11 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], @@ -14,12 +18,14 @@ "DNSExperimentFailure": "dns_nxdomain_error", "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json index 9269ca669f..4459e56eb5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json @@ -210,7 +210,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json index d61222773e..d0dfb4ffd0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json @@ -52,7 +52,10 @@ ], "DNSLookupSuccesses": [], "KnownTCPEndpoints": {}, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json index 8a9f172393..547e4aa22a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1 ], @@ -19,12 +26,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json index 82f68c8702..6b5cd4a890 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json index 3cfd11efeb..898255b8a1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json @@ -261,7 +261,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json index ad25c8d77c..a267be8977 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json @@ -111,7 +111,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json index 54cf588cc3..030c9fe301 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1 ], @@ -19,12 +26,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json index 37eb71a825..92a1fe881d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 2 ], @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json index 634b7ee999..6b75a0571e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json @@ -360,7 +360,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json index c9ec8f1dba..cdf89be189 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json @@ -110,7 +110,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json index 15da220772..d7e1a4e0a3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json index 6acec6a3c3..0ecfdb990c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json index 2dfa707d10..693e1375ef 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json @@ -258,7 +258,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json index adf772f559..c6246078cc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json index 324254d413..2a7a375eca 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json index 73f5e6d146..faf58c4924 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json index 834139d1a0..37b62b7acf 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json @@ -258,7 +258,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json index 97da40742c..fbff51d24a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json index d5cfbeea15..8dcbbf3947 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1 ], @@ -19,12 +26,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json index 1463e9051a..b4a43ad1e6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 2 ], @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json index 41a31f2a38..4081d69087 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json @@ -356,7 +356,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json index 22b60b54fc..d876866a09 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json index 629456c441..83f19d1232 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,6 +25,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], @@ -31,6 +39,7 @@ "TCPConnectUnexplainedFailureDuringConnectivityCheck": [ 7 ], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json index 8b9dcc38b5..d7e324059b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,6 +22,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], @@ -26,6 +33,7 @@ 6 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json index ec5bc24cf4..cb35f64778 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json @@ -454,7 +454,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json index b226a9bbfa..31a798b079 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json index e9c66569aa..5211313310 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,6 +25,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], @@ -28,6 +36,7 @@ 6 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json index 3ac481a8ef..3ae5b1a060 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -17,6 +23,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], @@ -27,6 +34,7 @@ 6 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json index 14612e4d47..10bf450497 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json @@ -405,7 +405,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json index dca56081f8..d8d3f9da8e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json index 6d6be81d27..75a0349696 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json index 86bc135895..f4995e480e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -17,12 +23,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json index da5730ea66..de677caada 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json @@ -454,7 +454,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json index 7829589987..828787dc57 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json index 4edc89c87f..eb581e5945 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json index 57f37a6f02..6b09346bb6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json index 368a764f10..027aaff04d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json @@ -405,7 +405,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json index 5fb613cd12..536a77f96f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json index cc2888d550..d008b45f87 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json index 24ecfe12bc..68bc5c2ca0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json index 0673cddd6b..a94bd6221a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json @@ -454,7 +454,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json index ca72dc9069..9cb13bde29 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json index 57205618f4..b90347ef9e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json index 90b8f005ec..79fe331165 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json index 8dcd4d978c..c4cb706e14 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json @@ -405,7 +405,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json index b39c2942e9..7ce1f4b5ed 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json index 300b109250..599f1c2783 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -21,12 +28,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json index 950e1521fc..f22ac1ee27 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -19,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json index 409c9b122e..041ef2e385 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json @@ -352,7 +352,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json index bd9096c9af..c53f7f8ef5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json @@ -158,7 +158,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json index 5abf17c780..ac3b4ee970 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json index a62626dc49..6766eb28f7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json index b4fbe1816b..99b4109de8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json @@ -454,7 +454,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json index f5a4811f29..276df08f3e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json index c0af7926ac..930e0e71c5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json @@ -1,7 +1,15 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2, + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -20,12 +28,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json index 9212879af0..9045454484 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json index 15bd799b46..3278d13f76 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json @@ -505,7 +505,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json index bed37318ed..d7ea36caf5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json @@ -208,7 +208,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "67.199.248.11" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json index ccc15f3a26..a308d92bc7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json index 603b023522..2f30ac8c11 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json index ee54e2ba0d..ddfd03f954 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json @@ -263,7 +263,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json index 715883cf08..705979da8c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json @@ -111,7 +111,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json index 1eca48582b..cd4f8acc5d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json index fe6aa5d951..367d831a23 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -17,12 +23,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json index 2a668c2f9a..82ee23bc00 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json @@ -212,7 +212,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json index 01c87f7878..6efe0c9f8d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json @@ -111,7 +111,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json index 9067bc5edf..91a5b8917f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,6 +25,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ 3 ], @@ -28,6 +36,7 @@ "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json index e2b1189c1e..729161655c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,6 +22,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ 3 ], @@ -26,6 +33,7 @@ "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json index c722379337..76a4795809 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json @@ -207,7 +207,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json index f44229a3fd..5d941d031e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json index 951157d58e..0df92c4189 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1, 2 @@ -18,6 +25,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ 3 ], @@ -28,6 +36,7 @@ "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json index c22282c6b0..d41b4243d9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1 ], @@ -16,6 +22,7 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ 3 ], @@ -26,6 +33,7 @@ "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json index 3737d7e7c7..d3c6533120 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json @@ -361,7 +361,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json index 01d007bc44..a722eadafc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json index 1aa0a0d3a4..af12613e07 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ 3 ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json index c356103f6a..1f03804334 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ 3 ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json index ad1e287db2..f4e1c451a1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json @@ -207,7 +207,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json index 7cbc3cb5b4..a7266201b7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json index fd90b82ada..2f0a88cdeb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json @@ -1,7 +1,14 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 1, 2 @@ -18,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ 3, 4 diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json index 0672225154..3ac8eea433 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json @@ -1,7 +1,13 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [ 2 ], @@ -16,12 +22,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ 3 ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json index d1d1dc3b00..f59934f28a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json @@ -256,7 +256,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json index 6f808f2df2..916af5d596 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json @@ -106,7 +106,10 @@ "ControlHTTPResponseTitle": "Default Web Page" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "93.184.216.34" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json index cc9e093981..af9609d3cb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json @@ -1,7 +1,9 @@ { - "ControlFinalResponseExpectations": { - "Failure": "dns_lookup_error" + "ControlExpectations": { + "DNSAddresses": [], + "FinalResponseFailure": "dns_lookup_error" }, + "DNSLookupSuccess": [], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], @@ -15,12 +17,14 @@ 2 ], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json index 4ad6283206..5c6bb96b38 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json @@ -1,7 +1,9 @@ { - "ControlFinalResponseExpectations": { - "Failure": "dns_lookup_error" + "ControlExpectations": { + "DNSAddresses": [], + "FinalResponseFailure": "dns_lookup_error" }, + "DNSLookupSuccess": [], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], @@ -14,12 +16,14 @@ 2 ], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json index a6b9862883..176b5a7947 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json @@ -129,7 +129,8 @@ ], "DNSLookupSuccesses": [], "KnownTCPEndpoints": {}, - "ControlFinalResponseExpectations": { - "Failure": "dns_lookup_error" + "ControlExpectations": { + "DNSAddresses": [], + "FinalResponseFailure": "dns_lookup_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json index d27604401a..44ad36e2c7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json @@ -45,7 +45,8 @@ ], "DNSLookupSuccesses": [], "KnownTCPEndpoints": {}, - "ControlFinalResponseExpectations": { - "Failure": "dns_lookup_error" + "ControlExpectations": { + "DNSAddresses": [], + "FinalResponseFailure": "dns_lookup_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis.json b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis.json index ea9dba60ef..3ec153d5ef 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis.json @@ -1,7 +1,18 @@ { - "ControlFinalResponseExpectations": { - "Failure": "generic_timeout_error" + "ControlExpectations": { + "DNSAddresses": [ + "2001:4860:4860::8844", + "2001:4860:4860::8888", + "8.8.4.4", + "8.8.8.8" + ], + "FinalResponseFailure": "generic_timeout_error" }, + "DNSLookupSuccess": [ + 1, + 2, + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -20,12 +31,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis_classic.json index a40c613a23..00d13ce28e 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/analysis_classic.json @@ -1,7 +1,16 @@ { - "ControlFinalResponseExpectations": { - "Failure": "generic_timeout_error" + "ControlExpectations": { + "DNSAddresses": [ + "2001:4860:4860::8844", + "2001:4860:4860::8888", + "8.8.4.4", + "8.8.8.8" + ], + "FinalResponseFailure": "generic_timeout_error" }, + "DNSLookupSuccess": [ + 1 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1 @@ -16,12 +25,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json index f97cbd3cb9..d63782eb97 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json @@ -1028,7 +1028,13 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "generic_timeout_error" + "ControlExpectations": { + "DNSAddresses": [ + "2001:4860:4860::8844", + "2001:4860:4860::8888", + "8.8.4.4", + "8.8.8.8" + ], + "FinalResponseFailure": "generic_timeout_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations_classic.json index 130f7f1268..acb09b4f0f 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations_classic.json @@ -420,7 +420,13 @@ "ControlHTTPResponseTitle": null } }, - "ControlFinalResponseExpectations": { - "Failure": "generic_timeout_error" + "ControlExpectations": { + "DNSAddresses": [ + "2001:4860:4860::8844", + "2001:4860:4860::8888", + "8.8.4.4", + "8.8.8.8" + ], + "FinalResponseFailure": "generic_timeout_error" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis.json b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis.json index 71a2ebd985..c65c1f475a 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis.json @@ -1,7 +1,23 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2, + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -20,12 +36,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis_classic.json index 97a042c65c..11e1a1fd44 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/analysis_classic.json @@ -1,7 +1,21 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -17,12 +31,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json index 4c0b0d1981..a900d93e2d 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json @@ -4588,7 +4588,18 @@ "ControlHTTPResponseTitle": "YouTube" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations_classic.json index 5cb5f4ac11..0241fb2468 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations_classic.json @@ -1846,7 +1846,18 @@ "ControlHTTPResponseTitle": "YouTube" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis.json b/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis.json index 18ff9efa72..e6d2618544 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis.json @@ -1,7 +1,24 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.1.14", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 1, + 2, + 3 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 1, @@ -20,12 +37,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis_classic.json index 5645879bc2..aa85452be9 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/youtube/analysis_classic.json @@ -1,7 +1,22 @@ { - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.1.14", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" }, + "DNSLookupSuccess": [ + 2 + ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ 2 @@ -16,12 +31,14 @@ "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], + "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], + "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], diff --git a/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json b/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json index 4da11d4afe..7ba1068d40 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json @@ -4768,7 +4768,19 @@ "ControlHTTPResponseTitle": "YouTube" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.1.14", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" } } \ No newline at end of file diff --git a/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations_classic.json index 235740bfb4..eea348a88c 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations_classic.json @@ -1917,7 +1917,19 @@ "ControlHTTPResponseTitle": "YouTube" } }, - "ControlFinalResponseExpectations": { - "Failure": "" + "ControlExpectations": { + "DNSAddresses": [ + "142.251.32.78", + "142.251.33.174", + "142.251.41.46", + "142.251.41.78", + "172.217.1.14", + "172.217.165.14", + "2607:f8b0:400b:802::200e", + "2607:f8b0:400b:803::200e", + "2607:f8b0:400b:807::200e", + "2607:f8b0:400b:80c::200e" + ], + "FinalResponseFailure": "" } } \ No newline at end of file