From 5f716f2558ac0b49ef06835eab97779e32bcb3cb Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Tue, 13 Feb 2024 02:22:50 +0100 Subject: [PATCH] fix(webconnectivitylte): add 10k*i scope to all IDs (#1513) Arguably IDs starting from 10k for getaddrinfo more obviously have a scope. Related to https://github.com/ooni/probe/issues/2677. --- .../webconnectivitylte/idgenerator.go | 10 +- .../analysis.json | 40 +- .../analysis_classic.json | 18 +- .../measurement.json | 14 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 40 +- .../analysis_classic.json | 18 +- .../measurement.json | 14 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 52 +- .../analysis_classic.json | 18 +- .../measurement.json | 26 +- .../observations.json | 110 ++--- .../observations_classic.json | 12 +- .../badSSLWithWrongServerName/analysis.json | 40 +- .../analysis_classic.json | 18 +- .../measurement.json | 14 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../cloudflareCAPTCHAWithHTTP/analysis.json | 46 +- .../analysis_classic.json | 18 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../cloudflareCAPTCHAWithHTTPS/analysis.json | 40 +- .../analysis_classic.json | 20 +- .../measurement.json | 16 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 34 +- .../analysis_classic.json | 16 +- .../measurement.json | 16 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 40 +- .../analysis_classic.json | 14 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../analysis.json | 42 +- .../analysis_classic.json | 6 +- .../measurement.json | 16 +- .../observations.json | 28 +- .../observations_classic.json | 4 +- .../generated/dnsBlockingBOGON/analysis.json | 52 +- .../dnsBlockingBOGON/analysis_classic.json | 18 +- .../dnsBlockingBOGON/measurement.json | 24 +- .../dnsBlockingBOGON/observations.json | 126 ++--- .../observations_classic.json | 12 +- .../dnsBlockingNXDOMAIN/analysis.json | 42 +- .../dnsBlockingNXDOMAIN/analysis_classic.json | 6 +- .../dnsBlockingNXDOMAIN/measurement.json | 16 +- .../dnsBlockingNXDOMAIN/observations.json | 28 +- .../observations_classic.json | 4 +- .../analysis.json | 54 +-- .../analysis_classic.json | 12 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 4 +- .../analysis.json | 48 +- .../analysis_classic.json | 12 +- .../measurement.json | 22 +- .../observations.json | 28 +- .../observations_classic.json | 4 +- .../analysis.json | 50 +- .../analysis_classic.json | 18 +- .../measurement.json | 20 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../analysis.json | 62 +-- .../analysis_classic.json | 18 +- .../measurement.json | 24 +- .../observations.json | 52 +- .../observations_classic.json | 12 +- .../ghostDNSBlockingWithHTTP/analysis.json | 40 +- .../analysis_classic.json | 14 +- .../ghostDNSBlockingWithHTTP/measurement.json | 16 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../ghostDNSBlockingWithHTTPS/analysis.json | 32 +- .../analysis_classic.json | 14 +- .../measurement.json | 12 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../httpBlockingConnectionReset/analysis.json | 46 +- .../analysis_classic.json | 18 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../httpDiffWithConsistentDNS/analysis.json | 46 +- .../analysis_classic.json | 18 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../httpDiffWithInconsistentDNS/analysis.json | 62 +-- .../analysis_classic.json | 18 +- .../measurement.json | 24 +- .../observations.json | 52 +- .../observations_classic.json | 12 +- .../analysis.json | 298 ++++++------ .../analysis_classic.json | 174 +++---- .../measurement.json | 96 ++-- .../observations.json | 416 ++++++++-------- .../observations_classic.json | 288 +++++------ .../analysis.json | 282 +++++------ .../analysis_classic.json | 158 +++--- .../measurement.json | 94 ++-- .../observations.json | 450 +++++++++--------- .../observations_classic.json | 312 ++++++------ .../generated/largeFileWithHTTP/analysis.json | 70 +-- .../largeFileWithHTTP/analysis_classic.json | 28 +- .../largeFileWithHTTP/measurement.json | 24 +- .../largeFileWithHTTP/observations.json | 64 +-- .../observations_classic.json | 24 +- .../largeFileWithHTTPS/analysis.json | 58 +-- .../largeFileWithHTTPS/analysis_classic.json | 30 +- .../largeFileWithHTTPS/measurement.json | 20 +- .../largeFileWithHTTPS/observations.json | 48 +- .../observations_classic.json | 24 +- .../generated/localhostWithHTTP/analysis.json | 36 +- .../localhostWithHTTP/analysis_classic.json | 12 +- .../localhostWithHTTP/measurement.json | 10 +- .../localhostWithHTTP/observations.json | 20 +- .../observations_classic.json | 4 +- .../localhostWithHTTPS/analysis.json | 36 +- .../localhostWithHTTPS/analysis_classic.json | 12 +- .../localhostWithHTTPS/measurement.json | 10 +- .../localhostWithHTTPS/observations.json | 20 +- .../observations_classic.json | 4 +- .../analysis.json | 46 +- .../analysis_classic.json | 18 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../analysis.json | 40 +- .../analysis_classic.json | 20 +- .../measurement.json | 16 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 70 +-- .../analysis_classic.json | 32 +- .../measurement.json | 26 +- .../observations.json | 56 +-- .../observations_classic.json | 24 +- .../analysis.json | 60 +-- .../analysis_classic.json | 32 +- .../measurement.json | 24 +- .../observations.json | 48 +- .../observations_classic.json | 24 +- .../analysis.json | 68 +-- .../analysis_classic.json | 30 +- .../measurement.json | 30 +- .../observations.json | 56 +-- .../observations_classic.json | 24 +- .../analysis.json | 60 +-- .../analysis_classic.json | 32 +- .../measurement.json | 26 +- .../observations.json | 48 +- .../observations_classic.json | 24 +- .../analysis.json | 68 +-- .../analysis_classic.json | 30 +- .../measurement.json | 30 +- .../observations.json | 56 +-- .../observations_classic.json | 24 +- .../analysis.json | 60 +-- .../analysis_classic.json | 32 +- .../measurement.json | 26 +- .../observations.json | 48 +- .../observations_classic.json | 24 +- .../analysis.json | 54 +-- .../analysis_classic.json | 24 +- .../measurement.json | 22 +- .../observations.json | 40 +- .../observations_classic.json | 16 +- .../analysis.json | 68 +-- .../analysis_classic.json | 30 +- .../measurement.json | 30 +- .../observations.json | 56 +-- .../observations_classic.json | 24 +- .../analysis.json | 60 +-- .../analysis_classic.json | 32 +- .../measurement.json | 26 +- .../observations.json | 48 +- .../observations_classic.json | 24 +- .../generated/successWithHTTP/analysis.json | 46 +- .../successWithHTTP/analysis_classic.json | 18 +- .../successWithHTTP/measurement.json | 18 +- .../successWithHTTP/observations.json | 36 +- .../successWithHTTP/observations_classic.json | 12 +- .../generated/successWithHTTPS/analysis.json | 40 +- .../successWithHTTPS/analysis_classic.json | 20 +- .../successWithHTTPS/measurement.json | 16 +- .../successWithHTTPS/observations.json | 28 +- .../observations_classic.json | 12 +- .../tcpBlockingConnectTimeout/analysis.json | 42 +- .../analysis_classic.json | 20 +- .../measurement.json | 12 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 68 +-- .../analysis_classic.json | 20 +- .../measurement.json | 22 +- .../observations.json | 52 +- .../observations_classic.json | 12 +- .../throttlingWithHTTP/analysis.json | 74 +-- .../throttlingWithHTTP/analysis_classic.json | 32 +- .../throttlingWithHTTP/measurement.json | 24 +- .../throttlingWithHTTP/observations.json | 64 +-- .../observations_classic.json | 24 +- .../throttlingWithHTTPS/analysis.json | 58 +-- .../throttlingWithHTTPS/analysis_classic.json | 30 +- .../throttlingWithHTTPS/measurement.json | 20 +- .../throttlingWithHTTPS/observations.json | 48 +- .../observations_classic.json | 24 +- .../analysis.json | 42 +- .../analysis_classic.json | 20 +- .../measurement.json | 14 +- .../observations.json | 28 +- .../observations_classic.json | 12 +- .../analysis.json | 56 +-- .../analysis_classic.json | 20 +- .../measurement.json | 18 +- .../observations.json | 36 +- .../observations_classic.json | 12 +- .../websiteDownNXDOMAIN/analysis.json | 24 +- .../websiteDownNXDOMAIN/analysis_classic.json | 6 +- .../websiteDownNXDOMAIN/measurement.json | 10 +- .../websiteDownNXDOMAIN/observations.json | 20 +- .../observations_classic.json | 4 +- .../websiteDownNoAddrs/analysis.json | 24 +- .../websiteDownNoAddrs/analysis_classic.json | 6 +- .../websiteDownNoAddrs/measurement.json | 10 +- .../websiteDownNoAddrs/observations.json | 20 +- .../observations_classic.json | 4 +- .../websiteDownTCPConnect/analysis.json | 40 +- .../analysis_classic.json | 18 +- .../websiteDownTCPConnect/measurement.json | 12 +- .../websiteDownTCPConnect/observations.json | 28 +- .../observations_classic.json | 12 +- 241 files changed, 4594 insertions(+), 4594 deletions(-) diff --git a/internal/experiment/webconnectivitylte/idgenerator.go b/internal/experiment/webconnectivitylte/idgenerator.go index 094b0b7ff1..b8d490f144 100644 --- a/internal/experiment/webconnectivitylte/idgenerator.go +++ b/internal/experiment/webconnectivitylte/idgenerator.go @@ -3,11 +3,11 @@ package webconnectivitylte import "sync/atomic" const ( - idGeneratorGetaddrinfoOffset = 0 - idGeneratorDNSOverUDPOffset = 10_000 - idGeneratorDNSOverHTTPSOffset = 20_000 - idGeneratorEndpointCleartextOffset = 30_000 - idGeneratorEndpointSecureOffset = 40_000 + idGeneratorGetaddrinfoOffset = 10_000 + idGeneratorDNSOverUDPOffset = 20_000 + idGeneratorDNSOverHTTPSOffset = 30_000 + idGeneratorEndpointCleartextOffset = 40_000 + idGeneratorEndpointSecureOffset = 50_000 ) // IDGenerator helps with generating IDs that neatly fall into namespaces. diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json index ba038803ce..ef20c67b7b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -36,7 +36,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_certificate", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -153,9 +153,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -200,9 +200,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -247,9 +247,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -292,9 +292,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json index 4eba699190..81e6adc129 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -30,7 +30,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_certificate", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -100,9 +100,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json index 53e636c2ab..b6f3b3a93f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -170,7 +170,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json index f73cee01db..443b6c96a8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -49,9 +49,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -143,9 +143,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -190,9 +190,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -235,13 +235,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_certificate", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -253,7 +253,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json index a39e325728..3f7d55696d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -50,13 +50,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_certificate", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "expired.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json index 71796a6985..5a2cbd0fe3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -36,7 +36,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -153,9 +153,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -200,9 +200,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -247,9 +247,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -292,9 +292,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json index 3d92c86bec..1b76ade6f8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -30,7 +30,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -100,9 +100,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json index 60cd02e226..a7a6e8a9e3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -170,7 +170,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json index 8737a8af66..d04e2af562 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -49,9 +49,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -143,9 +143,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -190,9 +190,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -235,13 +235,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -253,7 +253,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json index 31d05799db..ef4b21b060 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -50,13 +50,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "untrusted-root.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json index 75163c0031..c6f737c35a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis.json @@ -6,24 +6,24 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -38,7 +38,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40002 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -49,7 +49,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50002, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -64,9 +64,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -78,7 +78,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -121,9 +121,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40002, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -135,7 +135,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -173,9 +173,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -225,9 +225,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -277,9 +277,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -329,9 +329,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -379,9 +379,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json index b343a20417..30c8801000 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/analysis_classic.json @@ -6,15 +6,15 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -30,7 +30,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40002 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40002, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -105,9 +105,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json index 6a39dd95cd..c56bd67281 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -218,7 +218,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50002 } ], "tcp_connect": [ @@ -234,7 +234,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -248,7 +248,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -267,7 +267,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50001 }, { "network": "tcp", @@ -284,7 +284,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50002 } ], "x_control_request": { @@ -301,10 +301,10 @@ ] }, "tcp_connect": [ - "93.184.216.34:443", - "93.184.216.34:80", "104.154.89.105:443", - "104.154.89.105:80" + "104.154.89.105:80", + "93.184.216.34:443", + "93.184.216.34:80" ], "x_quic_enabled": false }, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json index e247d5ae60..13a46f8ca7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,52 +260,47 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, - "Type": 3, - "Failure": "", - "TransactionID": 40001, + "Type": 2, + "Failure": "ssl_unknown_authority", + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, "DNSEngine": null, "DNSResolvedAddrs": [ - "93.184.216.34" + "104.154.89.105" ], "IPAddressOrigin": "dns", - "IPAddress": "93.184.216.34", - "IPAddressASN": 15133, + "IPAddress": "104.154.89.105", + "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "93.184.216.34:443", + "EndpointAddress": "104.154.89.105:443", "TCPConnectFailure": "", - "TLSHandshakeFailure": "", + "TLSHandshakeFailure": "ssl_unknown_authority", "TLSServerName": "www.example.com", - "HTTPRequestURL": "https://www.example.com/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 200, - "HTTPResponseBodyLength": 1533, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Content-Type": true, - "Date": true - }, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, - "HTTPResponseTitle": "Default Web Page", - "HTTPResponseIsFinal": true, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "www.example.com", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ "93.184.216.34" ], "ControlTCPConnectFailure": "", - "ControlTLSHandshakeFailure": "", + "ControlTLSHandshakeFailure": "ssl_unknown_authority", "ControlHTTPFailure": "", "ControlHTTPResponseStatusCode": 200, "ControlHTTPResponseBodyLength": 1533, @@ -317,47 +312,52 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, - "Type": 2, - "Failure": "ssl_unknown_authority", - "TransactionID": 40002, + "Type": 3, + "Failure": "", + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, "DNSEngine": null, "DNSResolvedAddrs": [ - "104.154.89.105" + "93.184.216.34" ], "IPAddressOrigin": "dns", - "IPAddress": "104.154.89.105", - "IPAddressASN": 396982, + "IPAddress": "93.184.216.34", + "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "104.154.89.105:443", + "EndpointAddress": "93.184.216.34:443", "TCPConnectFailure": "", - "TLSHandshakeFailure": "ssl_unknown_authority", + "TLSHandshakeFailure": "", "TLSServerName": "www.example.com", - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, + "HTTPRequestURL": "https://www.example.com/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 200, + "HTTPResponseBodyLength": 1533, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Content-Type": true, + "Date": true + }, "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPResponseTitle": "Default Web Page", + "HTTPResponseIsFinal": true, "ControlDNSDomain": "www.example.com", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ "93.184.216.34" ], "ControlTCPConnectFailure": "", - "ControlTLSHandshakeFailure": "ssl_unknown_authority", + "ControlTLSHandshakeFailure": "", "ControlHTTPFailure": "", "ControlHTTPResponseStatusCode": 200, "ControlHTTPResponseBodyLength": 1533, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json index d77a840bba..cf1067e799 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40002": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_unknown_authority", - "TransactionID": 40002, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json index db99c74fbb..8367adfec7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -36,7 +36,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_hostname", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -153,9 +153,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -200,9 +200,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -247,9 +247,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -292,9 +292,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json index 0c471d217b..cdee2d9ea7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -30,7 +30,7 @@ "TCPConnectUnexplainedFailureDuringWebFetch": [], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailure": [], "TLSHandshakeUnexpectedFailureDuringWebFetch": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_hostname", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", @@ -100,9 +100,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json index 88e8b1962f..24ef760f08 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -170,7 +170,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json index f79c7c79f2..19dd332708 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -49,9 +49,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -143,9 +143,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -190,9 +190,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -235,13 +235,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_hostname", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -253,7 +253,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json index da03276d14..71a3802e1d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -50,13 +50,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "ssl_invalid_hostname", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "wrong.host.badssl.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "104.154.89.105", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.154.89.105:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis.json index e613dd7a33..99ed900e0e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -47,7 +47,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 0.18180740037950663, "HTTPFinalResponseDiffStatusCodeMatch": false, "HTTPFinalResponseDiffTitleDifferentLongWords": { @@ -65,9 +65,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -79,7 +79,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "104.16.132.229:80", @@ -137,9 +137,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -151,7 +151,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.16.132.229:443", @@ -197,9 +197,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -257,9 +257,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -317,9 +317,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -377,9 +377,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -435,9 +435,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis_classic.json index b2bdbd3574..7906c8a60b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -41,7 +41,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 0.18180740037950663, "HTTPFinalResponseDiffStatusCodeMatch": false, "HTTPFinalResponseDiffTitleDifferentLongWords": { @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "104.16.132.229:80", @@ -131,9 +131,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json index b3fee19e3e..f3775d2225 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -252,7 +252,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -268,7 +268,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "104.16.132.229", @@ -282,7 +282,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -301,7 +301,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations.json index 98dabc3bc8..4201696d41 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -62,9 +62,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -122,9 +122,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -182,9 +182,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -242,9 +242,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -300,13 +300,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -318,7 +318,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "104.16.132.229:80", @@ -372,13 +372,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -390,7 +390,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.16.132.229:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations_classic.json index 6fbeec6e05..2112a484b0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -63,13 +63,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -81,7 +81,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "104.16.132.229:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis.json index 2aa9f5ca8d..b171ff637a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -45,7 +45,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 0.18180740037950663, @@ -65,9 +65,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -79,7 +79,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.16.132.229:443", @@ -137,9 +137,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -197,9 +197,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -257,9 +257,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -317,9 +317,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -375,9 +375,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis_classic.json index b13c1dcd18..0cff6b737a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,7 +40,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 0.18180740037950663, @@ -60,9 +60,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -74,7 +74,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.16.132.229:443", @@ -132,9 +132,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json index 517dc4f7e5..78da5967ef 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -253,7 +253,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -269,7 +269,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -288,7 +288,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations.json index bcbf15e789..04ed110f8d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -62,9 +62,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -122,9 +122,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -182,9 +182,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -242,9 +242,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -300,13 +300,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -318,7 +318,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.16.132.229:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations_classic.json index 7b2ea4d3e7..4af1387988 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -63,13 +63,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.cloudflare-cache.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -81,7 +81,7 @@ "IPAddress": "104.16.132.229", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "104.16.132.229:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json index 00785aadcc..a900a670f6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis.json @@ -1,13 +1,13 @@ { "ControlExpectations": null, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], @@ -33,7 +33,7 @@ "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], - "HTTPFinalResponseSuccessTLSWithoutControl": 40001, + "HTTPFinalResponseSuccessTLSWithoutControl": 50001, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, @@ -46,9 +46,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -60,7 +60,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -141,9 +141,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -186,9 +186,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -231,9 +231,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -274,9 +274,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json index cebe33cb8e..e487c3dd89 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/analysis_classic.json @@ -1,11 +1,11 @@ { "ControlExpectations": null, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], @@ -31,7 +31,7 @@ "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], - "HTTPFinalResponseSuccessTLSWithoutControl": 40001, + "HTTPFinalResponseSuccessTLSWithoutControl": 50001, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, @@ -44,9 +44,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -58,7 +58,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -94,9 +94,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json index 884110f425..f6ff03bc91 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -218,7 +218,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -234,7 +234,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -253,7 +253,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json index 7b81d02170..91691874b2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -92,9 +92,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -137,9 +137,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -182,9 +182,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -225,13 +225,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -243,7 +243,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json index 750bd53b25..334a4b9129 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -48,13 +48,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -66,7 +66,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json index 645d6ebb46..fcecb3a928 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis.json @@ -1,13 +1,13 @@ { "ControlExpectations": null, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], @@ -35,7 +35,7 @@ "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, - "HTTPFinalResponseSuccessTCPWithoutControl": 30001, + "HTTPFinalResponseSuccessTCPWithoutControl": 40001, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": null, "HTTPFinalResponseDiffStatusCodeMatch": null, @@ -46,9 +46,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -60,7 +60,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -110,7 +110,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -141,9 +141,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -186,9 +186,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -231,9 +231,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -276,9 +276,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -319,9 +319,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json index a4fcd48c74..d6186f50d2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/analysis_classic.json @@ -1,7 +1,7 @@ { "ControlExpectations": null, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], @@ -31,7 +31,7 @@ "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, - "HTTPFinalResponseSuccessTCPWithoutControl": 30001, + "HTTPFinalResponseSuccessTCPWithoutControl": 40001, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": null, "HTTPFinalResponseDiffStatusCodeMatch": null, @@ -42,9 +42,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -56,7 +56,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -92,9 +92,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json index 20c7a19ad6..28dcd54f39 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -217,7 +217,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -233,7 +233,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -247,7 +247,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -266,7 +266,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json index 958e3001c9..7c24a2384d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -92,9 +92,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -137,9 +137,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -182,9 +182,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -225,13 +225,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -243,7 +243,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -275,13 +275,13 @@ "ControlHTTPResponseHeadersKeys": null, "ControlHTTPResponseTitle": null }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -293,7 +293,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json index fc95b0c023..36145a2ca1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -48,13 +48,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -66,7 +66,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json index 8d0657a1d0..cdc2d2c7fe 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [ - 1 + 10001 ], "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "android_dns_cache_no_data", @@ -44,7 +44,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -116,9 +116,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -168,9 +168,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -220,9 +220,9 @@ "TagDepth": 0, "Type": 0, "Failure": "android_dns_cache_no_data", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "android_dns_cache_no_data", "DNSQueryType": "ANY", @@ -270,9 +270,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -320,9 +320,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json index 3b3e34bf76..6815bd24cb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/analysis_classic.json @@ -12,7 +12,7 @@ "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [ - 1 + 10001 ], "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "android_dns_cache_no_data", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "android_dns_cache_no_data", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "android_dns_cache_no_data", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json index 79fce0f34b..5dc5b8dacd 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -88,7 +88,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -111,7 +111,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -126,7 +126,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -210,7 +210,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -226,7 +226,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -245,7 +245,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json index ca8aeb69f3..b76a138812 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "android_dns_cache_no_data", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "android_dns_cache_no_data", "DNSQueryType": "ANY", @@ -104,9 +104,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -208,9 +208,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -258,13 +258,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -276,7 +276,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json index 13212e3f20..ca70e0d9d2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/observations_classic.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "android_dns_cache_no_data", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "android_dns_cache_no_data", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json index e025e10042..d378b4f810 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis.json @@ -6,26 +6,26 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -49,7 +49,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40002, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -64,9 +64,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -78,7 +78,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -121,9 +121,9 @@ "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -135,7 +135,7 @@ "IPAddress": "10.10.34.35", "IPAddressASN": null, "IPAddressBogon": true, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "10.10.34.35:443", @@ -173,9 +173,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -225,9 +225,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -277,9 +277,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -329,9 +329,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -379,9 +379,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json index 32e98cf41d..c3296021d2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "10.10.34.35", "IPAddressASN": null, "IPAddressBogon": true, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "10.10.34.35:443", @@ -105,9 +105,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json index 3365825f2d..be429c6d34 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -94,7 +94,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -117,7 +117,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -132,7 +132,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -216,7 +216,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -232,7 +232,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50002 }, { "ip": "93.184.216.34", @@ -246,7 +246,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -265,7 +265,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50001 } ], "x_control_request": { @@ -282,10 +282,10 @@ ] }, "tcp_connect": [ - "10.10.34.35:443", - "10.10.34.35:80", "93.184.216.34:443", - "93.184.216.34:80" + "93.184.216.34:80", + "10.10.34.35:443", + "10.10.34.35:80" ], "x_quic_enabled": false }, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json index 285426fe95..d08e4f46ef 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,47 +260,52 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, - "Type": 1, - "Failure": "generic_timeout_error", - "TransactionID": 40001, + "Type": 3, + "Failure": "", + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, "DNSEngine": null, "DNSResolvedAddrs": [ - "10.10.34.35" + "93.184.216.34" ], "IPAddressOrigin": "dns", - "IPAddress": "10.10.34.35", - "IPAddressASN": null, - "IPAddressBogon": true, - "EndpointTransactionID": 40001, + "IPAddress": "93.184.216.34", + "IPAddressASN": 15133, + "IPAddressBogon": false, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "10.10.34.35:443", - "TCPConnectFailure": "generic_timeout_error", - "TLSHandshakeFailure": null, - "TLSServerName": null, - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, + "EndpointAddress": "93.184.216.34:443", + "TCPConnectFailure": "", + "TLSHandshakeFailure": "", + "TLSServerName": "www.example.com", + "HTTPRequestURL": "https://www.example.com/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 200, + "HTTPResponseBodyLength": 1533, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Content-Type": true, + "Date": true + }, "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPResponseTitle": "Default Web Page", + "HTTPResponseIsFinal": true, "ControlDNSDomain": "www.example.com", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ "93.184.216.34" ], - "ControlTCPConnectFailure": null, - "ControlTLSHandshakeFailure": null, + "ControlTCPConnectFailure": "", + "ControlTLSHandshakeFailure": "", "ControlHTTPFailure": "", "ControlHTTPResponseStatusCode": 200, "ControlHTTPResponseBodyLength": 1533, @@ -312,52 +317,47 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, - "Type": 3, - "Failure": "", - "TransactionID": 40002, + "Type": 1, + "Failure": "generic_timeout_error", + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, "DNSEngine": null, "DNSResolvedAddrs": [ - "93.184.216.34" + "10.10.34.35" ], "IPAddressOrigin": "dns", - "IPAddress": "93.184.216.34", - "IPAddressASN": 15133, - "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "IPAddress": "10.10.34.35", + "IPAddressASN": null, + "IPAddressBogon": true, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "93.184.216.34:443", - "TCPConnectFailure": "", - "TLSHandshakeFailure": "", - "TLSServerName": "www.example.com", - "HTTPRequestURL": "https://www.example.com/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 200, - "HTTPResponseBodyLength": 1533, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Content-Type": true, - "Date": true - }, + "EndpointAddress": "10.10.34.35:443", + "TCPConnectFailure": "generic_timeout_error", + "TLSHandshakeFailure": null, + "TLSServerName": null, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, - "HTTPResponseTitle": "Default Web Page", - "HTTPResponseIsFinal": true, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "www.example.com", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ "93.184.216.34" ], - "ControlTCPConnectFailure": "", - "ControlTLSHandshakeFailure": "", + "ControlTCPConnectFailure": null, + "ControlTLSHandshakeFailure": null, "ControlHTTPFailure": "", "ControlHTTPResponseStatusCode": 200, "ControlHTTPResponseBodyLength": 1533, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json index 86846c9455..fc76634ce0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50002": { "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "10.10.34.35", "IPAddressASN": null, "IPAddressBogon": true, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "10.10.34.35:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json index 14adfea97c..53346760b1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [ - 1 + 10001 ], "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "dns_nxdomain_error", @@ -44,7 +44,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -116,9 +116,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -168,9 +168,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -220,9 +220,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -270,9 +270,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -320,9 +320,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json index 2bc5b12b68..2e140d7396 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/analysis_classic.json @@ -12,7 +12,7 @@ "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [ - 1 + 10001 ], "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "dns_nxdomain_error", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json index 50f28aaf1a..121a2dec5a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -88,7 +88,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -111,7 +111,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -126,7 +126,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -210,7 +210,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -226,7 +226,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -245,7 +245,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json index 935f432769..78dc2efdef 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", @@ -104,9 +104,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -208,9 +208,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -258,13 +258,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -276,7 +276,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json index f5bf6dec27..d381056e20 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/observations_classic.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis.json index f9a1f3932f..20dacdf372 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis.json @@ -6,27 +6,27 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -52,7 +52,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30002, + "HTTPFinalResponseSuccessTCPWithControl": 40002, "HTTPFinalResponseDiffBodyProportionFactor": 1, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -65,9 +65,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -79,7 +79,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -122,9 +122,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -136,7 +136,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -174,9 +174,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -226,9 +226,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -278,9 +278,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -330,9 +330,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -380,9 +380,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis_classic.json index 1ce4ae275b..ad13b49b96 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json index 2bb28341de..5dffdc4c8d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -94,7 +94,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -115,7 +115,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -130,7 +130,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -213,7 +213,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 } ], "tcp_connect": [ @@ -229,7 +229,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 }, { "ip": "93.184.216.34", @@ -243,7 +243,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -262,7 +262,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations.json index 97935229f8..9d7c07d57b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30002": { + "40002": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -317,13 +317,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -335,7 +335,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations_classic.json index 997432536b..da21fed444 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis.json index 87c0d9d2a1..73a9c30a04 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis.json @@ -6,27 +6,27 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -50,7 +50,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40002, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -65,9 +65,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -79,7 +79,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -122,9 +122,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -174,9 +174,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -226,9 +226,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -278,9 +278,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -328,9 +328,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis_classic.json index 1ce4ae275b..ad13b49b96 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json index 7f17dff9aa..60fe76582d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -94,7 +94,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -115,7 +115,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -130,7 +130,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -214,7 +214,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -230,7 +230,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -249,7 +249,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50001 } ], "x_control_request": { @@ -266,10 +266,10 @@ ] }, "tcp_connect": [ - "127.0.0.1:443", - "127.0.0.1:80", "93.184.216.34:443", - "93.184.216.34:80" + "93.184.216.34:80", + "127.0.0.1:443", + "127.0.0.1:80" ], "x_quic_enabled": false }, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations.json index f5a8ffc0a1..5ea657757c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40002": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations_classic.json index 997432536b..da21fed444 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json index da2a66e888..a6a9b8b806 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis.json @@ -6,24 +6,24 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 10001 + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -47,7 +47,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -62,9 +62,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -76,7 +76,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -119,9 +119,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -133,7 +133,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -171,9 +171,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -223,9 +223,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -275,9 +275,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -327,9 +327,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -377,9 +377,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json index 94efc140ec..da2a2e0d0a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/analysis_classic.json @@ -6,15 +6,15 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -39,7 +39,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json index 7256e5864d..ac9f835eae 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -218,7 +218,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -234,7 +234,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -248,7 +248,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -267,7 +267,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -284,7 +284,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json index d9dbce6961..ffe51290ed 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -317,13 +317,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -335,7 +335,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json index 38fb243bae..26657855e4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json index 3d6aaaae1d..2e9d1408ce 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis.json @@ -6,24 +6,24 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 10001 + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -49,7 +49,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 1, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -61,9 +61,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -131,7 +131,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -169,9 +169,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -183,7 +183,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -221,9 +221,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -235,7 +235,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -273,9 +273,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -325,9 +325,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -377,9 +377,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -429,9 +429,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -479,9 +479,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json index 688d95364c..d676b492e8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/analysis_classic.json @@ -6,15 +6,15 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -41,7 +41,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 1, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", @@ -109,9 +109,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json index a70fbacb51..dbf72c1f64 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -212,7 +212,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -228,7 +228,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "130.192.182.17", @@ -242,7 +242,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -256,7 +256,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 }, { "ip": "93.184.216.34", @@ -270,7 +270,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -289,7 +289,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -306,7 +306,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json index 7b24cafc11..5c3b5dd018 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", @@ -316,13 +316,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -334,7 +334,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -368,13 +368,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -386,7 +386,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -420,13 +420,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -438,7 +438,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json index a8fd9014ac..e0eec7db9b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis.json index 83f7e815eb..2e874296ae 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis.json @@ -4,8 +4,8 @@ "FinalResponseFailure": "dns_lookup_error" }, "DNSLookupSuccess": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], @@ -18,7 +18,7 @@ "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], @@ -38,7 +38,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": null, "HTTPFinalResponseDiffStatusCodeMatch": null, "HTTPFinalResponseDiffTitleDifferentLongWords": null, @@ -48,9 +48,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -62,7 +62,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", @@ -97,9 +97,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -111,7 +111,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", @@ -142,9 +142,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -187,9 +187,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -232,9 +232,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -275,9 +275,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -318,9 +318,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis_classic.json index eee5bc5e2e..aeac800b98 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/analysis_classic.json @@ -4,7 +4,7 @@ "FinalResponseFailure": "dns_lookup_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], @@ -35,7 +35,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": null, "HTTPFinalResponseDiffStatusCodeMatch": null, "HTTPFinalResponseDiffTitleDifferentLongWords": null, @@ -45,9 +45,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -59,7 +59,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", @@ -94,9 +94,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json index bbec2f2407..20c6da3fbc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json @@ -51,7 +51,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -67,7 +67,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -90,7 +90,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -113,7 +113,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -128,7 +128,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -206,7 +206,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -222,7 +222,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "83.224.65.41", @@ -236,7 +236,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations.json index ce81b05e38..fe7e8f6cfe 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -90,9 +90,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -135,9 +135,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -180,9 +180,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -223,13 +223,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -241,7 +241,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", @@ -272,13 +272,13 @@ "ControlHTTPResponseHeadersKeys": null, "ControlHTTPResponseTitle": null }, - "40001": { + "50001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -290,7 +290,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations_classic.json index 4ac617a4e4..669c1ecb1d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -48,13 +48,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -66,7 +66,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis.json index 2d5bf8e830..8a2725fa9d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis.json @@ -4,8 +4,8 @@ "FinalResponseFailure": "dns_lookup_error" }, "DNSLookupSuccess": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], @@ -18,7 +18,7 @@ "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], @@ -48,9 +48,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -62,7 +62,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", @@ -93,9 +93,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -138,9 +138,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -183,9 +183,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -226,9 +226,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -269,9 +269,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis_classic.json index e95b86477c..399de96a4a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/analysis_classic.json @@ -4,7 +4,7 @@ "FinalResponseFailure": "dns_lookup_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [], @@ -17,7 +17,7 @@ "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -61,7 +61,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", @@ -92,9 +92,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json index 17863914f1..f5776326db 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json @@ -51,7 +51,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -67,7 +67,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -90,7 +90,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -113,7 +113,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -128,7 +128,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -145,7 +145,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations.json index b695716d06..d439e1316e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -90,9 +90,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -135,9 +135,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -180,9 +180,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -223,13 +223,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -241,7 +241,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations_classic.json index ddccceb09a..2aa32c50ab 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -48,13 +48,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "itsat.info", "DNSLookupFailure": "", "DNSQueryType": null, @@ -66,7 +66,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json index a9e51f01ba..4a2d842fbb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -43,7 +43,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -125,7 +125,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -163,9 +163,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -215,9 +215,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -267,9 +267,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -319,9 +319,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -369,9 +369,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json index e6f5fc4686..f887c7b937 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -37,7 +37,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -105,9 +105,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json index ea8064a115..4804338fcb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -195,7 +195,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -211,7 +211,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -225,7 +225,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -244,7 +244,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json index c958587018..009e05f7cf 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -312,13 +312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -330,7 +330,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json index ddb408cb04..8e1d45d33c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json index 40cf630e4e..ba756c6cf9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -47,7 +47,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 0.12263535551206783, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": { @@ -61,9 +61,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -113,9 +113,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -127,7 +127,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -165,9 +165,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -217,9 +217,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -269,9 +269,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -321,9 +321,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -371,9 +371,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json index 9547233a64..e304520555 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -41,7 +41,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 0.12263535551206783, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": { @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -107,9 +107,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json index ea89c0796e..42bbdfef82 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -195,7 +195,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -211,7 +211,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -225,7 +225,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -244,7 +244,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json index e4719611f7..e8c1faaf0b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -312,13 +312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -330,7 +330,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json index 5831a09c56..e8be87b681 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json index 03fd97859b..c822187e24 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis.json @@ -6,24 +6,24 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 10001 + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -49,7 +49,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 0.12263535551206783, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": { @@ -63,9 +63,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -77,7 +77,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", @@ -115,9 +115,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -129,7 +129,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -167,9 +167,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -181,7 +181,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -219,9 +219,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -233,7 +233,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -271,9 +271,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -323,9 +323,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -375,9 +375,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -427,9 +427,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -477,9 +477,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json index 149feaf9cf..f2c473f77b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/analysis_classic.json @@ -6,15 +6,15 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -41,7 +41,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 0.12263535551206783, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": { @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", @@ -107,9 +107,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json index 434b3e046b..32c6615b5a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -195,7 +195,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -211,7 +211,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "130.192.182.17", @@ -225,7 +225,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -239,7 +239,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 }, { "ip": "93.184.216.34", @@ -253,7 +253,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -272,7 +272,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -289,7 +289,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json index 628c22d886..4344951134 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", @@ -312,13 +312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -330,7 +330,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -364,13 +364,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -382,7 +382,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -416,13 +416,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -434,7 +434,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json index 811217cd05..b790594243 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "130.192.182.17:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis.json index 09a68521d8..de8fb17782 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis.json @@ -9,22 +9,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -48,7 +48,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40009, + "HTTPFinalResponseSuccessTLSWithControl": 50010, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -63,9 +63,9 @@ "TagDepth": 2, "Type": 3, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -77,13 +77,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -126,9 +126,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -140,13 +140,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -184,9 +184,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -198,13 +198,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -242,9 +242,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -259,7 +259,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.88:443", @@ -300,9 +300,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -353,9 +353,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -406,9 +406,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -459,9 +459,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -512,9 +512,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -565,9 +565,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -618,9 +618,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -671,9 +671,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -724,9 +724,9 @@ "TagDepth": 2, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -772,9 +772,9 @@ "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -786,13 +786,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -835,9 +835,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -849,13 +849,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -893,9 +893,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -907,13 +907,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -951,9 +951,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -965,13 +965,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -1009,9 +1009,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1062,9 +1062,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1115,9 +1115,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1168,9 +1168,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1221,9 +1221,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1274,9 +1274,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1327,9 +1327,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1380,9 +1380,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1433,9 +1433,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -1481,9 +1481,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1495,13 +1495,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.77:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1544,9 +1544,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40004, + "TransactionID": 50004, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1558,13 +1558,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40004, + "EndpointTransactionID": 50004, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1602,9 +1602,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40003, + "TransactionID": 50003, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1616,13 +1616,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40003, + "EndpointTransactionID": 50003, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1660,9 +1660,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1674,13 +1674,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1718,9 +1718,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1732,13 +1732,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1776,9 +1776,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1790,13 +1790,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.88:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1834,9 +1834,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1848,13 +1848,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "77.88.55.77:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1892,9 +1892,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1906,13 +1906,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.88:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1950,9 +1950,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2008,9 +2008,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2066,9 +2066,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2124,9 +2124,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2182,9 +2182,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2240,9 +2240,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2298,9 +2298,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2356,9 +2356,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2414,9 +2414,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2472,9 +2472,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2530,9 +2530,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2588,9 +2588,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2646,9 +2646,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -2699,9 +2699,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis_classic.json index 800dbceb28..47f1b0b98b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/analysis_classic.json @@ -9,17 +9,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -43,7 +43,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40009, + "HTTPFinalResponseSuccessTLSWithControl": 50010, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -58,9 +58,9 @@ "TagDepth": 2, "Type": 3, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -72,13 +72,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -121,9 +121,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -135,13 +135,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -179,9 +179,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -193,13 +193,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -237,9 +237,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -254,7 +254,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.88:443", @@ -295,9 +295,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -348,9 +348,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -401,9 +401,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -454,9 +454,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -507,9 +507,9 @@ "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -521,13 +521,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -570,9 +570,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -584,13 +584,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -628,9 +628,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -642,13 +642,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -686,9 +686,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -700,13 +700,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -744,9 +744,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -797,9 +797,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -850,9 +850,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -903,9 +903,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -956,9 +956,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -970,13 +970,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.77:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1019,9 +1019,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1033,13 +1033,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.88:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1077,9 +1077,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1091,13 +1091,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "77.88.55.77:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1135,9 +1135,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1149,13 +1149,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.88:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1193,9 +1193,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1251,9 +1251,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1309,9 +1309,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1367,9 +1367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json index 471e82ef91..e496698add 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json @@ -79,7 +79,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -94,7 +94,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -138,7 +138,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -182,7 +182,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -226,7 +226,7 @@ "tags": [ "depth=2" ], - "transaction_id": 3 + "transaction_id": 10003 }, { "answers": [ @@ -270,7 +270,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -285,7 +285,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -329,7 +329,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -344,7 +344,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": [ @@ -388,7 +388,7 @@ "tags": [ "depth=2" ], - "transaction_id": 10003 + "transaction_id": 20003 }, { "answers": null, @@ -403,13 +403,13 @@ "tags": [ "depth=2" ], - "transaction_id": 10003 + "transaction_id": 20003 } ], "requests": [ { "network": "tcp", - "address": "5.255.255.80:443", + "address": "77.88.55.77:443", "alpn": "http/1.1", "failure": null, "request": { @@ -487,11 +487,11 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40009 + "transaction_id": 50010 }, { "network": "tcp", - "address": "5.255.255.88:443", + "address": "5.255.255.80:443", "alpn": "http/1.1", "failure": null, "request": { @@ -569,11 +569,11 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40008 + "transaction_id": 50008 }, { "network": "tcp", - "address": "77.88.55.77:80", + "address": "5.255.255.80:80", "failure": null, "request": { "body": "", @@ -650,7 +650,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30004 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -666,7 +666,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40001 }, { "ip": "5.255.255.80", @@ -680,7 +680,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50001 }, { "ip": "5.255.255.80", @@ -694,7 +694,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40007 + "transaction_id": 50008 }, { "ip": "5.255.255.80", @@ -708,7 +708,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40009 + "transaction_id": 50012 }, { "ip": "5.255.255.88", @@ -722,7 +722,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30003 + "transaction_id": 40002 }, { "ip": "5.255.255.88", @@ -736,7 +736,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40003 + "transaction_id": 50002 }, { "ip": "5.255.255.88", @@ -750,7 +750,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40008 + "transaction_id": 50005 }, { "ip": "5.255.255.88", @@ -764,7 +764,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40010 + "transaction_id": 50009 }, { "ip": "77.88.55.77", @@ -778,7 +778,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30004 + "transaction_id": 40003 }, { "ip": "77.88.55.77", @@ -792,7 +792,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40004 + "transaction_id": 50003 }, { "ip": "77.88.55.77", @@ -806,7 +806,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40005 + "transaction_id": 50006 }, { "ip": "77.88.55.77", @@ -820,7 +820,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40011 + "transaction_id": 50010 }, { "ip": "77.88.55.80", @@ -834,7 +834,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40004 }, { "ip": "77.88.55.80", @@ -848,7 +848,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50004 }, { "ip": "77.88.55.80", @@ -862,7 +862,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40006 + "transaction_id": 50007 }, { "ip": "77.88.55.80", @@ -876,7 +876,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40012 + "transaction_id": 50011 } ], "tls_handshakes": [ @@ -895,7 +895,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50001 }, { "network": "tcp", @@ -912,7 +912,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40007 + "transaction_id": 50008 }, { "network": "tcp", @@ -929,7 +929,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40009 + "transaction_id": 50012 }, { "network": "tcp", @@ -946,7 +946,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40003 + "transaction_id": 50002 }, { "network": "tcp", @@ -963,7 +963,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40008 + "transaction_id": 50005 }, { "network": "tcp", @@ -980,7 +980,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40010 + "transaction_id": 50009 }, { "network": "tcp", @@ -997,7 +997,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40004 + "transaction_id": 50003 }, { "network": "tcp", @@ -1014,7 +1014,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40005 + "transaction_id": 50006 }, { "network": "tcp", @@ -1031,7 +1031,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40011 + "transaction_id": 50010 }, { "network": "tcp", @@ -1048,7 +1048,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50004 }, { "network": "tcp", @@ -1065,7 +1065,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40006 + "transaction_id": 50007 }, { "network": "tcp", @@ -1082,7 +1082,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40012 + "transaction_id": 50011 } ], "x_control_request": { @@ -1099,14 +1099,14 @@ ] }, "tcp_connect": [ - "77.88.55.80:443", - "77.88.55.80:80", "5.255.255.80:443", "5.255.255.80:80", "5.255.255.88:443", "5.255.255.88:80", "77.88.55.77:443", - "77.88.55.77:80" + "77.88.55.77:80", + "77.88.55.80:443", + "77.88.55.80:80" ], "x_quic_enabled": false }, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations.json index a34a8c1834..031c830e62 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -57,9 +57,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -110,9 +110,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -158,9 +158,9 @@ "TagDepth": 2, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -208,9 +208,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -266,9 +266,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -324,9 +324,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -382,9 +382,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -440,9 +440,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -498,9 +498,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -556,9 +556,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -614,9 +614,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -672,9 +672,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -725,9 +725,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -778,9 +778,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -831,9 +831,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -884,9 +884,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -937,9 +937,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -990,9 +990,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1043,9 +1043,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1096,9 +1096,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1154,9 +1154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1212,9 +1212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1270,9 +1270,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1328,9 +1328,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1381,9 +1381,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1434,9 +1434,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1487,9 +1487,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1540,9 +1540,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1593,9 +1593,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1646,9 +1646,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1699,9 +1699,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1750,13 +1750,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, - "Type": 1, + "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1768,25 +1768,30 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, - "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 308, + "HTTPResponseBodyLength": 0, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Date": true, + "Location": true + }, + "HTTPResponseLocation": "https://yandex.com/", + "HTTPResponseTitle": "", + "HTTPResponseIsFinal": false, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -1808,13 +1813,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1826,13 +1831,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "5.255.255.88:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1866,13 +1871,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30003": { + "40003": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1884,13 +1889,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.88:80", + "EndpointAddress": "77.88.55.77:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1924,13 +1929,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30004": { + "40004": { "TagDepth": 0, - "Type": 3, + "Type": 1, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1942,30 +1947,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.77:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 308, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Date": true, - "Location": true - }, - "HTTPResponseLocation": "https://yandex.com/", - "HTTPResponseTitle": "", - "HTTPResponseIsFinal": false, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, + "HTTPResponseLocation": null, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -1987,13 +1987,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2005,13 +2005,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2045,13 +2045,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2063,13 +2063,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2103,13 +2103,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40003": { + "50003": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40003, + "TransactionID": 50003, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2121,13 +2121,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40003, + "EndpointTransactionID": 50003, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2161,13 +2161,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40004": { + "50004": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40004, + "TransactionID": 50004, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2179,13 +2179,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40004, + "EndpointTransactionID": 50004, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2219,13 +2219,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40005": { + "50005": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2237,13 +2237,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -2277,13 +2277,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40006": { + "50006": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2295,13 +2295,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -2335,13 +2335,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40007": { + "50007": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2353,13 +2353,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -2393,13 +2393,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40008": { + "50008": { "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2411,13 +2411,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -2456,13 +2456,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40009": { + "50009": { "TagDepth": 2, - "Type": 3, + "Type": 2, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2474,30 +2474,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", - "HTTPRequestURL": "https://ya.ru/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 200, - "HTTPResponseBodyLength": 1533, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Content-Type": true, - "Date": true - }, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, - "HTTPResponseTitle": "Default Web Page", - "HTTPResponseIsFinal": true, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -2519,13 +2514,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40010": { + "50010": { "TagDepth": 2, - "Type": 2, + "Type": 3, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2537,25 +2532,30 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, + "HTTPRequestURL": "https://ya.ru/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 200, + "HTTPResponseBodyLength": 1533, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Content-Type": true, + "Date": true + }, "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPResponseTitle": "Default Web Page", + "HTTPResponseIsFinal": true, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -2577,13 +2577,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40011": { + "50011": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2595,13 +2595,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -2635,13 +2635,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40012": { + "50012": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2653,13 +2653,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations_classic.json index b7f2902adb..a1d6cebb87 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -63,9 +63,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -121,9 +121,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -179,9 +179,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -237,9 +237,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -290,9 +290,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -343,9 +343,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -396,9 +396,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -449,9 +449,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -502,9 +502,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -555,9 +555,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -608,9 +608,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -659,13 +659,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, - "Type": 1, + "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -677,25 +677,30 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, - "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 308, + "HTTPResponseBodyLength": 0, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Date": true, + "Location": true + }, + "HTTPResponseLocation": "https://yandex.com/", + "HTTPResponseTitle": "", + "HTTPResponseIsFinal": false, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -717,13 +722,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -735,13 +740,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "5.255.255.88:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -775,13 +780,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30003": { + "40003": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -793,13 +798,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.88:80", + "EndpointAddress": "77.88.55.77:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -833,13 +838,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30004": { + "40004": { "TagDepth": 0, - "Type": 3, + "Type": 1, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -851,30 +856,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.77:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 308, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Date": true, - "Location": true - }, - "HTTPResponseLocation": "https://yandex.com/", - "HTTPResponseTitle": "", - "HTTPResponseIsFinal": false, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, + "HTTPResponseLocation": null, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -896,13 +896,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40005": { + "50005": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -914,13 +914,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -954,13 +954,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40006": { + "50006": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -972,13 +972,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -1012,13 +1012,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40007": { + "50007": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1030,13 +1030,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -1070,13 +1070,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40008": { + "50008": { "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1088,13 +1088,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -1133,13 +1133,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40009": { + "50009": { "TagDepth": 2, - "Type": 3, + "Type": 2, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1151,30 +1151,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", - "HTTPRequestURL": "https://ya.ru/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 200, - "HTTPResponseBodyLength": 1533, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Content-Type": true, - "Date": true - }, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, - "HTTPResponseTitle": "Default Web Page", - "HTTPResponseIsFinal": true, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -1196,13 +1191,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40010": { + "50010": { "TagDepth": 2, - "Type": 2, + "Type": 3, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1214,25 +1209,30 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, + "HTTPRequestURL": "https://ya.ru/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 200, + "HTTPResponseBodyLength": 1533, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Content-Type": true, + "Date": true + }, "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPResponseTitle": "Default Web Page", + "HTTPResponseIsFinal": true, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -1254,13 +1254,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40011": { + "50011": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1272,13 +1272,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -1312,13 +1312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40012": { + "50012": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1330,13 +1330,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis.json index e485f73437..9b4eb9ec27 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis.json @@ -9,22 +9,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -48,7 +48,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40009, + "HTTPFinalResponseSuccessTLSWithControl": 50010, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -63,9 +63,9 @@ "TagDepth": 2, "Type": 3, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -77,13 +77,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -126,9 +126,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -143,7 +143,7 @@ "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.80:443", @@ -184,9 +184,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -201,7 +201,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.77:443", @@ -242,9 +242,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -256,13 +256,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -300,9 +300,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -353,9 +353,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -406,9 +406,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -459,9 +459,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -512,9 +512,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -565,9 +565,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -618,9 +618,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -671,9 +671,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -724,9 +724,9 @@ "TagDepth": 2, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -772,9 +772,9 @@ "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -789,7 +789,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.88:443", @@ -835,9 +835,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -849,13 +849,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -893,9 +893,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -907,13 +907,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -951,9 +951,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -965,13 +965,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -1009,9 +1009,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1062,9 +1062,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1115,9 +1115,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1168,9 +1168,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1221,9 +1221,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1274,9 +1274,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1327,9 +1327,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1380,9 +1380,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1433,9 +1433,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -1481,9 +1481,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1495,13 +1495,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1544,9 +1544,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40004, + "TransactionID": 50004, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1558,13 +1558,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40004, + "EndpointTransactionID": 50004, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1602,9 +1602,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40003, + "TransactionID": 50003, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1616,13 +1616,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40003, + "EndpointTransactionID": 50003, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1660,9 +1660,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1674,13 +1674,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1718,9 +1718,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1732,13 +1732,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -1776,9 +1776,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1793,7 +1793,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "77.88.55.77:80", @@ -1834,9 +1834,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1851,7 +1851,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "5.255.255.88:80", @@ -1892,9 +1892,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1906,13 +1906,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1950,9 +1950,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2008,9 +2008,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2066,9 +2066,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2124,9 +2124,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2182,9 +2182,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2240,9 +2240,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2298,9 +2298,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2356,9 +2356,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -2414,9 +2414,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2472,9 +2472,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2530,9 +2530,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2588,9 +2588,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -2646,9 +2646,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -2699,9 +2699,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis_classic.json index b07cff1a0f..27a1efe27c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/analysis_classic.json @@ -9,17 +9,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -43,7 +43,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40009, + "HTTPFinalResponseSuccessTLSWithControl": 50010, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -58,9 +58,9 @@ "TagDepth": 2, "Type": 3, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -72,13 +72,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -121,9 +121,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -138,7 +138,7 @@ "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.80:443", @@ -179,9 +179,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -196,7 +196,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.77:443", @@ -237,9 +237,9 @@ "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -251,13 +251,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -295,9 +295,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -348,9 +348,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -401,9 +401,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -454,9 +454,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -507,9 +507,9 @@ "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -524,7 +524,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.88:443", @@ -570,9 +570,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -584,13 +584,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -628,9 +628,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -642,13 +642,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -686,9 +686,9 @@ "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -700,13 +700,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -744,9 +744,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -797,9 +797,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -850,9 +850,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -903,9 +903,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -956,9 +956,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -970,13 +970,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1019,9 +1019,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1036,7 +1036,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "77.88.55.77:80", @@ -1077,9 +1077,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1094,7 +1094,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "5.255.255.88:80", @@ -1135,9 +1135,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1149,13 +1149,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1193,9 +1193,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1251,9 +1251,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1309,9 +1309,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1367,9 +1367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json index 77aa9a3262..2de7030556 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json @@ -79,7 +79,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -94,7 +94,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -138,7 +138,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -182,7 +182,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -226,7 +226,7 @@ "tags": [ "depth=2" ], - "transaction_id": 3 + "transaction_id": 10003 }, { "answers": [ @@ -270,7 +270,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -285,7 +285,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -329,7 +329,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -344,7 +344,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": [ @@ -388,7 +388,7 @@ "tags": [ "depth=2" ], - "transaction_id": 10003 + "transaction_id": 20003 }, { "answers": null, @@ -403,13 +403,13 @@ "tags": [ "depth=2" ], - "transaction_id": 10003 + "transaction_id": 20003 } ], "requests": [ { "network": "tcp", - "address": "5.255.255.80:443", + "address": "5.255.255.88:443", "alpn": "http/1.1", "failure": null, "request": { @@ -487,7 +487,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40009 + "transaction_id": 50010 }, { "network": "tcp", @@ -569,11 +569,11 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40006 + "transaction_id": 50007 }, { "network": "tcp", - "address": "5.255.255.80:80", + "address": "77.88.55.80:80", "failure": null, "request": { "body": "", @@ -650,7 +650,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40004 } ], "tcp_connect": [ @@ -666,7 +666,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40001 }, { "ip": "5.255.255.80", @@ -680,7 +680,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50001 }, { "ip": "5.255.255.80", @@ -694,7 +694,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40005 + "transaction_id": 50006 }, { "ip": "5.255.255.80", @@ -708,7 +708,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40009 + "transaction_id": 50009 }, { "ip": "5.255.255.88", @@ -722,7 +722,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30003 + "transaction_id": 40002 }, { "ip": "5.255.255.88", @@ -736,7 +736,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40003 + "transaction_id": 50002 }, { "ip": "5.255.255.88", @@ -750,7 +750,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40006 + "transaction_id": 50007 }, { "ip": "5.255.255.88", @@ -764,7 +764,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40010 + "transaction_id": 50010 }, { "ip": "77.88.55.77", @@ -778,7 +778,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30004 + "transaction_id": 40003 }, { "ip": "77.88.55.77", @@ -792,7 +792,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40004 + "transaction_id": 50003 }, { "ip": "77.88.55.77", @@ -806,7 +806,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40007 + "transaction_id": 50008 }, { "ip": "77.88.55.77", @@ -820,7 +820,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40011 + "transaction_id": 50011 }, { "ip": "77.88.55.80", @@ -834,7 +834,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40004 }, { "ip": "77.88.55.80", @@ -848,7 +848,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50004 }, { "ip": "77.88.55.80", @@ -862,7 +862,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40008 + "transaction_id": 50005 }, { "ip": "77.88.55.80", @@ -876,7 +876,7 @@ "depth=2", "fetch_body=true" ], - "transaction_id": 40012 + "transaction_id": 50012 } ], "tls_handshakes": [ @@ -895,7 +895,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50001 }, { "network": "tcp", @@ -912,7 +912,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40005 + "transaction_id": 50006 }, { "network": "tcp", @@ -929,7 +929,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40009 + "transaction_id": 50009 }, { "network": "tcp", @@ -946,7 +946,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40003 + "transaction_id": 50002 }, { "network": "tcp", @@ -963,7 +963,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40006 + "transaction_id": 50007 }, { "network": "tcp", @@ -980,7 +980,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40010 + "transaction_id": 50010 }, { "network": "tcp", @@ -997,7 +997,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40004 + "transaction_id": 50003 }, { "network": "tcp", @@ -1014,7 +1014,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40007 + "transaction_id": 50008 }, { "network": "tcp", @@ -1031,7 +1031,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40011 + "transaction_id": 50011 }, { "network": "tcp", @@ -1048,7 +1048,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50004 }, { "network": "tcp", @@ -1065,7 +1065,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40008 + "transaction_id": 50005 }, { "network": "tcp", @@ -1082,7 +1082,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40012 + "transaction_id": 50012 } ], "x_control_request": { @@ -1099,14 +1099,14 @@ ] }, "tcp_connect": [ - "77.88.55.80:443", - "77.88.55.80:80", "5.255.255.80:443", "5.255.255.80:80", "5.255.255.88:443", "5.255.255.88:80", "77.88.55.77:443", - "77.88.55.77:80" + "77.88.55.77:80", + "77.88.55.80:443", + "77.88.55.80:80" ], "x_quic_enabled": false }, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations.json index 400f0f6f82..513e1f2f0d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -57,9 +57,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -110,9 +110,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -158,9 +158,9 @@ "TagDepth": 2, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -208,9 +208,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -266,9 +266,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -324,9 +324,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -382,9 +382,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -440,9 +440,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -498,9 +498,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -556,9 +556,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -614,9 +614,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -672,9 +672,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -725,9 +725,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -778,9 +778,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -831,9 +831,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -884,9 +884,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -937,9 +937,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -990,9 +990,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1043,9 +1043,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -1096,9 +1096,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1154,9 +1154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1212,9 +1212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1270,9 +1270,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1328,9 +1328,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1381,9 +1381,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1434,9 +1434,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1487,9 +1487,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1540,9 +1540,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1593,9 +1593,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1646,9 +1646,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1699,9 +1699,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 10003, + "TransactionID": 20003, "TagFetchBody": null, - "DNSTransactionID": 10003, + "DNSTransactionID": 20003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -1750,13 +1750,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1768,13 +1768,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1808,13 +1808,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, - "Type": 3, + "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1826,30 +1826,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "5.255.255.88:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 308, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Date": true, - "Location": true - }, - "HTTPResponseLocation": "https://yandex.com/", - "HTTPResponseTitle": "", - "HTTPResponseIsFinal": false, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, + "HTTPResponseLocation": null, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -1871,13 +1866,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30003": { + "40003": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1889,13 +1884,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.88:80", + "EndpointAddress": "77.88.55.77:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -1929,13 +1924,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30004": { + "40004": { "TagDepth": 0, - "Type": 1, + "Type": 3, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1947,25 +1942,30 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.77:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, - "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 308, + "HTTPResponseBodyLength": 0, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Date": true, + "Location": true + }, + "HTTPResponseLocation": "https://yandex.com/", + "HTTPResponseTitle": "", + "HTTPResponseIsFinal": false, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -1987,13 +1987,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2005,13 +2005,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2045,13 +2045,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2063,13 +2063,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2103,13 +2103,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40003": { + "50003": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40003, + "TransactionID": 50003, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2121,13 +2121,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40003, + "EndpointTransactionID": 50003, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2161,13 +2161,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40004": { + "50004": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40004, + "TransactionID": 50004, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2179,13 +2179,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40004, + "EndpointTransactionID": 50004, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "xn--d1acpjx3f.xn--p1ai", @@ -2219,13 +2219,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40005": { + "50005": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50005, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2237,13 +2237,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50005, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "77.88.55.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -2277,13 +2277,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40006": { + "50006": { "TagDepth": 1, - "Type": 3, + "Type": 2, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2295,30 +2295,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", - "HTTPRequestURL": "https://yandex.com/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 308, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Date": true, - "Location": true - }, - "HTTPResponseLocation": "https://ya.ru/", - "HTTPResponseTitle": "", - "HTTPResponseIsFinal": false, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, + "HTTPResponseLocation": null, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -2340,13 +2335,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40007": { + "50007": { "TagDepth": 1, - "Type": 2, + "Type": 3, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2358,25 +2353,30 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.77:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, - "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPRequestURL": "https://yandex.com/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 308, + "HTTPResponseBodyLength": 0, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Date": true, + "Location": true + }, + "HTTPResponseLocation": "https://ya.ru/", + "HTTPResponseTitle": "", + "HTTPResponseIsFinal": false, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -2398,13 +2398,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40008": { + "50008": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2416,13 +2416,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "77.88.55.77:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "yandex.com", @@ -2456,13 +2456,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40009": { + "50009": { "TagDepth": 2, - "Type": 3, + "Type": 2, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2477,27 +2477,22 @@ "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", - "HTTPRequestURL": "https://ya.ru/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 200, - "HTTPResponseBodyLength": 1533, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Content-Type": true, - "Date": true - }, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, "HTTPResponseLocation": null, - "HTTPResponseTitle": "Default Web Page", - "HTTPResponseIsFinal": true, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -2519,13 +2514,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40010": { + "50010": { "TagDepth": 2, - "Type": 2, + "Type": 3, "Failure": "", - "TransactionID": 40010, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2540,22 +2535,27 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40010, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, + "HTTPRequestURL": "https://ya.ru/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 200, + "HTTPResponseBodyLength": 1533, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Content-Type": true, + "Date": true + }, "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, + "HTTPResponseTitle": "Default Web Page", + "HTTPResponseIsFinal": true, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -2577,13 +2577,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40011": { + "50011": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2598,7 +2598,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.77:443", @@ -2635,13 +2635,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40012": { + "50012": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -2656,7 +2656,7 @@ "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.80:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations_classic.json index 2510250378..e88e92d136 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -63,9 +63,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -121,9 +121,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -179,9 +179,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -237,9 +237,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -290,9 +290,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -343,9 +343,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -396,9 +396,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "yandex.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -449,9 +449,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -502,9 +502,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -555,9 +555,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -608,9 +608,9 @@ "TagDepth": 2, "Type": 0, "Failure": "", - "TransactionID": 3, + "TransactionID": 10003, "TagFetchBody": null, - "DNSTransactionID": 3, + "DNSTransactionID": 10003, "DNSDomain": "ya.ru", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -659,13 +659,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -677,13 +677,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.80:80", + "EndpointAddress": "5.255.255.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -717,13 +717,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, - "Type": 3, + "Type": 1, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -735,30 +735,25 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.80:80", + "EndpointAddress": "5.255.255.88:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, - "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", - "HTTPFailure": "", - "HTTPResponseStatusCode": 308, - "HTTPResponseBodyLength": 0, - "HTTPResponseBodyIsTruncated": false, - "HTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Date": true, - "Location": true - }, - "HTTPResponseLocation": "https://yandex.com/", - "HTTPResponseTitle": "", - "HTTPResponseIsFinal": false, + "HTTPRequestURL": null, + "HTTPFailure": null, + "HTTPResponseStatusCode": null, + "HTTPResponseBodyLength": null, + "HTTPResponseBodyIsTruncated": null, + "HTTPResponseHeadersKeys": null, + "HTTPResponseLocation": null, + "HTTPResponseTitle": null, + "HTTPResponseIsFinal": null, "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", "ControlDNSLookupFailure": "", "ControlDNSResolvedAddrs": [ @@ -780,13 +775,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30003": { + "40003": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30003, + "TransactionID": 40003, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -798,13 +793,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", + "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30003, + "EndpointTransactionID": 40003, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "5.255.255.88:80", + "EndpointAddress": "77.88.55.77:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, @@ -838,13 +833,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30004": { + "40004": { "TagDepth": 0, - "Type": 1, + "Type": 3, "Failure": "", - "TransactionID": 30004, + "TransactionID": 40004, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -856,16 +851,79 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.77", + "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 30004, + "EndpointTransactionID": 40004, "EndpointProto": "tcp", "EndpointPort": "80", - "EndpointAddress": "77.88.55.77:80", + "EndpointAddress": "77.88.55.80:80", "TCPConnectFailure": "", "TLSHandshakeFailure": null, "TLSServerName": null, + "HTTPRequestURL": "http://xn--d1acpjx3f.xn--p1ai/", + "HTTPFailure": "", + "HTTPResponseStatusCode": 308, + "HTTPResponseBodyLength": 0, + "HTTPResponseBodyIsTruncated": false, + "HTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Date": true, + "Location": true + }, + "HTTPResponseLocation": "https://yandex.com/", + "HTTPResponseTitle": "", + "HTTPResponseIsFinal": false, + "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", + "ControlDNSLookupFailure": "", + "ControlDNSResolvedAddrs": [ + "5.255.255.80", + "5.255.255.88", + "77.88.55.77", + "77.88.55.80" + ], + "ControlTCPConnectFailure": "", + "ControlTLSHandshakeFailure": null, + "ControlHTTPFailure": "", + "ControlHTTPResponseStatusCode": 200, + "ControlHTTPResponseBodyLength": 1533, + "ControlHTTPResponseHeadersKeys": { + "Alt-Svc": true, + "Content-Length": true, + "Content-Type": true, + "Date": true + }, + "ControlHTTPResponseTitle": "Default Web Page" + }, + "50005": { + "TagDepth": 1, + "Type": 2, + "Failure": "", + "TransactionID": 50005, + "TagFetchBody": true, + "DNSTransactionID": 30001, + "DNSDomain": "xn--d1acpjx3f.xn--p1ai", + "DNSLookupFailure": "", + "DNSQueryType": null, + "DNSEngine": null, + "DNSResolvedAddrs": [ + "5.255.255.80", + "5.255.255.88", + "77.88.55.77", + "77.88.55.80" + ], + "IPAddressOrigin": "dns", + "IPAddress": "77.88.55.80", + "IPAddressASN": 208398, + "IPAddressBogon": false, + "EndpointTransactionID": 50005, + "EndpointProto": "tcp", + "EndpointPort": "443", + "EndpointAddress": "77.88.55.80:443", + "TCPConnectFailure": "", + "TLSHandshakeFailure": "", + "TLSServerName": "yandex.com", "HTTPRequestURL": null, "HTTPFailure": null, "HTTPResponseStatusCode": null, @@ -896,13 +954,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40005": { + "50006": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40005, + "TransactionID": 50006, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -917,7 +975,7 @@ "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40005, + "EndpointTransactionID": 50006, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.80:443", @@ -954,13 +1012,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40006": { + "50007": { "TagDepth": 1, "Type": 3, "Failure": "", - "TransactionID": 40006, + "TransactionID": 50007, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -975,7 +1033,7 @@ "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40006, + "EndpointTransactionID": 50007, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "5.255.255.88:443", @@ -1017,13 +1075,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40007": { + "50008": { "TagDepth": 1, "Type": 2, "Failure": "", - "TransactionID": 40007, + "TransactionID": 50008, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1038,7 +1096,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40007, + "EndpointTransactionID": 50008, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.77:443", @@ -1075,13 +1133,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40008": { - "TagDepth": 1, + "50009": { + "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40008, + "TransactionID": 50009, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1093,16 +1151,16 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "77.88.55.80", + "IPAddress": "5.255.255.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40008, + "EndpointTransactionID": 50009, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "77.88.55.80:443", + "EndpointAddress": "5.255.255.80:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", - "TLSServerName": "yandex.com", + "TLSServerName": "ya.ru", "HTTPRequestURL": null, "HTTPFailure": null, "HTTPResponseStatusCode": null, @@ -1133,13 +1191,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40009": { + "50010": { "TagDepth": 2, "Type": 3, "Failure": "", - "TransactionID": 40009, + "TransactionID": 50010, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1151,13 +1209,13 @@ "77.88.55.80" ], "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.80", + "IPAddress": "5.255.255.88", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40009, + "EndpointTransactionID": 50010, "EndpointProto": "tcp", "EndpointPort": "443", - "EndpointAddress": "5.255.255.80:443", + "EndpointAddress": "5.255.255.88:443", "TCPConnectFailure": "", "TLSHandshakeFailure": "", "TLSServerName": "ya.ru", @@ -1196,71 +1254,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40010": { - "TagDepth": 2, - "Type": 2, - "Failure": "", - "TransactionID": 40010, - "TagFetchBody": true, - "DNSTransactionID": 20001, - "DNSDomain": "xn--d1acpjx3f.xn--p1ai", - "DNSLookupFailure": "", - "DNSQueryType": null, - "DNSEngine": null, - "DNSResolvedAddrs": [ - "5.255.255.80", - "5.255.255.88", - "77.88.55.77", - "77.88.55.80" - ], - "IPAddressOrigin": "dns", - "IPAddress": "5.255.255.88", - "IPAddressASN": 208398, - "IPAddressBogon": false, - "EndpointTransactionID": 40010, - "EndpointProto": "tcp", - "EndpointPort": "443", - "EndpointAddress": "5.255.255.88:443", - "TCPConnectFailure": "", - "TLSHandshakeFailure": "", - "TLSServerName": "ya.ru", - "HTTPRequestURL": null, - "HTTPFailure": null, - "HTTPResponseStatusCode": null, - "HTTPResponseBodyLength": null, - "HTTPResponseBodyIsTruncated": null, - "HTTPResponseHeadersKeys": null, - "HTTPResponseLocation": null, - "HTTPResponseTitle": null, - "HTTPResponseIsFinal": null, - "ControlDNSDomain": "xn--d1acpjx3f.xn--p1ai", - "ControlDNSLookupFailure": "", - "ControlDNSResolvedAddrs": [ - "5.255.255.80", - "5.255.255.88", - "77.88.55.77", - "77.88.55.80" - ], - "ControlTCPConnectFailure": "", - "ControlTLSHandshakeFailure": null, - "ControlHTTPFailure": "", - "ControlHTTPResponseStatusCode": 200, - "ControlHTTPResponseBodyLength": 1533, - "ControlHTTPResponseHeadersKeys": { - "Alt-Svc": true, - "Content-Length": true, - "Content-Type": true, - "Date": true - }, - "ControlHTTPResponseTitle": "Default Web Page" - }, - "40011": { + "50011": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40011, + "TransactionID": 50011, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1275,7 +1275,7 @@ "IPAddress": "77.88.55.77", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40011, + "EndpointTransactionID": 50011, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.77:443", @@ -1312,13 +1312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40012": { + "50012": { "TagDepth": 2, "Type": 2, "Failure": "", - "TransactionID": 40012, + "TransactionID": 50012, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "xn--d1acpjx3f.xn--p1ai", "DNSLookupFailure": "", "DNSQueryType": null, @@ -1333,7 +1333,7 @@ "IPAddress": "77.88.55.80", "IPAddressASN": 208398, "IPAddressBogon": false, - "EndpointTransactionID": 40012, + "EndpointTransactionID": 50012, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "77.88.55.80:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis.json index 7911d9a985..7cfe62939b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis.json @@ -7,22 +7,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -48,7 +48,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30002, + "HTTPFinalResponseSuccessTCPWithControl": 40002, "HTTPFinalResponseDiffBodyProportionFactor": null, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -60,9 +60,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -132,7 +132,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", @@ -170,9 +170,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -185,7 +185,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -223,9 +223,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -238,7 +238,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -276,9 +276,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -329,9 +329,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -382,9 +382,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -435,9 +435,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -488,9 +488,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -541,9 +541,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -594,9 +594,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -644,9 +644,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis_classic.json index 5c1753552b..9fe3f13b68 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/analysis_classic.json @@ -7,16 +7,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -42,7 +42,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30002, + "HTTPFinalResponseSuccessTCPWithControl": 40002, "HTTPFinalResponseDiffBodyProportionFactor": null, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -126,7 +126,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -164,9 +164,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -217,9 +217,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json index 205b511e38..4ae1c1939d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json @@ -65,7 +65,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -80,7 +80,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -110,7 +110,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -140,7 +140,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -155,7 +155,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -233,7 +233,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 } ], "tcp_connect": [ @@ -249,7 +249,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 }, { "ip": "35.161.85.189", @@ -263,7 +263,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 }, { "ip": "52.35.36.75", @@ -277,7 +277,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "52.35.36.75", @@ -291,7 +291,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -310,7 +310,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 }, { "network": "tcp", @@ -327,7 +327,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations.json index c0efb2c22c..378bce51c1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -159,9 +159,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -265,9 +265,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -318,9 +318,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -371,9 +371,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -422,13 +422,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -441,7 +441,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -475,13 +475,13 @@ }, "ControlHTTPResponseTitle": "" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -494,7 +494,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", @@ -532,13 +532,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -551,7 +551,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -585,13 +585,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -604,7 +604,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations_classic.json index b800f4f650..13fab4a1b8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -58,9 +58,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -109,13 +109,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -128,7 +128,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -162,13 +162,13 @@ }, "ControlHTTPResponseTitle": "" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -181,7 +181,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis.json index 14d7b53f5a..de96ef5df6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis.json @@ -7,22 +7,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -46,7 +46,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": null, @@ -60,9 +60,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -132,7 +132,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", @@ -170,9 +170,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -223,9 +223,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -276,9 +276,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -329,9 +329,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -382,9 +382,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -435,9 +435,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -488,9 +488,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -538,9 +538,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis_classic.json index cf0330b8ce..58c02898b4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/analysis_classic.json @@ -7,17 +7,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -41,7 +41,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": null, @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -112,9 +112,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -127,7 +127,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", @@ -165,9 +165,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -218,9 +218,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json index 142f4a98a8..63d28ea7ad 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json @@ -65,7 +65,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -80,7 +80,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -110,7 +110,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -140,7 +140,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -155,7 +155,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -234,7 +234,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -250,7 +250,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 }, { "ip": "52.35.36.75", @@ -264,7 +264,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -283,7 +283,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 }, { "network": "tcp", @@ -300,7 +300,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations.json index 71c937786a..3037bed6eb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -159,9 +159,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -265,9 +265,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -318,9 +318,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -371,9 +371,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -422,13 +422,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -441,7 +441,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -479,13 +479,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -498,7 +498,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations_classic.json index a5e76e28e5..e72d7cc72c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -58,9 +58,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -109,13 +109,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -128,7 +128,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -166,13 +166,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -185,7 +185,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis.json index 1ab1062058..963da2bf14 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis.json @@ -6,26 +6,26 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -108,9 +108,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -155,9 +155,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -202,9 +202,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -247,9 +247,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis_classic.json index 5264b4dae3..208f5f1fc7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/analysis_classic.json @@ -6,18 +6,18 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json index fb115a60c3..bc65425fc7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json @@ -56,7 +56,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -71,7 +71,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -92,7 +92,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -113,7 +113,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -128,7 +128,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations.json index 17a5a061e9..e5bae20dbd 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -49,9 +49,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -143,9 +143,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -190,9 +190,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations_classic.json index 203cba19da..28a1a4fc40 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis.json index 1ab1062058..963da2bf14 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis.json @@ -6,26 +6,26 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -108,9 +108,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -155,9 +155,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -202,9 +202,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -247,9 +247,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis_classic.json index 5264b4dae3..208f5f1fc7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/analysis_classic.json @@ -6,18 +6,18 @@ "FinalResponseFailure": "unknown_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json index 4653fc81f5..ab482cc8e5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json @@ -56,7 +56,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -71,7 +71,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -92,7 +92,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -113,7 +113,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -128,7 +128,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations.json index 17a5a061e9..e5bae20dbd 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -49,9 +49,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -143,9 +143,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -190,9 +190,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations_classic.json index 203cba19da..28a1a4fc40 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis.json index 90fd41bdd3..c1dfdd869a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -43,7 +43,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "172.67.144.64:80", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -125,7 +125,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "172.67.144.64:443", @@ -163,9 +163,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -215,9 +215,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -267,9 +267,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -319,9 +319,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -369,9 +369,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis_classic.json index 153ff8b0c8..9ab58cb282 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -37,7 +37,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "172.67.144.64:80", @@ -105,9 +105,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json index 336e71bb1c..afc4db8206 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -212,7 +212,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -228,7 +228,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "172.67.144.64", @@ -242,7 +242,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -261,7 +261,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations.json index 262dc09c64..03d8a36a72 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "172.67.144.64:80", @@ -312,13 +312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -330,7 +330,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "172.67.144.64:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations_classic.json index b3c92dec54..7b58841cfc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "172.67.144.64:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis.json index 926290f03e..8db96aaac3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -43,7 +43,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 40001 + 50001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "172.67.144.64:443", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -163,9 +163,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -215,9 +215,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -267,9 +267,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -317,9 +317,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis_classic.json index 3f8a806d64..5e2c115e50 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -38,7 +38,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 40001 + 50001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "172.67.144.64:443", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json index 74667b697c..396d318a73 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -213,7 +213,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -229,7 +229,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -248,7 +248,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations.json index 5dc71367ff..990c719bd7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "172.67.144.64:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations_classic.json index 0148462a23..ee54712954 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "http_invalid_redirect_location_host", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "httpbin.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "172.67.144.64", "IPAddressASN": 13335, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "172.67.144.64:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json index 0a67b30e3c..1da4aba34e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -33,14 +33,14 @@ "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [ - 30001, - 40002 + 40001, + 50002 ], "TCPConnectUnexplainedFailureDuringWebFetch": [ - 30001 + 40001 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [ - 40002 + 50002 ], "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [], @@ -64,9 +64,9 @@ "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -78,7 +78,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -114,9 +114,9 @@ "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -128,7 +128,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -164,9 +164,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -214,9 +214,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -264,9 +264,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -312,9 +312,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -326,7 +326,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -368,9 +368,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -420,9 +420,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -472,9 +472,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -524,9 +524,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -574,9 +574,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json index e2eddc56aa..124e9152ad 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -28,10 +28,10 @@ "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [ - 30001 + 40001 ], "TCPConnectUnexplainedFailureDuringWebFetch": [ - 30001 + 40001 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], @@ -56,9 +56,9 @@ "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -106,9 +106,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -170,7 +170,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json index 35260519a1..1c7fa92807 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -274,7 +274,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -290,7 +290,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -304,7 +304,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -318,7 +318,7 @@ "depth=1", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -337,7 +337,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json index 4804f81910..5002b0fba7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -458,13 +458,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -476,7 +476,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -514,13 +514,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -532,7 +532,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json index 274669d472..5e5cbb9f9b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -155,13 +155,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -173,7 +173,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json index 9d0ce47ec3..b765598e88 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -33,10 +33,10 @@ "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [ - 40002 + 50002 ], "TCPConnectUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -111,9 +111,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -161,9 +161,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -211,9 +211,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -259,9 +259,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -273,7 +273,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -315,9 +315,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -521,9 +521,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json index 32e17c7f0e..a37dc467e1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -28,10 +28,10 @@ "TCPConnectUnexpectedFailureDuringWebFetch": [], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [ - 40002 + 50002 ], "TCPConnectUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], @@ -56,9 +56,9 @@ "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -106,9 +106,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -170,7 +170,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json index a7abe89fc2..fbe41731b9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -274,7 +274,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -290,7 +290,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -304,7 +304,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -323,7 +323,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json index fb79cb7bdd..18f630ef17 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -464,13 +464,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -482,7 +482,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json index b276c1db06..f62613bda3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -161,13 +161,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -179,7 +179,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json index 431231b119..41acb6c54c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,14 +40,14 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [ - 40002 + 50002 ], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -63,9 +63,9 @@ "TagDepth": 1, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -77,7 +77,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -113,9 +113,9 @@ "TagDepth": 1, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -127,7 +127,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -163,9 +163,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -213,9 +213,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -263,9 +263,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -311,9 +311,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -325,7 +325,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -523,9 +523,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -573,9 +573,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json index 9d4cbf207d..009fb40e7c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -38,7 +38,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -54,9 +54,9 @@ "TagDepth": 1, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -168,7 +168,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json index e786fc59f9..8cc814cd73 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -256,7 +256,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "network": "tcp", @@ -333,7 +333,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -349,7 +349,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -363,7 +363,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -377,7 +377,7 @@ "depth=1", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -396,7 +396,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -413,7 +413,7 @@ "fetch_body=false" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json index d745d86a33..0ce94a9784 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -458,13 +458,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -476,7 +476,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -514,13 +514,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -532,7 +532,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json index c175c8baa9..0502dd5baf 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 3, "Failure": "connection_reset", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -155,13 +155,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -173,7 +173,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json index 831131aace..e31bb96668 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,10 +40,10 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 1, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -111,9 +111,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -161,9 +161,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -211,9 +211,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -259,9 +259,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -273,7 +273,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -315,9 +315,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -521,9 +521,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json index ba039419ea..1a8925f04e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -35,10 +35,10 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], @@ -56,9 +56,9 @@ "TagDepth": 1, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -106,9 +106,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -170,7 +170,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json index 4f7e6b02f9..3a2304ac15 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -274,7 +274,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -290,7 +290,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -304,7 +304,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -323,7 +323,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -340,7 +340,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json index 891867e73d..2c361abed8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -464,13 +464,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -482,7 +482,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json index 7b5138c778..fb9ffb6190 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -161,13 +161,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -179,7 +179,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json index 86b21d5d80..6b9edaa7f8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,14 +40,14 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [ - 40002 + 50002 ], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -63,9 +63,9 @@ "TagDepth": 1, "Type": 3, "Failure": "eof_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -77,7 +77,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -113,9 +113,9 @@ "TagDepth": 1, "Type": 2, "Failure": "eof_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -127,7 +127,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -163,9 +163,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -213,9 +213,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -263,9 +263,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -311,9 +311,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -325,7 +325,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -523,9 +523,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -573,9 +573,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json index 8bd77f52fd..ad446e720e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -38,7 +38,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -54,9 +54,9 @@ "TagDepth": 1, "Type": 3, "Failure": "eof_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -168,7 +168,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json index 85f5914863..bd806ed996 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -256,7 +256,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "network": "tcp", @@ -333,7 +333,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -349,7 +349,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -363,7 +363,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -377,7 +377,7 @@ "depth=1", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -396,7 +396,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -413,7 +413,7 @@ "fetch_body=false" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json index 58e9221b58..9b8cbbb344 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 3, "Failure": "eof_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -458,13 +458,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -476,7 +476,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -514,13 +514,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "eof_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -532,7 +532,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json index 9c34e86fb4..9a34448823 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 3, "Failure": "eof_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -155,13 +155,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -173,7 +173,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json index 2f1fe09d66..751a8a6f79 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,10 +40,10 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 1, "Type": 2, "Failure": "eof_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -111,9 +111,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -161,9 +161,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -211,9 +211,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -259,9 +259,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -273,7 +273,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -315,9 +315,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -521,9 +521,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json index 81a933011a..cf2e73c385 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -35,10 +35,10 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], @@ -56,9 +56,9 @@ "TagDepth": 1, "Type": 2, "Failure": "eof_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -106,9 +106,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -170,7 +170,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json index 9b570daf56..e14a2dc063 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -274,7 +274,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -290,7 +290,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -304,7 +304,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -323,7 +323,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -340,7 +340,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json index 0c175c30d6..3d97b7c5c9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -464,13 +464,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "eof_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -482,7 +482,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json index 9a374bd8d3..bac1a8527b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -161,13 +161,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "eof_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -179,7 +179,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json index c66f085ba8..0ea7acf843 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis.json @@ -6,27 +6,27 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [ - 2, - 10002 + 10002, + 20002 ], "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], @@ -60,9 +60,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -108,9 +108,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -156,9 +156,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", @@ -204,9 +204,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -218,7 +218,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -260,9 +260,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -312,9 +312,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -364,9 +364,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -416,9 +416,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -466,9 +466,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json index 45f48ac644..6c413ac762 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/analysis_classic.json @@ -6,21 +6,21 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [ - 2 + 10002 ], "DNSExperimentFailure": null, "DNSLookupExpectedFailure": [], @@ -54,9 +54,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", @@ -102,9 +102,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -116,7 +116,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json index 73bea49d4d..bb3b819d71 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": null, @@ -111,7 +111,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -149,7 +149,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -165,7 +165,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -181,7 +181,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -260,7 +260,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -276,7 +276,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -295,7 +295,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json index 0a72379694..de0c4ea1dd 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", @@ -102,9 +102,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -152,9 +152,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -200,9 +200,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -250,9 +250,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -302,9 +302,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -354,9 +354,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -404,13 +404,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -422,7 +422,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json index e9c27e6833..dd53d36ffe 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/observations_classic.json @@ -4,9 +4,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -104,13 +104,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -122,7 +122,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json index 062cbc8f97..f9cb41d45f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,14 +40,14 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [ - 40002 + 50002 ], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -63,9 +63,9 @@ "TagDepth": 1, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -77,7 +77,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -113,9 +113,9 @@ "TagDepth": 1, "Type": 2, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -127,7 +127,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -163,9 +163,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -213,9 +213,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -263,9 +263,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -311,9 +311,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -325,7 +325,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -523,9 +523,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -573,9 +573,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json index 8faa042f31..fb004a061b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -38,7 +38,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -54,9 +54,9 @@ "TagDepth": 1, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -168,7 +168,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json index f717f39df8..2123843fe8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -256,7 +256,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "network": "tcp", @@ -333,7 +333,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -349,7 +349,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -363,7 +363,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -377,7 +377,7 @@ "depth=1", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -396,7 +396,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -413,7 +413,7 @@ "fetch_body=false" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json index 1903108b85..c63f3c439d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -458,13 +458,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -476,7 +476,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -514,13 +514,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -532,7 +532,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json index a75b12f097..cbb42361d4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 1, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -155,13 +155,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -173,7 +173,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json index e10558d8bd..541d95ef44 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,10 +40,10 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 1, "Type": 2, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -111,9 +111,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -161,9 +161,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -211,9 +211,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -259,9 +259,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -273,7 +273,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -315,9 +315,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -367,9 +367,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -419,9 +419,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -471,9 +471,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -521,9 +521,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json index 7fbc537132..6e785b6f2f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -35,10 +35,10 @@ "TLSHandshakeUnexpectedFailureDuringWebFetch": [], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringWebFetch": [ - 40002 + 50002 ], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [], @@ -56,9 +56,9 @@ "TagDepth": 1, "Type": 2, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -106,9 +106,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -156,9 +156,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -170,7 +170,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json index 84e2135ed9..ab80f8ecc8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=1" ], - "transaction_id": 2 + "transaction_id": 10002 }, { "answers": [ @@ -142,7 +142,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -157,7 +157,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -180,7 +180,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 }, { "answers": null, @@ -195,7 +195,7 @@ "tags": [ "depth=1" ], - "transaction_id": 10002 + "transaction_id": 20002 } ], "requests": [ @@ -274,7 +274,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -290,7 +290,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -304,7 +304,7 @@ "depth=1", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -323,7 +323,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -340,7 +340,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json index 4d09049fc7..867a8b921c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -104,9 +104,9 @@ "TagDepth": 1, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -154,9 +154,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -206,9 +206,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -258,9 +258,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -308,9 +308,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -360,9 +360,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 10002, + "TransactionID": 20002, "TagFetchBody": null, - "DNSTransactionID": 10002, + "DNSTransactionID": 20002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -408,13 +408,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -426,7 +426,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -464,13 +464,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -482,7 +482,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json index ad95524644..6e80d5afd3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -57,9 +57,9 @@ "TagDepth": 1, "Type": 0, "Failure": "", - "TransactionID": 2, + "TransactionID": 10002, "TagFetchBody": null, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -105,13 +105,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "bit.ly", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "67.199.248.11", "IPAddressASN": 396982, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "67.199.248.11:443", @@ -161,13 +161,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 1, "Type": 2, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 2, + "DNSTransactionID": 10002, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -179,7 +179,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json index 06b903f053..48b019dfa5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -47,7 +47,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 1, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -60,9 +60,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -74,7 +74,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -131,7 +131,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -169,9 +169,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -221,9 +221,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -273,9 +273,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -325,9 +325,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -375,9 +375,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json index f6cb7eb4b5..d29fb4428a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -41,7 +41,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30001, + "HTTPFinalResponseSuccessTCPWithControl": 40001, "HTTPFinalResponseDiffBodyProportionFactor": 1, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json index 139293ed2c..12e83a718c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -217,7 +217,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -233,7 +233,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "93.184.216.34", @@ -247,7 +247,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -266,7 +266,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json index 5acbd9a305..c1ac6b7c08 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -317,13 +317,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -335,7 +335,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json index d1cac9bf5c..f20be25a13 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json index 9f582cf824..643fc04529 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -45,7 +45,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -60,9 +60,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -74,7 +74,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -169,9 +169,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -221,9 +221,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -273,9 +273,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -323,9 +323,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json index a1f5c87ed0..ac3a10b79d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/analysis_classic.json @@ -6,17 +6,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -40,7 +40,7 @@ "HTTPRoundTripUnexpectedFailure": [], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, - "HTTPFinalResponseSuccessTLSWithControl": 40001, + "HTTPFinalResponseSuccessTLSWithControl": 50001, "HTTPFinalResponseSuccessTCPWithoutControl": null, "HTTPFinalResponseSuccessTCPWithControl": null, "HTTPFinalResponseDiffBodyProportionFactor": 1, @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -112,9 +112,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json index 9c8a9ed674..f09af0aca2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -218,7 +218,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tcp_connect": [ @@ -234,7 +234,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -253,7 +253,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json index 46059ed6b0..488318f262 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json index 4da291eb87..51a2e7116f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json index 906382f220..ea5d52f345 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -30,10 +30,10 @@ "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailureDuringWebFetch": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -113,9 +113,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -165,9 +165,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -217,9 +217,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -269,9 +269,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -319,9 +319,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json index c98a2d74fb..76a5b7a523 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -24,10 +24,10 @@ "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailureDuringWebFetch": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -107,9 +107,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json index 9e6d3e2d8b..409e5ed5f5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json index 5b3c99b60e..55cb55071f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json index ae19991f39..bd70d41c03 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json index e4d706aa80..5d95fd2a7f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis.json @@ -6,24 +6,24 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -31,13 +31,13 @@ "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [ - 40001 + 50001 ], "TCPConnectUnexpectedFailure": [ - 30001 + 40001 ], "TCPConnectUnexpectedFailureDuringWebFetch": [ - 30001 + 40001 ], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], @@ -55,7 +55,7 @@ "HTTPFinalResponseSuccessTLSWithoutControl": null, "HTTPFinalResponseSuccessTLSWithControl": null, "HTTPFinalResponseSuccessTCPWithoutControl": null, - "HTTPFinalResponseSuccessTCPWithControl": 30002, + "HTTPFinalResponseSuccessTCPWithControl": 40002, "HTTPFinalResponseDiffBodyProportionFactor": 1, "HTTPFinalResponseDiffStatusCodeMatch": true, "HTTPFinalResponseDiffTitleDifferentLongWords": {}, @@ -68,9 +68,9 @@ "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -82,7 +82,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -125,9 +125,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -139,7 +139,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -177,9 +177,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -191,7 +191,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", @@ -229,9 +229,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -243,7 +243,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", @@ -281,9 +281,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -333,9 +333,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -385,9 +385,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -437,9 +437,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -487,9 +487,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json index 43df7e2e0e..66c521aa2f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/analysis_classic.json @@ -6,15 +6,15 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -24,10 +24,10 @@ "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ - 30001 + 40001 ], "TCPConnectUnexpectedFailureDuringWebFetch": [ - 30001 + 40001 ], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", @@ -107,9 +107,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json index a23b36a8b0..2674f49158 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -217,7 +217,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 } ], "tcp_connect": [ @@ -233,7 +233,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "83.224.65.41", @@ -247,7 +247,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -261,7 +261,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 }, { "ip": "93.184.216.34", @@ -275,7 +275,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -294,7 +294,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json index 9557399bb9..b09918005f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", @@ -312,13 +312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 3, "Failure": "", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -330,7 +330,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "93.184.216.34:80", @@ -369,13 +369,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -387,7 +387,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "83.224.65.41:443", @@ -421,13 +421,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -439,7 +439,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json index 47621486d1..bc41f68078 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.org", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "83.224.65.41", "IPAddressASN": 30722, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "83.224.65.41:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis.json index e59e0c1021..1fab8e16c1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis.json @@ -7,22 +7,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -31,10 +31,10 @@ "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ - 30002 + 40002 ], "TCPConnectUnexpectedFailureDuringWebFetch": [ - 30002 + 40002 ], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], @@ -48,7 +48,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -64,9 +64,9 @@ "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -79,7 +79,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -132,7 +132,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", @@ -170,9 +170,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -185,7 +185,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -223,9 +223,9 @@ "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -238,7 +238,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", @@ -276,9 +276,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -329,9 +329,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -382,9 +382,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -435,9 +435,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -488,9 +488,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -541,9 +541,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -594,9 +594,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -644,9 +644,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis_classic.json index 1f06419fa7..1908a6daf1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/analysis_classic.json @@ -7,16 +7,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -25,10 +25,10 @@ "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], "TCPConnectUnexpectedFailure": [ - 30002 + 40002 ], "TCPConnectUnexpectedFailureDuringWebFetch": [ - 30002 + 40002 ], "TCPConnectUnexpectedFailureDuringConnectivityCheck": [], "TCPConnectUnexplainedFailure": [], @@ -42,7 +42,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 30001 + 40001 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -58,9 +58,9 @@ "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -111,9 +111,9 @@ "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -126,7 +126,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", @@ -164,9 +164,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -217,9 +217,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json index 467b8470f0..7ff72876b2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json @@ -65,7 +65,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -80,7 +80,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -110,7 +110,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -140,7 +140,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -155,7 +155,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -233,7 +233,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tcp_connect": [ @@ -249,7 +249,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30002 + "transaction_id": 40002 }, { "ip": "35.161.85.189", @@ -263,7 +263,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40002 + "transaction_id": 50002 }, { "ip": "52.35.36.75", @@ -277,7 +277,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 }, { "ip": "52.35.36.75", @@ -291,7 +291,7 @@ "depth=0", "fetch_body=false" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -310,7 +310,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 }, { "network": "tcp", @@ -327,7 +327,7 @@ "fetch_body=false" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations.json index 70e68d16c2..d06441bfde 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -159,9 +159,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -265,9 +265,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -318,9 +318,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -371,9 +371,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -422,13 +422,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -441,7 +441,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -475,13 +475,13 @@ }, "ControlHTTPResponseTitle": "" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -494,7 +494,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", @@ -528,13 +528,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -547,7 +547,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -581,13 +581,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": false, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -600,7 +600,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations_classic.json index 86242fb433..54b1f5e0f2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -58,9 +58,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -109,13 +109,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -128,7 +128,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "52.35.36.75:80", @@ -162,13 +162,13 @@ }, "ControlHTTPResponseTitle": "" }, - "30002": { + "40002": { "TagDepth": 0, "Type": 1, "Failure": "generic_timeout_error", - "TransactionID": 30002, + "TransactionID": 40002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -181,7 +181,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 30002, + "EndpointTransactionID": 40002, "EndpointProto": "tcp", "EndpointPort": "80", "EndpointAddress": "35.161.85.189:80", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis.json index 133b1ed7a3..e35e1df091 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis.json @@ -7,22 +7,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -44,7 +44,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 40002 + 50002 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -60,9 +60,9 @@ "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", @@ -113,9 +113,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -128,7 +128,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -166,9 +166,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -219,9 +219,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -272,9 +272,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -325,9 +325,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -378,9 +378,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -431,9 +431,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -484,9 +484,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -534,9 +534,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis_classic.json index c454fe8aca..4179d31d3f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/analysis_classic.json @@ -7,17 +7,17 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, - 20001 + 10001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -39,7 +39,7 @@ "TLSHandshakeUnexplainedFailureDuringWebFetch": [], "TLSHandshakeUnexplainedFailureDuringConnectivityCheck": [], "HTTPRoundTripUnexpectedFailure": [ - 40002 + 50002 ], "HTTPRoundTripUnexplainedFailure": [], "HTTPFinalResponseSuccessTLSWithoutControl": null, @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -70,7 +70,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", @@ -108,9 +108,9 @@ "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -123,7 +123,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -161,9 +161,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -214,9 +214,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json index 83c98c5d42..2a36418d33 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json @@ -65,7 +65,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -80,7 +80,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -110,7 +110,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -140,7 +140,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -155,7 +155,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [ @@ -234,7 +234,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tcp_connect": [ @@ -250,7 +250,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 }, { "ip": "52.35.36.75", @@ -264,7 +264,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -283,7 +283,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40002 + "transaction_id": 50002 }, { "network": "tcp", @@ -300,7 +300,7 @@ "fetch_body=true" ], "tls_version": "TLSv1.3", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations.json index ce448e1e97..273bb4533b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -159,9 +159,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -212,9 +212,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -265,9 +265,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -318,9 +318,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -371,9 +371,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -422,13 +422,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -441,7 +441,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -475,13 +475,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -494,7 +494,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations_classic.json index 95a8a7626e..2062a309aa 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -58,9 +58,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -109,13 +109,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -128,7 +128,7 @@ "IPAddress": "52.35.36.75", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "52.35.36.75:443", @@ -162,13 +162,13 @@ }, "ControlHTTPResponseTitle": "" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 3, "Failure": "generic_timeout_error", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "largefile.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -181,7 +181,7 @@ "IPAddress": "35.161.85.189", "IPAddressASN": 16509, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "35.161.85.189:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json index b049618b08..843b6a2aff 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -37,10 +37,10 @@ "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailureDuringWebFetch": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [], @@ -61,9 +61,9 @@ "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -75,7 +75,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -113,9 +113,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -165,9 +165,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -217,9 +217,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -269,9 +269,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -319,9 +319,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json index 88ccc3e5f0..cc112434e5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -31,10 +31,10 @@ "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailureDuringWebFetch": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [], @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -107,9 +107,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json index b4323e623a..5db3573f24 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 } ], "tls_handshakes": [ @@ -170,7 +170,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40001 + "transaction_id": 50001 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json index 716cbfaf6e..2218532d73 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json index 3b311dbb5a..ef780ceda9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json index cca559564e..45b5f72a0d 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis.json @@ -6,24 +6,24 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddress": [ - 20001 + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupSuccessWithValidAddressClassic": [ - 20001 + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -39,12 +39,12 @@ "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ - 40001, - 40002 + 50001, + 50002 ], "TLSHandshakeUnexpectedFailureDuringWebFetch": [ - 40001, - 40002 + 50001, + 50002 ], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [], @@ -65,9 +65,9 @@ "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -79,7 +79,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", @@ -117,9 +117,9 @@ "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -131,7 +131,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -169,9 +169,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -221,9 +221,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -273,9 +273,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -325,9 +325,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -375,9 +375,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json index c0b950e2a2..ea24f68550 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/analysis_classic.json @@ -6,15 +6,15 @@ "FinalResponseFailure": "" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddress": [], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [ - 1 + 10001 ], "DNSLookupSuccessWithValidAddressClassic": [], "DNSLookupUnexpectedFailure": [], @@ -31,10 +31,10 @@ "TCPConnectUnexplainedFailureDuringConnectivityCheck": [], "TLSHandshakeExpectedFailure": [], "TLSHandshakeUnexpectedFailure": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailureDuringWebFetch": [ - 40001 + 50001 ], "TLSHandshakeUnexpectedFailureDuringConnectivityCheck": [], "TLSHandshakeUnexplainedFailure": [], @@ -55,9 +55,9 @@ "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -69,7 +69,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -107,9 +107,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json index a95b0eca7c..510264a2f8 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40001 + "transaction_id": 50001 }, { "ip": "93.184.216.34", @@ -165,7 +165,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 40002 + "transaction_id": 50002 } ], "tls_handshakes": [ @@ -184,7 +184,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40001 + "transaction_id": 50001 }, { "network": "tcp", @@ -201,7 +201,7 @@ "fetch_body=true" ], "tls_version": "", - "transaction_id": 40002 + "transaction_id": 50002 } ], "x_control_request": { diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json index b58a532133..a4f9effdf9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -54,9 +54,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -158,9 +158,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -210,9 +210,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -260,13 +260,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -278,7 +278,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", @@ -312,13 +312,13 @@ }, "ControlHTTPResponseTitle": "Default Web Page" }, - "40002": { + "50002": { "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40002, + "TransactionID": 50002, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -330,7 +330,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 40002, + "EndpointTransactionID": 50002, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "93.184.216.34:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json index 4768edeaac..c2f0a3c698 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -55,13 +55,13 @@ } ], "KnownTCPEndpoints": { - "40001": { + "50001": { "TagDepth": 0, "Type": 2, "Failure": "connection_reset", - "TransactionID": 40001, + "TransactionID": 50001, "TagFetchBody": true, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "130.192.182.17", "IPAddressASN": 137, "IPAddressBogon": false, - "EndpointTransactionID": 40001, + "EndpointTransactionID": 50001, "EndpointProto": "tcp", "EndpointPort": "443", "EndpointAddress": "130.192.182.17:443", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json index 51ba8632e7..c4e775155c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis.json @@ -13,8 +13,8 @@ "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "dns_nxdomain_error", "DNSLookupExpectedFailure": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], @@ -46,9 +46,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -89,9 +89,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -132,9 +132,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -175,9 +175,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -218,9 +218,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json index a2b131e256..25f8f3eafa 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/analysis_classic.json @@ -13,7 +13,7 @@ "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "dns_nxdomain_error", "DNSLookupExpectedFailure": [ - 1 + 10001 ], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], @@ -45,9 +45,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json index 7264882a51..e1eff2df48 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json @@ -51,7 +51,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -67,7 +67,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -82,7 +82,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": null, @@ -98,7 +98,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -114,7 +114,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json index 5d07f29796..d2e4effc9c 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", @@ -90,9 +90,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", @@ -133,9 +133,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "A", @@ -176,9 +176,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json index 72f9449346..3b7ccc9f01 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/observations_classic.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_nxdomain_error", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.xyz", "DNSLookupFailure": "dns_nxdomain_error", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis.json index 167ffb6469..f4fd98b5c0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis.json @@ -13,8 +13,8 @@ "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "dns_no_answer", "DNSLookupExpectedFailure": [ - 1, - 10001 + 10001, + 20001 ], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], @@ -46,9 +46,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "A", @@ -89,9 +89,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -132,9 +132,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "A", @@ -175,9 +175,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -218,9 +218,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis_classic.json index 5539cd9fd8..c960beddc0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/analysis_classic.json @@ -13,7 +13,7 @@ "DNSLookupUnexplainedFailure": [], "DNSExperimentFailure": "dns_no_answer", "DNSLookupExpectedFailure": [ - 1 + 10001 ], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [], @@ -45,9 +45,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json index c0a2071904..0ec398a26f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json @@ -56,7 +56,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -77,7 +77,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -92,7 +92,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -113,7 +113,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": [ @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations.json index e40c5a0ef6..97ed06a707 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "A", @@ -47,9 +47,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -90,9 +90,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "ANY", @@ -133,9 +133,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "A", @@ -176,9 +176,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations_classic.json index 8aadcdc98c..f4e7332d34 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/observations_classic.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis.json index 4ce06b6ff7..04cae139f0 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis.json @@ -6,22 +6,22 @@ "FinalResponseFailure": "connection_refused_error" }, "DNSLookupSuccess": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1, 10001, - 20001 + 20001, + 30001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -29,7 +29,7 @@ "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [ - 30001 + 40001 ], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], @@ -59,9 +59,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -73,7 +73,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "444", "EndpointAddress": "93.184.216.34:444", @@ -106,9 +106,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -153,9 +153,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -200,9 +200,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -247,9 +247,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -292,9 +292,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis_classic.json index b89fda3d3a..8fac61061a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/analysis_classic.json @@ -6,16 +6,16 @@ "FinalResponseFailure": "connection_refused_error" }, "DNSLookupSuccess": [ - 1 + 10001 ], "DNSLookupSuccessWithInvalidAddresses": [], "DNSLookupSuccessWithValidAddress": [ - 1 + 10001 ], "DNSLookupSuccessWithBogonAddresses": [], "DNSLookupSuccessWithInvalidAddressesClassic": [], "DNSLookupSuccessWithValidAddressClassic": [ - 1 + 10001 ], "DNSLookupUnexpectedFailure": [], "DNSLookupUnexplainedFailure": [], @@ -23,7 +23,7 @@ "DNSLookupExpectedFailure": [], "DNSLookupExpectedSuccess": [], "TCPConnectExpectedFailure": [ - 30001 + 40001 ], "TCPConnectUnexpectedFailure": [], "TCPConnectUnexpectedFailureDuringWebFetch": [], @@ -53,9 +53,9 @@ "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -67,7 +67,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "444", "EndpointAddress": "93.184.216.34:444", @@ -100,9 +100,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json index b423e3b4e3..6d1902daf1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json @@ -58,7 +58,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": null, @@ -73,7 +73,7 @@ "tags": [ "depth=0" ], - "transaction_id": 20001 + "transaction_id": 30001 }, { "answers": [ @@ -96,7 +96,7 @@ "tags": [ "depth=0" ], - "transaction_id": 1 + "transaction_id": 10001 }, { "answers": [ @@ -119,7 +119,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 }, { "answers": null, @@ -134,7 +134,7 @@ "tags": [ "depth=0" ], - "transaction_id": 10001 + "transaction_id": 20001 } ], "requests": [], @@ -151,7 +151,7 @@ "depth=0", "fetch_body=true" ], - "transaction_id": 30001 + "transaction_id": 40001 } ], "tls_handshakes": [], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations.json index a442b2c0bf..79538cd3cb 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations.json @@ -4,9 +4,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -49,9 +49,9 @@ "TagDepth": 0, "Type": 0, "Failure": "dns_no_answer", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "dns_no_answer", "DNSQueryType": "AAAA", @@ -96,9 +96,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 20001, + "TransactionID": 30001, "TagFetchBody": null, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -143,9 +143,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -190,9 +190,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 10001, + "TransactionID": 20001, "TagFetchBody": null, - "DNSTransactionID": 10001, + "DNSTransactionID": 20001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "A", @@ -235,13 +235,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -253,7 +253,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "444", "EndpointAddress": "93.184.216.34:444", diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations_classic.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations_classic.json index 0fea303f34..43f3d8a910 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations_classic.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/observations_classic.json @@ -5,9 +5,9 @@ "TagDepth": 0, "Type": 0, "Failure": "", - "TransactionID": 1, + "TransactionID": 10001, "TagFetchBody": null, - "DNSTransactionID": 1, + "DNSTransactionID": 10001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": "ANY", @@ -50,13 +50,13 @@ } ], "KnownTCPEndpoints": { - "30001": { + "40001": { "TagDepth": 0, "Type": 1, "Failure": "connection_refused", - "TransactionID": 30001, + "TransactionID": 40001, "TagFetchBody": true, - "DNSTransactionID": 20001, + "DNSTransactionID": 30001, "DNSDomain": "www.example.com", "DNSLookupFailure": "", "DNSQueryType": null, @@ -68,7 +68,7 @@ "IPAddress": "93.184.216.34", "IPAddressASN": 15133, "IPAddressBogon": false, - "EndpointTransactionID": 30001, + "EndpointTransactionID": 40001, "EndpointProto": "tcp", "EndpointPort": "444", "EndpointAddress": "93.184.216.34:444",