diff --git a/internal/experiment/webconnectivitylte/cleartextflow.go b/internal/experiment/webconnectivitylte/cleartextflow.go index 7844b4619..2824fccad 100644 --- a/internal/experiment/webconnectivitylte/cleartextflow.go +++ b/internal/experiment/webconnectivitylte/cleartextflow.go @@ -8,7 +8,6 @@ package webconnectivitylte import ( "context" - "fmt" "io" "net" "net/http" @@ -32,6 +31,9 @@ type CleartextFlow struct { // Address is the MANDATORY address to connect to. Address string + // Classic is true if this address was discovered using getaddrinfo. + Classic bool + // DNSCache is the MANDATORY DNS cache. DNSCache *DNSCache @@ -106,8 +108,7 @@ func (t *CleartextFlow) Run(parentCtx context.Context, index int64) error { } // create trace - trace := measurexlite.NewTrace(index, t.ZeroTime, fmt.Sprintf("depth=%d", t.Depth), - fmt.Sprintf("fetch_body=%v", t.PrioSelector != nil)) + trace := measurexlite.NewTrace(index, t.ZeroTime, generateTagsForEndpoints(t.Depth, t.PrioSelector, t.Classic)...) // start measuring throttling sampler := throttling.NewSampler(trace) diff --git a/internal/experiment/webconnectivitylte/dnsresolvers.go b/internal/experiment/webconnectivitylte/dnsresolvers.go index f5561450d..8eb46a560 100644 --- a/internal/experiment/webconnectivitylte/dnsresolvers.go +++ b/internal/experiment/webconnectivitylte/dnsresolvers.go @@ -223,7 +223,7 @@ func (t *DNSResolvers) lookupHostSystem(parentCtx context.Context, out chan<- [] index := t.IDGenerator.NewIDForGetaddrinfo() // create trace - trace := measurexlite.NewTrace(index, t.ZeroTime, fmt.Sprintf("depth=%d", t.Depth)) + trace := measurexlite.NewTrace(index, t.ZeroTime, "classic", fmt.Sprintf("depth=%d", t.Depth)) // start the operation logger ol := logx.NewOperationLogger( @@ -394,6 +394,7 @@ func (t *DNSResolvers) startCleartextFlows( MaybeDelayCleartextFlows(index) // allow specific callers to space flows apart task := &CleartextFlow{ Address: net.JoinHostPort(addr.Addr, port), + Classic: addr.Flags&DNSAddrFlagSystemResolver != 0, Depth: t.Depth, DNSCache: t.DNSCache, DNSOverHTTPSURLProvider: t.DNSOverHTTPSURLProvider, @@ -444,6 +445,7 @@ func (t *DNSResolvers) startSecureFlows( MaybeDelaySecureFlows(index) // allow specific callers to space flows apart task := &SecureFlow{ Address: net.JoinHostPort(addr.Addr, port), + Classic: addr.Flags&DNSAddrFlagSystemResolver != 0, Depth: t.Depth, DNSCache: t.DNSCache, DNSOverHTTPSURLProvider: t.DNSOverHTTPSURLProvider, diff --git a/internal/experiment/webconnectivitylte/secureflow.go b/internal/experiment/webconnectivitylte/secureflow.go index 1cb51ed0a..fef37d4a4 100644 --- a/internal/experiment/webconnectivitylte/secureflow.go +++ b/internal/experiment/webconnectivitylte/secureflow.go @@ -9,7 +9,6 @@ package webconnectivitylte import ( "context" "crypto/tls" - "fmt" "io" "net" "net/http" @@ -33,6 +32,9 @@ type SecureFlow struct { // Address is the MANDATORY address to connect to. Address string + // Classic is true if this address was discovered using getaddrinfo. + Classic bool + // DNSCache is the MANDATORY DNS cache. DNSCache *DNSCache @@ -113,8 +115,7 @@ func (t *SecureFlow) Run(parentCtx context.Context, index int64) error { } // create trace - trace := measurexlite.NewTrace(index, t.ZeroTime, fmt.Sprintf("depth=%d", t.Depth), - fmt.Sprintf("fetch_body=%v", t.PrioSelector != nil)) + trace := measurexlite.NewTrace(index, t.ZeroTime, generateTagsForEndpoints(t.Depth, t.PrioSelector, t.Classic)...) // start measuring throttling sampler := throttling.NewSampler(trace) diff --git a/internal/experiment/webconnectivitylte/tags.go b/internal/experiment/webconnectivitylte/tags.go new file mode 100644 index 000000000..d84d21fec --- /dev/null +++ b/internal/experiment/webconnectivitylte/tags.go @@ -0,0 +1,31 @@ +package webconnectivitylte + +import "fmt" + +// generateTagsForEndpoints generates the tags for the endpoints. +func generateTagsForEndpoints(depth int64, ps *prioritySelector, classic bool) (output []string) { + // The classic flag marks all observations using IP addresses + // fetched using the system resolver. Strictly speaking classic + // means that these measurements derive from the resolver that + // we consider primary, and for us it it the system one. + if classic { + output = append(output, "classic") + } + + // The depth=0|1|... tag indicates the current redirect depth. + // + // When the depth is zero, we also include the tcptls_experiment tag + // for backwards compatibility with Web Connectivity v0.4. + if depth < 1 { + output = append(output, "tcptls_experiment") + } + output = append(output, fmt.Sprintf("depth=%d", depth)) + + // The fetch_body=true|false tag allows to distinguish between observations + // with the objective of fetching the body and extra observations. For example, + // for http:// requests we perform TLS handshakes for the purpose of checking + // whether IP addresses are valid without fetching the body. + output = append(output, fmt.Sprintf("fetch_body=%v", ps != nil)) + + return output +} diff --git a/internal/minipipeline/classic.go b/internal/minipipeline/classic.go index 20de161ca..cc7ff8e0e 100644 --- a/internal/minipipeline/classic.go +++ b/internal/minipipeline/classic.go @@ -14,6 +14,8 @@ package minipipeline // // The result should approximate what v0.4 would have measured. func ClassicFilter(input *WebObservationsContainer) (output *WebObservationsContainer) { + // TODO(bassosimone): now that there's a "classic" tag it would probably + // be simpler to just always use the "classic" tag to extract. output = &WebObservationsContainer{ DNSLookupFailures: []*WebObservation{}, DNSLookupSuccesses: []*WebObservation{}, diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json index b6f3b3a93..9192dbc6b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithExpiredCertificate/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -166,6 +169,8 @@ "server_name": "expired.badssl.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json index a7a6e8a9e..3616e06a6 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithConsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -166,6 +169,8 @@ "server_name": "untrusted-root.badssl.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json index c56bd6728..bc1352ce5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithUnknownAuthorityWithInconsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -215,6 +216,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -231,6 +233,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -245,6 +249,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -263,6 +268,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -280,6 +287,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json index 24ef760f0..7645c9f0f 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/badSSLWithWrongServerName/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -166,6 +169,8 @@ "server_name": "wrong.host.badssl.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json index f3775d222..261fd1ba9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -249,6 +250,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -265,6 +268,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -279,6 +284,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -297,6 +304,8 @@ "server_name": "www.cloudflare-cache.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json index 78da5967e..0edbec3e2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/cloudflareCAPTCHAWithHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -250,6 +251,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -266,6 +269,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -284,6 +289,8 @@ "server_name": "www.cloudflare-cache.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json index f6ff03bc9..fb2ee6123 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPSWebsite/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -215,6 +216,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -231,6 +234,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -249,6 +254,8 @@ "server_name": "www.example.org", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json index 28dcd54f3..afb7d1f76 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/controlFailureWithSuccessfulHTTPWebsite/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -214,6 +215,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -230,6 +233,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -244,6 +249,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -262,6 +269,8 @@ "server_name": "www.example.org", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json index 5dc5b8dac..4de015804 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingAndroidDNSCacheNoData/measurement.json @@ -86,6 +86,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -207,6 +208,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -223,6 +225,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -241,6 +244,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json index ce6cb671e..061005b82 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingBOGON/measurement.json @@ -92,6 +92,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -213,6 +214,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -229,6 +231,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -243,6 +247,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -261,6 +266,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json index 121a2dec5..b061c4c47 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsBlockingNXDOMAIN/measurement.json @@ -86,6 +86,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -207,6 +208,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -223,6 +225,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -241,6 +244,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json index 5dffdc4c8..f3432a6a9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTP/measurement.json @@ -92,6 +92,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -210,6 +211,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -226,6 +228,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -240,6 +243,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -258,6 +262,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json index 6a3a88dd7..9b309cf17 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToLocalhostWithHTTPS/measurement.json @@ -92,6 +92,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -211,6 +212,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -227,6 +229,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -245,6 +248,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json index ac9f835ea..f1eabc940 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPSURL/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -215,6 +216,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -231,6 +234,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -245,6 +250,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -263,6 +269,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -280,6 +288,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json index dbf72c1f6..dfc05e40a 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/dnsHijackingToProxyWithHTTPURL/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -209,6 +210,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -225,6 +228,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -239,6 +244,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -253,6 +260,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -267,6 +275,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -285,6 +294,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -302,6 +313,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json index 20c6da3fb..e3828c9e5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTP/measurement.json @@ -88,6 +88,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -203,6 +204,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -219,6 +222,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -233,6 +238,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json index f5776326d..50823c31b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/ghostDNSBlockingWithHTTPS/measurement.json @@ -88,6 +88,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -142,6 +143,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json index 4804338fc..893fbd4a2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpBlockingConnectionReset/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -192,6 +193,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -208,6 +211,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -222,6 +227,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -240,6 +247,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json index 42bbdfef8..7f3137834 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithConsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -192,6 +193,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -208,6 +211,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -222,6 +227,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -240,6 +247,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json index 32c6615b5..f1a074c3e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/httpDiffWithInconsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -192,6 +193,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -208,6 +211,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -222,6 +227,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -236,6 +243,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -250,6 +258,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -268,6 +277,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -285,6 +296,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json index 6854026bd..f30be11f2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipLowercase/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -140,6 +142,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=2" ], "transaction_id": 10003 @@ -337,6 +340,7 @@ }, "t": 0, "tags": [ + "classic", "depth=2", "fetch_body=true" ], @@ -419,6 +423,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -500,6 +505,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -516,6 +523,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -530,6 +539,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -544,6 +555,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -558,6 +570,7 @@ }, "t": 0, "tags": [ + "classic", "depth=2", "fetch_body=true" ], @@ -576,6 +589,8 @@ "server_name": "xn--d1acpjx3f.xn--p1ai", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -593,6 +608,7 @@ "server_name": "yandex.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -610,6 +626,7 @@ "server_name": "ya.ru", "t": 0, "tags": [ + "classic", "depth=2", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json index a6707227f..3ffa23730 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/idnaWithoutCensorshipWithFirstLetterUppercase/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -140,6 +142,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=2" ], "transaction_id": 10003 @@ -337,6 +340,7 @@ }, "t": 0, "tags": [ + "classic", "depth=2", "fetch_body=true" ], @@ -419,6 +423,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -500,6 +505,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -516,6 +523,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -530,6 +539,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -544,6 +555,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -558,6 +570,7 @@ }, "t": 0, "tags": [ + "classic", "depth=2", "fetch_body=true" ], @@ -576,6 +589,8 @@ "server_name": "xn--d1acpjx3f.xn--p1ai", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -593,6 +608,7 @@ "server_name": "yandex.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -610,6 +626,7 @@ "server_name": "ya.ru", "t": 0, "tags": [ + "classic", "depth=2", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json index 4603122a3..67d10a757 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -209,6 +210,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -225,6 +228,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -239,6 +244,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -257,6 +264,8 @@ "server_name": "largefile.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json index 7333dc24a..aeb14c5b1 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/largeFileWithHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -210,6 +211,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -226,6 +229,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -244,6 +249,8 @@ "server_name": "largefile.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json index bc65425fc..e742cd9d2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTP/measurement.json @@ -90,6 +90,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 diff --git a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json index ab482cc8e..9cab4b1c5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/localhostWithHTTPS/measurement.json @@ -90,6 +90,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json index afc4db820..a2482742b 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -209,6 +210,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -225,6 +228,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -239,6 +244,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -257,6 +264,8 @@ "server_name": "httpbin.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json index 396d318a7..8fbf7bd2e 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithBrokenLocationForHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -210,6 +211,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -226,6 +229,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -244,6 +249,8 @@ "server_name": "httpbin.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json index 1c7fa9280..9e8c095a9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -271,6 +273,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -287,6 +291,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -301,6 +307,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -315,6 +322,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], @@ -333,6 +341,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json index fbe41731b..38ae634f9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionRefusedForHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -271,6 +273,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -287,6 +291,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -301,6 +307,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -319,6 +326,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json index 8cc814cd7..1f5ec7241 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -253,6 +255,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -330,6 +333,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -346,6 +351,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -360,6 +367,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -374,6 +382,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], @@ -392,6 +401,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -409,6 +420,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json index 3a2304ac1..f16d215d4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenConnectionResetForHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -271,6 +273,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -287,6 +291,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -301,6 +307,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -319,6 +326,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -336,6 +345,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json index bd806ed99..15b9faf20 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -253,6 +255,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -330,6 +333,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -346,6 +351,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -360,6 +367,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -374,6 +382,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], @@ -392,6 +401,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -409,6 +420,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json index e14a2dc06..9abce6b04 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenEOFForHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -271,6 +273,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -287,6 +291,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -301,6 +307,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -319,6 +326,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -336,6 +345,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json index bb3b819d7..c6a6142ce 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenNXDOMAIN/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -109,6 +110,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -257,6 +259,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -273,6 +277,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -291,6 +297,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json index 2123843fe..521e339fa 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -253,6 +255,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -330,6 +333,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -346,6 +351,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -360,6 +367,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -374,6 +382,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], @@ -392,6 +401,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -409,6 +420,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json index ab80f8ecc..fa47a9b24 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/redirectWithConsistentDNSAndThenTimeoutForHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -117,6 +118,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=1" ], "transaction_id": 10002 @@ -271,6 +273,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -287,6 +291,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -301,6 +307,7 @@ }, "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], @@ -319,6 +326,8 @@ "server_name": "bit.ly", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -336,6 +345,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", "depth=1", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json index 12e83a718..67aa6c253 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -214,6 +215,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -230,6 +233,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -244,6 +249,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -262,6 +269,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json index f09af0aca..be52dec78 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/successWithHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -215,6 +216,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -231,6 +234,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -249,6 +254,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json index 409e5ed5f..82ec226a5 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectTimeout/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json index 2674f4915..d373370e2 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tcpBlockingConnectionRefusedWithInconsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -214,6 +215,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -230,6 +232,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -244,6 +248,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -258,6 +264,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -272,6 +279,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -290,6 +298,7 @@ "server_name": "www.example.org", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json index b0668b104..0fac157d9 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTP/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -209,6 +210,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -225,6 +228,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -239,6 +244,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], @@ -257,6 +264,8 @@ "server_name": "largefile.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=false" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json index 76bda08fd..8fca4a3f3 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/throttlingWithHTTPS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -210,6 +211,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -226,6 +229,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -244,6 +249,8 @@ "server_name": "largefile.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json index 5db3573f2..e38835fdc 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithConsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -166,6 +169,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json index 510264a2f..9d93d6a81 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/tlsBlockingConnectionResetWithInconsistentDNS/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -162,6 +165,7 @@ }, "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -180,6 +184,8 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ], @@ -197,6 +203,7 @@ "server_name": "www.example.com", "t": 0, "tags": [ + "tcptls_experiment", "depth=0", "fetch_body=true" ], diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json index e1eff2df4..800085e87 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNXDOMAIN/measurement.json @@ -80,6 +80,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json index 0ec398a26..ab344bcd7 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownNoAddrs/measurement.json @@ -90,6 +90,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 diff --git a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json index 6d1902daf..915e801e4 100644 --- a/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json +++ b/internal/minipipeline/testdata/webconnectivity/generated/websiteDownTCPConnect/measurement.json @@ -94,6 +94,7 @@ "resolver_address": "", "t": 0, "tags": [ + "classic", "depth=0" ], "transaction_id": 10001 @@ -148,6 +149,8 @@ }, "t": 0, "tags": [ + "classic", + "tcptls_experiment", "depth=0", "fetch_body=true" ],