diff --git a/internal/cmd/minipipeline/testdata/analysis.json b/internal/cmd/minipipeline/testdata/analysis.json index 6484ef3121..dbdad0f79a 100644 --- a/internal/cmd/minipipeline/testdata/analysis.json +++ b/internal/cmd/minipipeline/testdata/analysis.json @@ -20,4 +20,4 @@ "TCPTransactionsWithUnexpectedTLSHandshakeFailures": {}, "TCPTransactionsWithUnexpectedHTTPFailures": {}, "TCPTransactionsWithUnexplainedUnexpectedFailures": {} -} +} \ No newline at end of file diff --git a/internal/cmd/minipipeline/testdata/observations.json b/internal/cmd/minipipeline/testdata/observations.json index 96dc862049..a0f9fcbb77 100644 --- a/internal/cmd/minipipeline/testdata/observations.json +++ b/internal/cmd/minipipeline/testdata/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "doh", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "130.192.16.171", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "130.192.16.171", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "doh", "IPAddress": "130.192.16.171", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -202,7 +197,6 @@ "DNSEngine": null, "IPAddress": "130.192.16.171", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -263,4 +257,4 @@ "ControlHTTPResponseTitle": "Nexa Center for Internet \u0026 Society | Il centro Nexa รจ un centro di ricerca del Dipartimento di Automatica e Informatica del Politecnico di Torino" } } -} +} \ No newline at end of file diff --git a/internal/minipipeline/observation.go b/internal/minipipeline/observation.go index c8d0758ea1..c797f3e635 100644 --- a/internal/minipipeline/observation.go +++ b/internal/minipipeline/observation.go @@ -5,7 +5,6 @@ import ( "net" "net/url" "strconv" - "strings" "github.com/ooni/probe-cli/v3/internal/geoipx" "github.com/ooni/probe-cli/v3/internal/measurexlite" @@ -107,11 +106,6 @@ type WebObservation struct { // means that the probe failed to discover the IP address ASN. IPAddressASN optional.Value[int64] - // IPAddressOrg is the optional organization name associated to this IP adddress - // as discovered by the probe while performing the measurement. When this field is - // optional.None, it means that the probe failed to discover the IP address org. - IPAddressOrg optional.Value[string] - // IPAddressBogon is true if IPAddress is a bogon. IPAddressBogon optional.Value[bool] @@ -284,18 +278,7 @@ func (c *WebObservationsContainer) ingestDNSLookupSuccesses(evs ...*model.Archiv } // walk through the answers - for _, answer := range ev.Answers { - // extract the IP address we resolved - var addr string - switch answer.AnswerType { - case "A": - addr = answer.IPv4 - case "AAAA": - addr = answer.IPv6 - default: - continue - } - + utilsForEachIPAddress(ev.Answers, func(ipAddr string) { // create the record obs := &WebObservation{ DNSTransactionID: optional.Some(ev.TransactionID), @@ -303,22 +286,19 @@ func (c *WebObservationsContainer) ingestDNSLookupSuccesses(evs ...*model.Archiv DNSLookupFailure: optional.Some(""), DNSQueryType: optional.Some(ev.QueryType), DNSEngine: optional.Some(ev.Engine), - IPAddress: optional.Some(addr), - IPAddressBogon: optional.Some(netxlite.IsBogon(addr)), - } - if asn, asOrg, err := geoipx.LookupASN(addr); err == nil { - obs.IPAddressASN = optional.Some(int64(asn)) - obs.IPAddressOrg = optional.Some(asOrg) + IPAddress: optional.Some(ipAddr), + IPAddressASN: utilsGeoipxLookupASN(ipAddr), + IPAddressBogon: optional.Some(netxlite.IsBogon(ipAddr)), } // add record c.DNSLookupSuccesses = append(c.DNSLookupSuccesses, obs) // store the first lookup that resolved this address - if _, found := c.knownIPAddresses[addr]; !found { - c.knownIPAddresses[addr] = obs + if _, found := c.knownIPAddresses[ipAddr]; !found { + c.knownIPAddresses[ipAddr] = obs } - } + }) } } @@ -331,12 +311,9 @@ func (c *WebObservationsContainer) IngestTCPConnectEvents(evs ...*model.Archival if !found { obs = &WebObservation{ IPAddress: optional.Some(ev.IP), + IPAddressASN: utilsGeoipxLookupASN(ev.IP), IPAddressBogon: optional.Some(netxlite.IsBogon(ev.IP)), } - if asn, asOrg, err := geoipx.LookupASN(ev.IP); err == nil { - obs.IPAddressASN = optional.Some(int64(asn)) - obs.IPAddressOrg = optional.Some(asOrg) - } } // clone the record because the same IP address MAY belong @@ -350,7 +327,6 @@ func (c *WebObservationsContainer) IngestTCPConnectEvents(evs ...*model.Archival DNSLookupFailure: obs.DNSLookupFailure, IPAddress: obs.IPAddress, IPAddressASN: obs.IPAddressASN, - IPAddressOrg: obs.IPAddressOrg, IPAddressBogon: obs.IPAddressBogon, EndpointTransactionID: optional.Some(ev.TransactionID), EndpointProto: optional.Some("tcp"), @@ -390,37 +366,20 @@ func (c *WebObservationsContainer) IngestHTTPRoundTripEvents(evs ...*model.Archi continue } - // update the record + // start updating the record obs.HTTPRequestURL = optional.Some(ev.Request.URL) obs.HTTPFailure = optional.Some(utilsStringPointerToString(ev.Failure)) - obs.HTTPResponseStatusCode = optional.Some(ev.Response.Code) - obs.HTTPResponseBodyLength = optional.Some(int64(len(ev.Response.Body))) - obs.HTTPResponseBodyIsTruncated = optional.Some(ev.Request.BodyIsTruncated) - httpResponseHeadersKeys := make(map[string]bool) - for key := range ev.Response.Headers { - httpResponseHeadersKeys[key] = true - } - obs.HTTPResponseHeadersKeys = optional.Some(httpResponseHeadersKeys) - - if value := measurexlite.WebGetTitle(string(ev.Response.Body)); value != "" { - obs.HTTPResponseTitle = optional.Some(value) - } - for key, value := range ev.Response.Headers { - if strings.ToLower(key) == "location" { - obs.HTTPResponseLocation = optional.Some(string(value)) - break // only first entry (typically there's just a single entry) - } + // consider the response authoritative only in case of success + if ev.Failure == nil { + obs.HTTPResponseStatusCode = optional.Some(ev.Response.Code) + obs.HTTPResponseBodyLength = optional.Some(int64(len(ev.Response.Body))) + obs.HTTPResponseBodyIsTruncated = optional.Some(ev.Request.BodyIsTruncated) + obs.HTTPResponseHeadersKeys = utilsExtractHTTPHeaderKeys(ev.Response.Headers) + obs.HTTPResponseTitle = optional.Some(measurexlite.WebGetTitle(string(ev.Response.Body))) + obs.HTTPResponseLocation = utilsExtractHTTPLocation(ev.Response.Headers) + obs.HTTPResponseIsFinal = utilsDetermineWhetherHTTPResponseIsFinal(ev.Response.Code) } - - obs.HTTPResponseIsFinal = optional.Some((func() bool { - switch ev.Response.Code / 100 { - case 2, 4, 5: - return true - default: - return false - } - }())) } } @@ -554,30 +513,18 @@ func (c *WebObservationsContainer) controlXrefTLSFailures(resp *model.THResponse } func (c *WebObservationsContainer) controlSetHTTPFinalResponseExpectation(resp *model.THResponse) { - // Implementation note: the TH response does not have a clear semantics for "missing" values - // therefore we are accepting as valid values within the correct range - // - // also note that we add control information to all endpoints and then we check for "final" - // responses and only compare against "final" responses during the analysis for _, obs := range c.KnownTCPEndpoints { obs.ControlHTTPFailure = optional.Some(utilsStringPointerToString(resp.HTTPRequest.Failure)) - if value := resp.HTTPRequest.StatusCode; value > 0 { - obs.ControlHTTPResponseStatusCode = optional.Some(value) - } - if value := resp.HTTPRequest.BodyLength; value >= 0 { - obs.ControlHTTPResponseBodyLength = optional.Some(value) - } - controlHTTPResponseHeadersKeys := make(map[string]bool) - for key := range resp.HTTPRequest.Headers { - controlHTTPResponseHeadersKeys[key] = true - } - if len(controlHTTPResponseHeadersKeys) > 0 { - obs.ControlHTTPResponseHeadersKeys = optional.Some(controlHTTPResponseHeadersKeys) + // leave everything else nil if there was a failure, like we + // already do when processing the probe events + if resp.HTTPRequest.Failure != nil { + continue } - if v := resp.HTTPRequest.Title; v != "" { - obs.ControlHTTPResponseTitle = optional.Some(v) - } + obs.ControlHTTPResponseStatusCode = optional.Some(resp.HTTPRequest.StatusCode) + obs.ControlHTTPResponseBodyLength = optional.Some(resp.HTTPRequest.BodyLength) + obs.ControlHTTPResponseHeadersKeys = utilsExtractHTTPHeaderKeys(resp.HTTPRequest.Headers) + obs.ControlHTTPResponseTitle = optional.Some(resp.HTTPRequest.Title) } } diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json index b9f01ce64c..433351d923 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json index e4036312b9..960dda0103 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "doh", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "doh", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -202,7 +197,6 @@ "DNSEngine": null, "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json index 02586fbff4..22a892faed 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json index 70cf5dd6a4..e3931e5100 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "udp", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "104.154.89.105", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json index bf8c2703ec..c4cf4f2e66 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json index 3894a91dba..4e552226c3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json index 756135968f..fca71cd1fc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json index cc9e13f847..0be111b43c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -47,8 +46,7 @@ "DNSQueryType": "ANY", "DNSEngine": "getaddrinfo", "IPAddress": "10.10.34.35", - "IPAddressASN": 0, - "IPAddressOrg": "", + "IPAddressASN": null, "IPAddressBogon": true, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -125,8 +122,7 @@ "DNSQueryType": null, "DNSEngine": null, "IPAddress": "10.10.34.35", - "IPAddressASN": 0, - "IPAddressOrg": "", + "IPAddressASN": null, "IPAddressBogon": true, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json index 13f5d39c76..d883b97160 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json index 266b25983c..367fb4fab0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -174,7 +170,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json index b812f51c23..b9a5f5cab8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -173,7 +169,6 @@ "DNSEngine": null, "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -216,7 +211,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", @@ -259,7 +253,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json index ea7c88cd38..1c54f6c191 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -137,13 +133,13 @@ "TLSServerName": null, "HTTPRequestURL": "http://www.example.com/", "HTTPFailure": "connection_reset", - "HTTPResponseStatusCode": 0, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": {}, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, "HTTPResponseTitle": null, - "HTTPResponseIsFinal": false, + "HTTPResponseIsFinal": null, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, "ControlTCPConnectFailure": "", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json index 8bcf750dfb..7833be13c6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json index 2b45bf1427..b36eac64eb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -212,7 +207,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", @@ -255,7 +249,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json index 32666ffccc..e66fcaf2ad 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "http://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -330,7 +322,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json index 8cb31bcc1f..7379eb90cc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "https://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json index 3f26379419..1ffb856a56 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "http://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -298,13 +290,13 @@ "TLSServerName": null, "HTTPRequestURL": "http://www.example.com/", "HTTPFailure": "connection_reset", - "HTTPResponseStatusCode": 0, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": {}, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, "HTTPResponseTitle": null, - "HTTPResponseIsFinal": false, + "HTTPResponseIsFinal": null, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, "ControlTCPConnectFailure": null, @@ -330,7 +322,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json index f193b1f11e..ee65438df4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "https://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json index 254effc904..ea52e4b4ce 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "http://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -298,13 +290,13 @@ "TLSServerName": null, "HTTPRequestURL": "http://www.example.com/", "HTTPFailure": "eof_error", - "HTTPResponseStatusCode": 0, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": {}, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, "HTTPResponseTitle": null, - "HTTPResponseIsFinal": false, + "HTTPResponseIsFinal": null, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, "ControlTCPConnectFailure": null, @@ -330,7 +322,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json index 9afc38c27c..c89ab22c3c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "https://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json index ff787aa3a8..f8bd818170 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -84,7 +82,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -122,7 +119,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "https://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json index 690acf5ba6..c2604d76cb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "http://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -298,13 +290,13 @@ "TLSServerName": null, "HTTPRequestURL": "http://www.example.com/", "HTTPFailure": "generic_timeout_error", - "HTTPResponseStatusCode": 0, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": {}, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, "HTTPResponseTitle": null, - "HTTPResponseIsFinal": false, + "HTTPResponseIsFinal": null, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, "ControlTCPConnectFailure": null, @@ -330,7 +322,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json index 3f458af41d..16d8c7786a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "udp", "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -200,7 +195,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -240,7 +234,6 @@ "DNSEngine": null, "IPAddress": "67.199.248.11", "IPAddressASN": 396982, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -260,7 +253,7 @@ "Location": true }, "HTTPResponseLocation": "https://www.example.com/", - "HTTPResponseTitle": null, + "HTTPResponseTitle": "", "HTTPResponseIsFinal": false, "ControlDNSDomain": null, "ControlDNSLookupFailure": null, @@ -287,7 +280,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json index 8059bf2b9e..7fc43bb747 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "doh", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -124,7 +121,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -162,7 +158,6 @@ "DNSEngine": "doh", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -202,7 +197,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -250,7 +244,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json index d19fbb6caa..543c8ead25 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json index ea37d5e369..dacbcbdd37 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json index de79f3aeff..23f296e8ce 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "udp", "IPAddress": "83.224.65.41", "IPAddressASN": 30722, - "IPAddressOrg": "Vodafone Italia S.p.A.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "83.224.65.41", "IPAddressASN": 30722, - "IPAddressOrg": "Vodafone Italia S.p.A.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "83.224.65.41", "IPAddressASN": 30722, - "IPAddressOrg": "Vodafone Italia S.p.A.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "83.224.65.41", "IPAddressASN": 30722, - "IPAddressOrg": "Vodafone Italia S.p.A.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -212,7 +207,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", @@ -260,7 +254,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json index f8ffbe8998..691a83058f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json index 9b148edda8..481fd161f4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -48,7 +47,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -86,7 +84,6 @@ "DNSEngine": "udp", "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -126,7 +123,6 @@ "DNSEngine": null, "IPAddress": "130.192.182.17", "IPAddressASN": 137, - "IPAddressOrg": "Consortium GARR", "IPAddressBogon": false, "EndpointTransactionID": 3, "EndpointProto": "tcp", @@ -169,7 +165,6 @@ "DNSEngine": null, "IPAddress": "93.184.216.34", "IPAddressASN": 15133, - "IPAddressOrg": "Edgecast Inc.", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json index 8d0dfcbd2d..3505c89c73 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json @@ -8,7 +8,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -46,7 +45,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, @@ -84,7 +82,6 @@ "DNSEngine": "udp", "IPAddress": null, "IPAddressASN": null, - "IPAddressOrg": null, "IPAddressBogon": null, "EndpointTransactionID": null, "EndpointProto": null, diff --git a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json index f2c8841940..c8b591d1a7 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/observations.json @@ -9,7 +9,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2001:4860:4860::8888", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -47,7 +46,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2001:4860:4860::8844", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -85,7 +83,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "8.8.8.8", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -123,7 +120,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "8.8.4.4", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -161,7 +157,6 @@ "DNSEngine": "udp", "IPAddress": "2001:4860:4860::8844", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -199,7 +194,6 @@ "DNSEngine": "udp", "IPAddress": "2001:4860:4860::8888", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -237,7 +231,6 @@ "DNSEngine": "udp", "IPAddress": "8.8.4.4", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -275,7 +268,6 @@ "DNSEngine": "udp", "IPAddress": "8.8.8.8", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -313,7 +305,6 @@ "DNSEngine": "doh", "IPAddress": "8.8.8.8", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -351,7 +342,6 @@ "DNSEngine": "doh", "IPAddress": "8.8.4.4", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -389,7 +379,6 @@ "DNSEngine": "doh", "IPAddress": "2001:4860:4860::8888", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -427,7 +416,6 @@ "DNSEngine": "doh", "IPAddress": "2001:4860:4860::8844", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -467,7 +455,6 @@ "DNSEngine": null, "IPAddress": "8.8.8.8", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 10, "EndpointProto": "tcp", @@ -505,7 +492,6 @@ "DNSEngine": null, "IPAddress": "8.8.4.4", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 11, "EndpointProto": "tcp", @@ -543,7 +529,6 @@ "DNSEngine": null, "IPAddress": "2001:4860:4860::8888", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -581,7 +566,6 @@ "DNSEngine": null, "IPAddress": "2001:4860:4860::8844", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", @@ -619,7 +603,6 @@ "DNSEngine": null, "IPAddress": "8.8.8.8", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -657,7 +640,6 @@ "DNSEngine": null, "IPAddress": "8.8.4.4", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", @@ -695,7 +677,6 @@ "DNSEngine": null, "IPAddress": "2001:4860:4860::8888", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 8, "EndpointProto": "tcp", @@ -733,7 +714,6 @@ "DNSEngine": null, "IPAddress": "2001:4860:4860::8844", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 9, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json index c4ff6a3de7..13a556339f 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/noipv6/observations.json @@ -9,7 +9,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -47,7 +46,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -85,7 +83,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:403::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -123,7 +120,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:410::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -161,7 +157,6 @@ "DNSEngine": "udp", "IPAddress": "216.58.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -199,7 +194,6 @@ "DNSEngine": "udp", "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -237,7 +231,6 @@ "DNSEngine": "udp", "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -275,7 +268,6 @@ "DNSEngine": "udp", "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -313,7 +305,6 @@ "DNSEngine": "udp", "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -351,7 +342,6 @@ "DNSEngine": "udp", "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -389,7 +379,6 @@ "DNSEngine": "udp", "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -427,7 +416,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -465,7 +453,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -503,7 +490,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -541,7 +527,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -579,7 +564,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -617,7 +601,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -655,7 +638,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:414::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -693,7 +675,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:411::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -731,7 +712,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -769,7 +749,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -807,7 +786,6 @@ "DNSEngine": "doh", "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -845,7 +823,6 @@ "DNSEngine": "doh", "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -883,7 +860,6 @@ "DNSEngine": "doh", "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -921,7 +897,6 @@ "DNSEngine": "doh", "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -959,7 +934,6 @@ "DNSEngine": "doh", "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -997,7 +971,6 @@ "DNSEngine": "doh", "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1035,7 +1008,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:410::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1073,7 +1045,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:809::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1111,7 +1082,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:403::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1149,7 +1119,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:411::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1189,7 +1158,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 10, "EndpointProto": "tcp", @@ -1248,7 +1216,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:809::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 11, "EndpointProto": "tcp", @@ -1307,7 +1274,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:411::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 12, "EndpointProto": "tcp", @@ -1366,7 +1332,6 @@ "DNSEngine": null, "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 13, "EndpointProto": "tcp", @@ -1425,7 +1390,6 @@ "DNSEngine": null, "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 14, "EndpointProto": "tcp", @@ -1484,7 +1448,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:414::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 15, "EndpointProto": "tcp", @@ -1543,7 +1506,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 16, "EndpointProto": "tcp", @@ -1602,7 +1564,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:403::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 17, "EndpointProto": "tcp", @@ -1661,7 +1622,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4009:827::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 18, "EndpointProto": "tcp", @@ -1720,7 +1680,6 @@ "DNSEngine": null, "IPAddress": "172.217.169.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 19, "EndpointProto": "tcp", @@ -1779,7 +1738,6 @@ "DNSEngine": null, "IPAddress": "142.250.180.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 20, "EndpointProto": "tcp", @@ -1838,7 +1796,6 @@ "DNSEngine": null, "IPAddress": "142.250.187.206", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 21, "EndpointProto": "tcp", @@ -1897,7 +1854,6 @@ "DNSEngine": null, "IPAddress": "142.250.187.238", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 22, "EndpointProto": "tcp", @@ -1956,7 +1912,6 @@ "DNSEngine": null, "IPAddress": "172.217.16.238", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 23, "EndpointProto": "tcp", @@ -2015,7 +1970,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4009:80b::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 24, "EndpointProto": "tcp", @@ -2074,7 +2028,6 @@ "DNSEngine": null, "IPAddress": "142.250.200.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 25, "EndpointProto": "tcp", @@ -2133,7 +2086,6 @@ "DNSEngine": null, "IPAddress": "216.58.204.78", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 26, "EndpointProto": "tcp", @@ -2192,7 +2144,6 @@ "DNSEngine": null, "IPAddress": "142.250.178.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 27, "EndpointProto": "tcp", @@ -2251,7 +2202,6 @@ "DNSEngine": null, "IPAddress": "142.250.200.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 28, "EndpointProto": "tcp", @@ -2310,7 +2260,6 @@ "DNSEngine": null, "IPAddress": "142.250.179.238", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 29, "EndpointProto": "tcp", @@ -2369,7 +2318,6 @@ "DNSEngine": null, "IPAddress": "216.58.201.110", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 30, "EndpointProto": "tcp", @@ -2428,7 +2376,6 @@ "DNSEngine": null, "IPAddress": "172.217.169.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 31, "EndpointProto": "tcp", @@ -2487,7 +2434,6 @@ "DNSEngine": null, "IPAddress": "216.58.212.206", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 32, "EndpointProto": "tcp", @@ -2546,7 +2492,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4009:826::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 33, "EndpointProto": "tcp", @@ -2605,7 +2550,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4009:816::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 34, "EndpointProto": "tcp", @@ -2664,7 +2608,6 @@ "DNSEngine": null, "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -2723,7 +2666,6 @@ "DNSEngine": null, "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", @@ -2782,7 +2724,6 @@ "DNSEngine": null, "IPAddress": "216.58.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -2841,7 +2782,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:410::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", @@ -2900,7 +2840,6 @@ "DNSEngine": null, "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 8, "EndpointProto": "tcp", @@ -2980,7 +2919,6 @@ "DNSEngine": null, "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 9, "EndpointProto": "tcp", diff --git a/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json b/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json index 71caa32e32..b466d65b3f 100644 --- a/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/manual/youtube/observations.json @@ -9,7 +9,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -47,7 +46,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:403::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -85,7 +83,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:414::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -123,7 +120,6 @@ "DNSEngine": "udp", "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -161,7 +157,6 @@ "DNSEngine": "udp", "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -199,7 +194,6 @@ "DNSEngine": "udp", "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -237,7 +231,6 @@ "DNSEngine": "udp", "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -275,7 +268,6 @@ "DNSEngine": "udp", "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -313,7 +305,6 @@ "DNSEngine": "udp", "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -351,7 +342,6 @@ "DNSEngine": "udp", "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -389,7 +379,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -427,7 +416,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:403::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -465,7 +453,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:414::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -503,7 +490,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -541,7 +527,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -579,7 +564,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -617,7 +601,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -655,7 +638,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -693,7 +675,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -731,7 +712,6 @@ "DNSEngine": "getaddrinfo", "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -769,7 +749,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -807,7 +786,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:809::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -845,7 +823,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:414::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -883,7 +860,6 @@ "DNSEngine": "doh", "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -921,7 +897,6 @@ "DNSEngine": "doh", "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -959,7 +934,6 @@ "DNSEngine": "doh", "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -997,7 +971,6 @@ "DNSEngine": "doh", "IPAddress": "216.58.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1035,7 +1008,6 @@ "DNSEngine": "doh", "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1073,7 +1045,6 @@ "DNSEngine": "doh", "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1111,7 +1082,6 @@ "DNSEngine": "doh", "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1149,7 +1119,6 @@ "DNSEngine": "doh", "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": null, "EndpointProto": null, @@ -1189,7 +1158,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:809::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 10, "EndpointProto": "tcp", @@ -1249,7 +1217,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:402::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 11, "EndpointProto": "tcp", @@ -1309,7 +1276,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:403::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 12, "EndpointProto": "tcp", @@ -1369,7 +1335,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:416::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 13, "EndpointProto": "tcp", @@ -1429,7 +1394,6 @@ "DNSEngine": null, "IPAddress": "142.251.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 14, "EndpointProto": "tcp", @@ -1489,7 +1453,6 @@ "DNSEngine": null, "IPAddress": "216.58.205.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 15, "EndpointProto": "tcp", @@ -1549,7 +1512,6 @@ "DNSEngine": null, "IPAddress": "142.251.32.78", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 16, "EndpointProto": "tcp", @@ -1609,7 +1571,6 @@ "DNSEngine": null, "IPAddress": "2607:f8b0:400b:803::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 17, "EndpointProto": "tcp", @@ -1669,7 +1630,6 @@ "DNSEngine": null, "IPAddress": "2607:f8b0:400b:80f::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 18, "EndpointProto": "tcp", @@ -1729,7 +1689,6 @@ "DNSEngine": null, "IPAddress": "172.217.1.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 19, "EndpointProto": "tcp", @@ -1789,7 +1748,6 @@ "DNSEngine": null, "IPAddress": "2607:f8b0:400b:807::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 20, "EndpointProto": "tcp", @@ -1849,7 +1807,6 @@ "DNSEngine": null, "IPAddress": "2607:f8b0:400b:80c::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 21, "EndpointProto": "tcp", @@ -1909,7 +1866,6 @@ "DNSEngine": null, "IPAddress": "142.251.41.78", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 22, "EndpointProto": "tcp", @@ -1969,7 +1925,6 @@ "DNSEngine": null, "IPAddress": "142.251.33.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 23, "EndpointProto": "tcp", @@ -2029,7 +1984,6 @@ "DNSEngine": null, "IPAddress": "142.251.41.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 24, "EndpointProto": "tcp", @@ -2089,7 +2043,6 @@ "DNSEngine": null, "IPAddress": "2a00:1450:4002:414::200e", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 4, "EndpointProto": "tcp", @@ -2149,7 +2102,6 @@ "DNSEngine": null, "IPAddress": "142.250.180.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 5, "EndpointProto": "tcp", @@ -2209,7 +2161,6 @@ "DNSEngine": null, "IPAddress": "216.58.204.142", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 6, "EndpointProto": "tcp", @@ -2269,7 +2220,6 @@ "DNSEngine": null, "IPAddress": "142.250.180.174", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 7, "EndpointProto": "tcp", @@ -2329,7 +2279,6 @@ "DNSEngine": null, "IPAddress": "142.251.209.14", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 8, "EndpointProto": "tcp", @@ -2410,7 +2359,6 @@ "DNSEngine": null, "IPAddress": "216.58.209.46", "IPAddressASN": 15169, - "IPAddressOrg": "Google LLC", "IPAddressBogon": false, "EndpointTransactionID": 9, "EndpointProto": "tcp", diff --git a/internal/minipipeline/utils.go b/internal/minipipeline/utils.go index f439000db9..99be17b155 100644 --- a/internal/minipipeline/utils.go +++ b/internal/minipipeline/utils.go @@ -1,8 +1,63 @@ package minipipeline +import ( + "strings" + + "github.com/ooni/probe-cli/v3/internal/geoipx" + "github.com/ooni/probe-cli/v3/internal/model" + "github.com/ooni/probe-cli/v3/internal/optional" +) + func utilsStringPointerToString(failure *string) (out string) { if failure != nil { out = *failure } return } + +func utilsGeoipxLookupASN(ipAddress string) optional.Value[int64] { + if asn, _, err := geoipx.LookupASN(ipAddress); err == nil && asn > 0 { + return optional.Some(int64(asn)) + } + return optional.None[int64]() +} + +func utilsExtractHTTPHeaderKeys[T ~string](input map[string]T) optional.Value[map[string]bool] { + output := make(map[string]bool) + for key := range input { + output[key] = true + } + return optional.Some(output) +} + +func utilsExtractHTTPLocation(input map[string]model.ArchivalScrubbedMaybeBinaryString) optional.Value[string] { + for key, value := range input { + if strings.ToLower(key) == "location" { + return optional.Some(string(value)) + } + } + return optional.None[string]() +} + +func utilsDetermineWhetherHTTPResponseIsFinal(status int64) optional.Value[bool] { + switch status / 100 { + case 2, 4, 5: + return optional.Some(true) + default: + return optional.Some(false) + } +} + +func utilsForEachIPAddress(answers []model.ArchivalDNSAnswer, fx func(ipAddr string)) { + for _, ans := range answers { + // extract the IP address we resolved + switch ans.AnswerType { + case "A": + fx(ans.IPv4) + case "AAAA": + fx(ans.IPv6) + default: + // nothing + } + } +} diff --git a/script/updateminipipeline.bash b/script/updateminipipeline.bash new file mode 100755 index 0000000000..0173d29ed2 --- /dev/null +++ b/script/updateminipipeline.bash @@ -0,0 +1,26 @@ +#!/bin/bash +set -euxo pipefail + +go run ./internal/cmd/qatool \ + -destdir ./internal/minipipeline/testdata/webconnectivity/generated \ + -disable-measure + +go run ./internal/cmd/minipipeline \ + -destdir ./internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80 \ + -measurement ./internal/minipipeline/testdata/webconnectivity/manual/dnsgoogle80/measurement.json + +go run ./internal/cmd/minipipeline \ + -destdir ./internal/minipipeline/testdata/webconnectivity/manual/noipv6 \ + -measurement ./internal/minipipeline/testdata/webconnectivity/manual/noipv6/measurement.json + +go run ./internal/cmd/minipipeline \ + -destdir ./internal/minipipeline/testdata/webconnectivity/manual/noipv6 \ + -measurement ./internal/minipipeline/testdata/webconnectivity/manual/noipv6/measurement.json + +go run ./internal/cmd/minipipeline \ + -destdir ./internal/minipipeline/testdata/webconnectivity/manual/youtube \ + -measurement ./internal/minipipeline/testdata/webconnectivity/manual/youtube/measurement.json + +go run ./internal/cmd/minipipeline \ + -measurement ./internal/cmd/minipipeline/testdata/measurement.json \ + -destdir ./internal/cmd/minipipeline/testdata