From f837d6124790c7612cc7801e72d09e4b1bcadc09 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Tue, 12 Sep 2023 16:10:12 +0200 Subject: [PATCH] cleanup: move measurex and tracex inside ./internal/legacy (#1261) This diff moves the measurex and tracex packages inside of the ./internal/legacy package. The reason why I am doing this is because we don't plan on further developing these packages. We will just fix bugs if they arise. I am doing this change before looking into whether we could more clearly figure out the dependencies these packages need considering that we're trying to figure out and organize better how we use netxlite throughout the codebase. The overall objective of this work is to gently separate code for measuring and code for communicating with the backend to support https://github.com/ooni/probe/issues/2531. --- internal/experiment/dash/measurer.go | 2 +- internal/experiment/dash/runner.go | 2 +- internal/experiment/dash/runner_test.go | 2 +- internal/experiment/dnscheck/dnscheck.go | 2 +- internal/experiment/fbmessenger/fbmessenger_test.go | 2 +- internal/experiment/hhfm/hhfm.go | 2 +- internal/experiment/hhfm/hhfm_test.go | 2 +- internal/experiment/hirl/hirl.go | 2 +- internal/experiment/hirl/hirl_test.go | 2 +- internal/experiment/quicping/quicping.go | 2 +- internal/experiment/riseupvpn/riseupvpn.go | 2 +- internal/experiment/riseupvpn/riseupvpn_test.go | 2 +- internal/experiment/stunreachability/stunreachability.go | 2 +- internal/experiment/tlsmiddlebox/trace.go | 2 +- internal/experiment/tlstool/tlstool.go | 2 +- internal/experiment/tor/tor.go | 4 ++-- internal/experiment/tor/tor_test.go | 2 +- internal/experiment/torsf/torsf.go | 2 +- internal/experiment/urlgetter/configurer.go | 2 +- internal/experiment/urlgetter/configurer_test.go | 2 +- internal/experiment/urlgetter/getter.go | 2 +- internal/experiment/urlgetter/urlgetter.go | 2 +- internal/experiment/vanillator/vanillator.go | 2 +- internal/experiment/webconnectivity/httpanalysis_test.go | 2 +- internal/experiment/webconnectivity/summary_test.go | 2 +- internal/experiment/webconnectivity/webconnectivity.go | 2 +- internal/experiment/webconnectivity/webconnectivity_test.go | 2 +- internal/experiment/webconnectivitylte/testkeys.go | 2 +- internal/{ => legacy}/measurex/archival.go | 0 internal/{ => legacy}/measurex/db.go | 0 internal/{ => legacy}/measurex/dialer.go | 0 internal/{ => legacy}/measurex/dnsx.go | 2 +- internal/{ => legacy}/measurex/dnsx_test.go | 0 internal/{ => legacy}/measurex/doc.go | 0 internal/{ => legacy}/measurex/easy.go | 0 internal/{ => legacy}/measurex/endpoint.go | 0 internal/{ => legacy}/measurex/failure.go | 0 internal/{ => legacy}/measurex/http.go | 0 internal/{ => legacy}/measurex/logger.go | 0 internal/{ => legacy}/measurex/measurement.go | 0 internal/{ => legacy}/measurex/measurer.go | 0 internal/{ => legacy}/measurex/oddity.go | 0 internal/{ => legacy}/measurex/quic.go | 0 internal/{ => legacy}/measurex/resolver.go | 2 +- internal/{ => legacy}/measurex/resolver_test.go | 0 internal/{ => legacy}/measurex/tls.go | 0 internal/{ => legacy}/measurex/tracing.go | 0 internal/{ => legacy}/measurex/utils.go | 0 internal/legacy/netx/config.go | 2 +- internal/legacy/netx/dnstransport_test.go | 2 +- internal/legacy/netx/http_test.go | 2 +- internal/legacy/netx/integration_test.go | 2 +- internal/legacy/netx/resolver_test.go | 2 +- internal/legacy/netx/tls_test.go | 2 +- internal/{ => legacy}/tracex/archival.go | 0 internal/{ => legacy}/tracex/archival_test.go | 0 internal/{ => legacy}/tracex/dialer.go | 0 internal/{ => legacy}/tracex/dialer_test.go | 0 internal/{ => legacy}/tracex/doc.go | 0 internal/{ => legacy}/tracex/event.go | 0 internal/{ => legacy}/tracex/event_test.go | 0 internal/{ => legacy}/tracex/http.go | 0 internal/{ => legacy}/tracex/http_test.go | 0 internal/{ => legacy}/tracex/quic.go | 0 internal/{ => legacy}/tracex/quic_test.go | 0 internal/{ => legacy}/tracex/resolver.go | 0 internal/{ => legacy}/tracex/resolver_test.go | 0 internal/{ => legacy}/tracex/saver.go | 0 internal/{ => legacy}/tracex/saver_test.go | 0 internal/{ => legacy}/tracex/tls.go | 0 internal/{ => legacy}/tracex/tls_test.go | 0 internal/oohelperd/dns.go | 2 +- internal/oohelperd/http.go | 2 +- internal/tutorial/experiment/torsf/chapter04/README.md | 2 +- internal/tutorial/experiment/torsf/chapter04/torsf.go | 2 +- internal/tutorial/measurex/chapter01/README.md | 2 +- internal/tutorial/measurex/chapter01/main.go | 2 +- internal/tutorial/measurex/chapter02/README.md | 2 +- internal/tutorial/measurex/chapter02/main.go | 2 +- internal/tutorial/measurex/chapter03/README.md | 2 +- internal/tutorial/measurex/chapter03/main.go | 2 +- internal/tutorial/measurex/chapter04/README.md | 2 +- internal/tutorial/measurex/chapter04/main.go | 2 +- internal/tutorial/measurex/chapter05/README.md | 2 +- internal/tutorial/measurex/chapter05/main.go | 2 +- internal/tutorial/measurex/chapter06/README.md | 2 +- internal/tutorial/measurex/chapter06/main.go | 2 +- internal/tutorial/measurex/chapter07/README.md | 2 +- internal/tutorial/measurex/chapter07/main.go | 2 +- internal/tutorial/measurex/chapter08/README.md | 2 +- internal/tutorial/measurex/chapter08/main.go | 2 +- internal/tutorial/measurex/chapter09/README.md | 2 +- internal/tutorial/measurex/chapter09/main.go | 2 +- internal/tutorial/measurex/chapter10/README.md | 2 +- internal/tutorial/measurex/chapter10/main.go | 2 +- internal/tutorial/measurex/chapter11/README.md | 2 +- internal/tutorial/measurex/chapter11/main.go | 2 +- internal/tutorial/measurex/chapter12/README.md | 2 +- internal/tutorial/measurex/chapter12/main.go | 2 +- internal/tutorial/measurex/chapter14/README.md | 2 +- internal/tutorial/measurex/chapter14/main.go | 2 +- internal/tutorial/netxlite/chapter04/README.md | 2 +- internal/tutorial/netxlite/chapter08/README.md | 2 +- 103 files changed, 69 insertions(+), 69 deletions(-) rename internal/{ => legacy}/measurex/archival.go (100%) rename internal/{ => legacy}/measurex/db.go (100%) rename internal/{ => legacy}/measurex/dialer.go (100%) rename internal/{ => legacy}/measurex/dnsx.go (96%) rename internal/{ => legacy}/measurex/dnsx_test.go (100%) rename internal/{ => legacy}/measurex/doc.go (100%) rename internal/{ => legacy}/measurex/easy.go (100%) rename internal/{ => legacy}/measurex/endpoint.go (100%) rename internal/{ => legacy}/measurex/failure.go (100%) rename internal/{ => legacy}/measurex/http.go (100%) rename internal/{ => legacy}/measurex/logger.go (100%) rename internal/{ => legacy}/measurex/measurement.go (100%) rename internal/{ => legacy}/measurex/measurer.go (100%) rename internal/{ => legacy}/measurex/oddity.go (100%) rename internal/{ => legacy}/measurex/quic.go (100%) rename internal/{ => legacy}/measurex/resolver.go (98%) rename internal/{ => legacy}/measurex/resolver_test.go (100%) rename internal/{ => legacy}/measurex/tls.go (100%) rename internal/{ => legacy}/measurex/tracing.go (100%) rename internal/{ => legacy}/measurex/utils.go (100%) rename internal/{ => legacy}/tracex/archival.go (100%) rename internal/{ => legacy}/tracex/archival_test.go (100%) rename internal/{ => legacy}/tracex/dialer.go (100%) rename internal/{ => legacy}/tracex/dialer_test.go (100%) rename internal/{ => legacy}/tracex/doc.go (100%) rename internal/{ => legacy}/tracex/event.go (100%) rename internal/{ => legacy}/tracex/event_test.go (100%) rename internal/{ => legacy}/tracex/http.go (100%) rename internal/{ => legacy}/tracex/http_test.go (100%) rename internal/{ => legacy}/tracex/quic.go (100%) rename internal/{ => legacy}/tracex/quic_test.go (100%) rename internal/{ => legacy}/tracex/resolver.go (100%) rename internal/{ => legacy}/tracex/resolver_test.go (100%) rename internal/{ => legacy}/tracex/saver.go (100%) rename internal/{ => legacy}/tracex/saver_test.go (100%) rename internal/{ => legacy}/tracex/tls.go (100%) rename internal/{ => legacy}/tracex/tls_test.go (100%) diff --git a/internal/experiment/dash/measurer.go b/internal/experiment/dash/measurer.go index e45287a31f..78904ed479 100644 --- a/internal/experiment/dash/measurer.go +++ b/internal/experiment/dash/measurer.go @@ -12,7 +12,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/netx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // Config contains the experiment config. diff --git a/internal/experiment/dash/runner.go b/internal/experiment/dash/runner.go index f194acd9c5..6467d797a1 100644 --- a/internal/experiment/dash/runner.go +++ b/internal/experiment/dash/runner.go @@ -16,7 +16,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/humanize" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // runnerConfig contains settings for running the dash experiment. This struct diff --git a/internal/experiment/dash/runner_test.go b/internal/experiment/dash/runner_test.go index f6ac14480a..797aef76d1 100644 --- a/internal/experiment/dash/runner_test.go +++ b/internal/experiment/dash/runner_test.go @@ -12,7 +12,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/mocks" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestRunnerRunAllPhasesLocateFailure(t *testing.T) { diff --git a/internal/experiment/dnscheck/dnscheck.go b/internal/experiment/dnscheck/dnscheck.go index 5979861bd3..ff4c778d32 100644 --- a/internal/experiment/dnscheck/dnscheck.go +++ b/internal/experiment/dnscheck/dnscheck.go @@ -18,7 +18,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/netx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/fbmessenger/fbmessenger_test.go b/internal/experiment/fbmessenger/fbmessenger_test.go index 99fa99f0e0..945aafe4a1 100644 --- a/internal/experiment/fbmessenger/fbmessenger_test.go +++ b/internal/experiment/fbmessenger/fbmessenger_test.go @@ -16,7 +16,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/netemx" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // servicesAddr is the IP address implementing al fbmessenger services in netem-based tests diff --git a/internal/experiment/hhfm/hhfm.go b/internal/experiment/hhfm/hhfm.go index 09e43fecd6..500d0b8914 100644 --- a/internal/experiment/hhfm/hhfm.go +++ b/internal/experiment/hhfm/hhfm.go @@ -18,7 +18,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/randx" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/hhfm/hhfm_test.go b/internal/experiment/hhfm/hhfm_test.go index 1dd10989dd..951f148f56 100644 --- a/internal/experiment/hhfm/hhfm_test.go +++ b/internal/experiment/hhfm/hhfm_test.go @@ -18,7 +18,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewExperimentMeasurer(t *testing.T) { diff --git a/internal/experiment/hirl/hirl.go b/internal/experiment/hirl/hirl.go index 903760f44e..0c8c8a63c0 100644 --- a/internal/experiment/hirl/hirl.go +++ b/internal/experiment/hirl/hirl.go @@ -15,7 +15,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/randx" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/hirl/hirl_test.go b/internal/experiment/hirl/hirl_test.go index ae326543d5..7d9f55bd49 100644 --- a/internal/experiment/hirl/hirl_test.go +++ b/internal/experiment/hirl/hirl_test.go @@ -12,7 +12,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/netx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewExperimentMeasurer(t *testing.T) { diff --git a/internal/experiment/quicping/quicping.go b/internal/experiment/quicping/quicping.go index cedf7c4e3a..2e048324fd 100644 --- a/internal/experiment/quicping/quicping.go +++ b/internal/experiment/quicping/quicping.go @@ -18,7 +18,7 @@ import ( _ "crypto/sha256" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // A connectionID in QUIC diff --git a/internal/experiment/riseupvpn/riseupvpn.go b/internal/experiment/riseupvpn/riseupvpn.go index ff662cebb1..180e614061 100644 --- a/internal/experiment/riseupvpn/riseupvpn.go +++ b/internal/experiment/riseupvpn/riseupvpn.go @@ -12,7 +12,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/riseupvpn/riseupvpn_test.go b/internal/experiment/riseupvpn/riseupvpn_test.go index 9af91c9699..5ef3f3c375 100644 --- a/internal/experiment/riseupvpn/riseupvpn_test.go +++ b/internal/experiment/riseupvpn/riseupvpn_test.go @@ -17,7 +17,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/mockable" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/stunreachability/stunreachability.go b/internal/experiment/stunreachability/stunreachability.go index 8ab360ea87..c13b6a596f 100644 --- a/internal/experiment/stunreachability/stunreachability.go +++ b/internal/experiment/stunreachability/stunreachability.go @@ -13,7 +13,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/netx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/pion/stun" ) diff --git a/internal/experiment/tlsmiddlebox/trace.go b/internal/experiment/tlsmiddlebox/trace.go index 54a7742ae3..972a8343fb 100644 --- a/internal/experiment/tlsmiddlebox/trace.go +++ b/internal/experiment/tlsmiddlebox/trace.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // CompleteTrace records the result of the network trace diff --git a/internal/experiment/tlstool/tlstool.go b/internal/experiment/tlstool/tlstool.go index 248e277804..cd3cc6371b 100644 --- a/internal/experiment/tlstool/tlstool.go +++ b/internal/experiment/tlstool/tlstool.go @@ -19,7 +19,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/netx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/tor/tor.go b/internal/experiment/tor/tor.go index 11fe42cbae..d0040c41b1 100644 --- a/internal/experiment/tor/tor.go +++ b/internal/experiment/tor/tor.go @@ -13,12 +13,12 @@ import ( "sync/atomic" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/scrubber" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/tor/tor_test.go b/internal/experiment/tor/tor_test.go index 2aa97b5fa1..b817f362d5 100644 --- a/internal/experiment/tor/tor_test.go +++ b/internal/experiment/tor/tor_test.go @@ -14,7 +14,7 @@ import ( "github.com/apex/log" "github.com/google/go-cmp/cmp" "github.com/ooni/probe-cli/v3/internal/legacy/mockable" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/scrubber" diff --git a/internal/experiment/torsf/torsf.go b/internal/experiment/torsf/torsf.go index d399a39a5a..499f1b9c3d 100644 --- a/internal/experiment/torsf/torsf.go +++ b/internal/experiment/torsf/torsf.go @@ -15,7 +15,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/ptx" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/torlogs" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/experiment/urlgetter/configurer.go b/internal/experiment/urlgetter/configurer.go index 12264317c7..dd7d262d2d 100644 --- a/internal/experiment/urlgetter/configurer.go +++ b/internal/experiment/urlgetter/configurer.go @@ -11,7 +11,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/legacy/netx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // The Configurer job is to construct a Configuration that can diff --git a/internal/experiment/urlgetter/configurer_test.go b/internal/experiment/urlgetter/configurer_test.go index 8112b92441..c74c949e07 100644 --- a/internal/experiment/urlgetter/configurer_test.go +++ b/internal/experiment/urlgetter/configurer_test.go @@ -10,7 +10,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestConfigurerNewConfigurationVanilla(t *testing.T) { diff --git a/internal/experiment/urlgetter/getter.go b/internal/experiment/urlgetter/getter.go index e002211cab..dc7a3122df 100644 --- a/internal/experiment/urlgetter/getter.go +++ b/internal/experiment/urlgetter/getter.go @@ -8,7 +8,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/experiment/urlgetter/urlgetter.go b/internal/experiment/urlgetter/urlgetter.go index 3414607274..2c3bab09d8 100644 --- a/internal/experiment/urlgetter/urlgetter.go +++ b/internal/experiment/urlgetter/urlgetter.go @@ -14,7 +14,7 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/vanillator/vanillator.go b/internal/experiment/vanillator/vanillator.go index 7cb061b503..bac59671b0 100644 --- a/internal/experiment/vanillator/vanillator.go +++ b/internal/experiment/vanillator/vanillator.go @@ -13,7 +13,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/torlogs" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" "github.com/ooni/probe-cli/v3/internal/tunnel" ) diff --git a/internal/experiment/webconnectivity/httpanalysis_test.go b/internal/experiment/webconnectivity/httpanalysis_test.go index 14178353b2..c74a2b1c87 100644 --- a/internal/experiment/webconnectivity/httpanalysis_test.go +++ b/internal/experiment/webconnectivity/httpanalysis_test.go @@ -7,7 +7,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/urlgetter" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/randx" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestHTTPBodyLengthChecks(t *testing.T) { diff --git a/internal/experiment/webconnectivity/summary_test.go b/internal/experiment/webconnectivity/summary_test.go index 832b61f5ef..8d8313cd81 100644 --- a/internal/experiment/webconnectivity/summary_test.go +++ b/internal/experiment/webconnectivity/summary_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestSummarize(t *testing.T) { diff --git a/internal/experiment/webconnectivity/webconnectivity.go b/internal/experiment/webconnectivity/webconnectivity.go index 40732abcb9..1f66a52a0d 100644 --- a/internal/experiment/webconnectivity/webconnectivity.go +++ b/internal/experiment/webconnectivity/webconnectivity.go @@ -10,7 +10,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity/internal" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) const ( diff --git a/internal/experiment/webconnectivity/webconnectivity_test.go b/internal/experiment/webconnectivity/webconnectivity_test.go index 6b655ba655..fc9aa4f4fb 100644 --- a/internal/experiment/webconnectivity/webconnectivity_test.go +++ b/internal/experiment/webconnectivity/webconnectivity_test.go @@ -13,7 +13,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewExperimentMeasurer(t *testing.T) { diff --git a/internal/experiment/webconnectivitylte/testkeys.go b/internal/experiment/webconnectivitylte/testkeys.go index 454f08bc40..ec9ead7bb1 100644 --- a/internal/experiment/webconnectivitylte/testkeys.go +++ b/internal/experiment/webconnectivitylte/testkeys.go @@ -13,7 +13,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // TestKeys contains the results produced by web_connectivity. diff --git a/internal/measurex/archival.go b/internal/legacy/measurex/archival.go similarity index 100% rename from internal/measurex/archival.go rename to internal/legacy/measurex/archival.go diff --git a/internal/measurex/db.go b/internal/legacy/measurex/db.go similarity index 100% rename from internal/measurex/db.go rename to internal/legacy/measurex/db.go diff --git a/internal/measurex/dialer.go b/internal/legacy/measurex/dialer.go similarity index 100% rename from internal/measurex/dialer.go rename to internal/legacy/measurex/dialer.go diff --git a/internal/measurex/dnsx.go b/internal/legacy/measurex/dnsx.go similarity index 96% rename from internal/measurex/dnsx.go rename to internal/legacy/measurex/dnsx.go index e2da8beafa..6e6e45090a 100644 --- a/internal/measurex/dnsx.go +++ b/internal/legacy/measurex/dnsx.go @@ -11,7 +11,7 @@ import ( "time" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // WrapDNSXRoundTripper creates a new DNSXRoundTripper that diff --git a/internal/measurex/dnsx_test.go b/internal/legacy/measurex/dnsx_test.go similarity index 100% rename from internal/measurex/dnsx_test.go rename to internal/legacy/measurex/dnsx_test.go diff --git a/internal/measurex/doc.go b/internal/legacy/measurex/doc.go similarity index 100% rename from internal/measurex/doc.go rename to internal/legacy/measurex/doc.go diff --git a/internal/measurex/easy.go b/internal/legacy/measurex/easy.go similarity index 100% rename from internal/measurex/easy.go rename to internal/legacy/measurex/easy.go diff --git a/internal/measurex/endpoint.go b/internal/legacy/measurex/endpoint.go similarity index 100% rename from internal/measurex/endpoint.go rename to internal/legacy/measurex/endpoint.go diff --git a/internal/measurex/failure.go b/internal/legacy/measurex/failure.go similarity index 100% rename from internal/measurex/failure.go rename to internal/legacy/measurex/failure.go diff --git a/internal/measurex/http.go b/internal/legacy/measurex/http.go similarity index 100% rename from internal/measurex/http.go rename to internal/legacy/measurex/http.go diff --git a/internal/measurex/logger.go b/internal/legacy/measurex/logger.go similarity index 100% rename from internal/measurex/logger.go rename to internal/legacy/measurex/logger.go diff --git a/internal/measurex/measurement.go b/internal/legacy/measurex/measurement.go similarity index 100% rename from internal/measurex/measurement.go rename to internal/legacy/measurex/measurement.go diff --git a/internal/measurex/measurer.go b/internal/legacy/measurex/measurer.go similarity index 100% rename from internal/measurex/measurer.go rename to internal/legacy/measurex/measurer.go diff --git a/internal/measurex/oddity.go b/internal/legacy/measurex/oddity.go similarity index 100% rename from internal/measurex/oddity.go rename to internal/legacy/measurex/oddity.go diff --git a/internal/measurex/quic.go b/internal/legacy/measurex/quic.go similarity index 100% rename from internal/measurex/quic.go rename to internal/legacy/measurex/quic.go diff --git a/internal/measurex/resolver.go b/internal/legacy/measurex/resolver.go similarity index 98% rename from internal/measurex/resolver.go rename to internal/legacy/measurex/resolver.go index 4df8f09cbe..7aa24a8792 100644 --- a/internal/measurex/resolver.go +++ b/internal/legacy/measurex/resolver.go @@ -13,7 +13,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // WrapResolver creates a new Resolver that saves events into the WritableDB. diff --git a/internal/measurex/resolver_test.go b/internal/legacy/measurex/resolver_test.go similarity index 100% rename from internal/measurex/resolver_test.go rename to internal/legacy/measurex/resolver_test.go diff --git a/internal/measurex/tls.go b/internal/legacy/measurex/tls.go similarity index 100% rename from internal/measurex/tls.go rename to internal/legacy/measurex/tls.go diff --git a/internal/measurex/tracing.go b/internal/legacy/measurex/tracing.go similarity index 100% rename from internal/measurex/tracing.go rename to internal/legacy/measurex/tracing.go diff --git a/internal/measurex/utils.go b/internal/legacy/measurex/utils.go similarity index 100% rename from internal/measurex/utils.go rename to internal/legacy/measurex/utils.go diff --git a/internal/legacy/netx/config.go b/internal/legacy/netx/config.go index 5c2371e3a5..5f61664455 100644 --- a/internal/legacy/netx/config.go +++ b/internal/legacy/netx/config.go @@ -10,7 +10,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/bytecounter" "github.com/ooni/probe-cli/v3/internal/model" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // Config contains configuration for creating new transports, dialers, etc. When diff --git a/internal/legacy/netx/dnstransport_test.go b/internal/legacy/netx/dnstransport_test.go index 6743256753..15eca0aece 100644 --- a/internal/legacy/netx/dnstransport_test.go +++ b/internal/legacy/netx/dnstransport_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewDNSClientInvalidURL(t *testing.T) { diff --git a/internal/legacy/netx/http_test.go b/internal/legacy/netx/http_test.go index caf974a8ff..9cf2d46df5 100644 --- a/internal/legacy/netx/http_test.go +++ b/internal/legacy/netx/http_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/ooni/probe-cli/v3/internal/mocks" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewHTTPTransportWithDialer(t *testing.T) { diff --git a/internal/legacy/netx/integration_test.go b/internal/legacy/netx/integration_test.go index e204facf02..e451b67b29 100644 --- a/internal/legacy/netx/integration_test.go +++ b/internal/legacy/netx/integration_test.go @@ -8,7 +8,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/bytecounter" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestHTTPTransportWorkingAsIntended(t *testing.T) { diff --git a/internal/legacy/netx/resolver_test.go b/internal/legacy/netx/resolver_test.go index 0da181e0c6..29fce8a926 100644 --- a/internal/legacy/netx/resolver_test.go +++ b/internal/legacy/netx/resolver_test.go @@ -7,7 +7,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewResolverBogonResolutionNotBroken(t *testing.T) { diff --git a/internal/legacy/netx/tls_test.go b/internal/legacy/netx/tls_test.go index 74cf919812..831d97ac8f 100644 --- a/internal/legacy/netx/tls_test.go +++ b/internal/legacy/netx/tls_test.go @@ -8,7 +8,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" "github.com/ooni/probe-cli/v3/internal/testingx" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) func TestNewTLSDialer(t *testing.T) { diff --git a/internal/tracex/archival.go b/internal/legacy/tracex/archival.go similarity index 100% rename from internal/tracex/archival.go rename to internal/legacy/tracex/archival.go diff --git a/internal/tracex/archival_test.go b/internal/legacy/tracex/archival_test.go similarity index 100% rename from internal/tracex/archival_test.go rename to internal/legacy/tracex/archival_test.go diff --git a/internal/tracex/dialer.go b/internal/legacy/tracex/dialer.go similarity index 100% rename from internal/tracex/dialer.go rename to internal/legacy/tracex/dialer.go diff --git a/internal/tracex/dialer_test.go b/internal/legacy/tracex/dialer_test.go similarity index 100% rename from internal/tracex/dialer_test.go rename to internal/legacy/tracex/dialer_test.go diff --git a/internal/tracex/doc.go b/internal/legacy/tracex/doc.go similarity index 100% rename from internal/tracex/doc.go rename to internal/legacy/tracex/doc.go diff --git a/internal/tracex/event.go b/internal/legacy/tracex/event.go similarity index 100% rename from internal/tracex/event.go rename to internal/legacy/tracex/event.go diff --git a/internal/tracex/event_test.go b/internal/legacy/tracex/event_test.go similarity index 100% rename from internal/tracex/event_test.go rename to internal/legacy/tracex/event_test.go diff --git a/internal/tracex/http.go b/internal/legacy/tracex/http.go similarity index 100% rename from internal/tracex/http.go rename to internal/legacy/tracex/http.go diff --git a/internal/tracex/http_test.go b/internal/legacy/tracex/http_test.go similarity index 100% rename from internal/tracex/http_test.go rename to internal/legacy/tracex/http_test.go diff --git a/internal/tracex/quic.go b/internal/legacy/tracex/quic.go similarity index 100% rename from internal/tracex/quic.go rename to internal/legacy/tracex/quic.go diff --git a/internal/tracex/quic_test.go b/internal/legacy/tracex/quic_test.go similarity index 100% rename from internal/tracex/quic_test.go rename to internal/legacy/tracex/quic_test.go diff --git a/internal/tracex/resolver.go b/internal/legacy/tracex/resolver.go similarity index 100% rename from internal/tracex/resolver.go rename to internal/legacy/tracex/resolver.go diff --git a/internal/tracex/resolver_test.go b/internal/legacy/tracex/resolver_test.go similarity index 100% rename from internal/tracex/resolver_test.go rename to internal/legacy/tracex/resolver_test.go diff --git a/internal/tracex/saver.go b/internal/legacy/tracex/saver.go similarity index 100% rename from internal/tracex/saver.go rename to internal/legacy/tracex/saver.go diff --git a/internal/tracex/saver_test.go b/internal/legacy/tracex/saver_test.go similarity index 100% rename from internal/tracex/saver_test.go rename to internal/legacy/tracex/saver_test.go diff --git a/internal/tracex/tls.go b/internal/legacy/tracex/tls.go similarity index 100% rename from internal/tracex/tls.go rename to internal/legacy/tracex/tls.go diff --git a/internal/tracex/tls_test.go b/internal/legacy/tracex/tls_test.go similarity index 100% rename from internal/tracex/tls_test.go rename to internal/legacy/tracex/tls_test.go diff --git a/internal/oohelperd/dns.go b/internal/oohelperd/dns.go index dcb7e24a0e..1b8cc70830 100644 --- a/internal/oohelperd/dns.go +++ b/internal/oohelperd/dns.go @@ -12,7 +12,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/logx" "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // newfailure is a convenience shortcut to save typing. diff --git a/internal/oohelperd/http.go b/internal/oohelperd/http.go index 73d5c15f62..cdfaed1aa9 100644 --- a/internal/oohelperd/http.go +++ b/internal/oohelperd/http.go @@ -18,7 +18,7 @@ import ( "github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/runtimex" - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ) // TODO(bassosimone): we should refactor the TH to use step-by-step such that we diff --git a/internal/tutorial/experiment/torsf/chapter04/README.md b/internal/tutorial/experiment/torsf/chapter04/README.md index 7e58d13992..05048a6ed5 100644 --- a/internal/tutorial/experiment/torsf/chapter04/README.md +++ b/internal/tutorial/experiment/torsf/chapter04/README.md @@ -38,7 +38,7 @@ The `tracex` package contains code used to format internal measurements representations to the OONI data format. ```Go - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" ``` diff --git a/internal/tutorial/experiment/torsf/chapter04/torsf.go b/internal/tutorial/experiment/torsf/chapter04/torsf.go index 07cc815c28..60870808b2 100644 --- a/internal/tutorial/experiment/torsf/chapter04/torsf.go +++ b/internal/tutorial/experiment/torsf/chapter04/torsf.go @@ -41,7 +41,7 @@ import ( // measurements representations to the OONI data format. // // ```Go - "github.com/ooni/probe-cli/v3/internal/tracex" + "github.com/ooni/probe-cli/v3/internal/legacy/tracex" // ``` // diff --git a/internal/tutorial/measurex/chapter01/README.md b/internal/tutorial/measurex/chapter01/README.md index 4c04d4ab5f..c88564c6ea 100644 --- a/internal/tutorial/measurex/chapter01/README.md +++ b/internal/tutorial/measurex/chapter01/README.md @@ -50,7 +50,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter01/main.go b/internal/tutorial/measurex/chapter01/main.go index fc14d9bb6d..917814ff80 100644 --- a/internal/tutorial/measurex/chapter01/main.go +++ b/internal/tutorial/measurex/chapter01/main.go @@ -51,7 +51,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter02/README.md b/internal/tutorial/measurex/chapter02/README.md index 7edc3b2cdd..485dce784f 100644 --- a/internal/tutorial/measurex/chapter02/README.md +++ b/internal/tutorial/measurex/chapter02/README.md @@ -25,7 +25,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter02/main.go b/internal/tutorial/measurex/chapter02/main.go index d39336a692..17acb04aa3 100644 --- a/internal/tutorial/measurex/chapter02/main.go +++ b/internal/tutorial/measurex/chapter02/main.go @@ -26,7 +26,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter03/README.md b/internal/tutorial/measurex/chapter03/README.md index 0f0b4f3023..fff80e82ec 100644 --- a/internal/tutorial/measurex/chapter03/README.md +++ b/internal/tutorial/measurex/chapter03/README.md @@ -25,7 +25,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter03/main.go b/internal/tutorial/measurex/chapter03/main.go index b309980100..75425e354f 100644 --- a/internal/tutorial/measurex/chapter03/main.go +++ b/internal/tutorial/measurex/chapter03/main.go @@ -26,7 +26,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter04/README.md b/internal/tutorial/measurex/chapter04/README.md index 5f0664e417..c308a126a7 100644 --- a/internal/tutorial/measurex/chapter04/README.md +++ b/internal/tutorial/measurex/chapter04/README.md @@ -25,7 +25,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter04/main.go b/internal/tutorial/measurex/chapter04/main.go index 25295eafbd..93d1e9b4b2 100644 --- a/internal/tutorial/measurex/chapter04/main.go +++ b/internal/tutorial/measurex/chapter04/main.go @@ -26,7 +26,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter05/README.md b/internal/tutorial/measurex/chapter05/README.md index 5e107d26d3..7c5cb44684 100644 --- a/internal/tutorial/measurex/chapter05/README.md +++ b/internal/tutorial/measurex/chapter05/README.md @@ -31,7 +31,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter05/main.go b/internal/tutorial/measurex/chapter05/main.go index 75c4fe4cb6..5d0219eee1 100644 --- a/internal/tutorial/measurex/chapter05/main.go +++ b/internal/tutorial/measurex/chapter05/main.go @@ -32,7 +32,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter06/README.md b/internal/tutorial/measurex/chapter06/README.md index 3184b88646..bc38714a15 100644 --- a/internal/tutorial/measurex/chapter06/README.md +++ b/internal/tutorial/measurex/chapter06/README.md @@ -35,7 +35,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter06/main.go b/internal/tutorial/measurex/chapter06/main.go index c242d1003e..94926e5899 100644 --- a/internal/tutorial/measurex/chapter06/main.go +++ b/internal/tutorial/measurex/chapter06/main.go @@ -36,7 +36,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter07/README.md b/internal/tutorial/measurex/chapter07/README.md index 2adefae5dc..0fbc61b2e7 100644 --- a/internal/tutorial/measurex/chapter07/README.md +++ b/internal/tutorial/measurex/chapter07/README.md @@ -24,7 +24,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter07/main.go b/internal/tutorial/measurex/chapter07/main.go index 19172481d5..94b2f47bca 100644 --- a/internal/tutorial/measurex/chapter07/main.go +++ b/internal/tutorial/measurex/chapter07/main.go @@ -25,7 +25,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter08/README.md b/internal/tutorial/measurex/chapter08/README.md index 4a7e2364f4..64df7a41c3 100644 --- a/internal/tutorial/measurex/chapter08/README.md +++ b/internal/tutorial/measurex/chapter08/README.md @@ -29,7 +29,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter08/main.go b/internal/tutorial/measurex/chapter08/main.go index 6b586ddd9e..c37582d9a3 100644 --- a/internal/tutorial/measurex/chapter08/main.go +++ b/internal/tutorial/measurex/chapter08/main.go @@ -30,7 +30,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter09/README.md b/internal/tutorial/measurex/chapter09/README.md index 1f4a26f1bf..a696c9861d 100644 --- a/internal/tutorial/measurex/chapter09/README.md +++ b/internal/tutorial/measurex/chapter09/README.md @@ -39,7 +39,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter09/main.go b/internal/tutorial/measurex/chapter09/main.go index 94162f19c1..a323753e87 100644 --- a/internal/tutorial/measurex/chapter09/main.go +++ b/internal/tutorial/measurex/chapter09/main.go @@ -40,7 +40,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter10/README.md b/internal/tutorial/measurex/chapter10/README.md index a7c4f42f74..ede0c019d8 100644 --- a/internal/tutorial/measurex/chapter10/README.md +++ b/internal/tutorial/measurex/chapter10/README.md @@ -28,7 +28,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter10/main.go b/internal/tutorial/measurex/chapter10/main.go index 7a72589ef5..3d46a209c5 100644 --- a/internal/tutorial/measurex/chapter10/main.go +++ b/internal/tutorial/measurex/chapter10/main.go @@ -29,7 +29,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter11/README.md b/internal/tutorial/measurex/chapter11/README.md index 0c0fec526c..2824c7db62 100644 --- a/internal/tutorial/measurex/chapter11/README.md +++ b/internal/tutorial/measurex/chapter11/README.md @@ -30,7 +30,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter11/main.go b/internal/tutorial/measurex/chapter11/main.go index 9df5a8edc1..5c39f05f3b 100644 --- a/internal/tutorial/measurex/chapter11/main.go +++ b/internal/tutorial/measurex/chapter11/main.go @@ -31,7 +31,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter12/README.md b/internal/tutorial/measurex/chapter12/README.md index 07d4debec8..ba7be38de5 100644 --- a/internal/tutorial/measurex/chapter12/README.md +++ b/internal/tutorial/measurex/chapter12/README.md @@ -27,7 +27,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter12/main.go b/internal/tutorial/measurex/chapter12/main.go index 8c4a06407b..7c90136639 100644 --- a/internal/tutorial/measurex/chapter12/main.go +++ b/internal/tutorial/measurex/chapter12/main.go @@ -28,7 +28,7 @@ import ( "fmt" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter14/README.md b/internal/tutorial/measurex/chapter14/README.md index 54b45be413..9c38fbff05 100644 --- a/internal/tutorial/measurex/chapter14/README.md +++ b/internal/tutorial/measurex/chapter14/README.md @@ -24,7 +24,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/measurex/chapter14/main.go b/internal/tutorial/measurex/chapter14/main.go index e7eb99563d..fa1dfe958c 100644 --- a/internal/tutorial/measurex/chapter14/main.go +++ b/internal/tutorial/measurex/chapter14/main.go @@ -25,7 +25,7 @@ import ( "net/url" "time" - "github.com/ooni/probe-cli/v3/internal/measurex" + "github.com/ooni/probe-cli/v3/internal/legacy/measurex" "github.com/ooni/probe-cli/v3/internal/runtimex" ) diff --git a/internal/tutorial/netxlite/chapter04/README.md b/internal/tutorial/netxlite/chapter04/README.md index 4cd709b94b..65820b088c 100644 --- a/internal/tutorial/netxlite/chapter04/README.md +++ b/internal/tutorial/netxlite/chapter04/README.md @@ -104,7 +104,7 @@ QUIC code to be of the same type of the ConnectionState that we returned in the previous chapters. ```Go - return qconn, qconn.ConnectionState().TLS.ConnectionState, nil + return qconn, qconn.ConnectionState().TLS, nil } ``` diff --git a/internal/tutorial/netxlite/chapter08/README.md b/internal/tutorial/netxlite/chapter08/README.md index 027898cdd2..646f12b192 100644 --- a/internal/tutorial/netxlite/chapter08/README.md +++ b/internal/tutorial/netxlite/chapter08/README.md @@ -110,7 +110,7 @@ func dialQUIC(ctx context.Context, address string, if err != nil { return nil, tls.ConnectionState{}, err } - return qconn, qconn.ConnectionState().TLS.ConnectionState, nil + return qconn, qconn.ConnectionState().TLS, nil } func fatal(err error) {