refactor: rename sessionresolver engineresolver

internal/engine/session.go

@@ -14,14 +14,14 @@ import (
 	"github.com/ooni/probe-cli/v3/internal/bytecounter"
 	"github.com/ooni/probe-cli/v3/internal/checkincache"
 	"github.com/ooni/probe-cli/v3/internal/enginelocate"
+	"github.com/ooni/probe-cli/v3/internal/engineresolver"
 	"github.com/ooni/probe-cli/v3/internal/kvstore"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 	"github.com/ooni/probe-cli/v3/internal/platform"
 	"github.com/ooni/probe-cli/v3/internal/probeservices"
 	"github.com/ooni/probe-cli/v3/internal/registry"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"
-	"github.com/ooni/probe-cli/v3/internal/sessionresolver"
 	"github.com/ooni/probe-cli/v3/internal/tunnel"
 	"github.com/ooni/probe-cli/v3/internal/version"
 )
@@ -64,7 +64,7 @@ type Session struct {
 	logger                   model.Logger
 	proxyURL                 *url.URL
 	queryProbeServicesCount  *atomic.Int64
-	resolver                 *sessionresolver.Resolver
+	resolver                 *engineresolver.Resolver
 	selectedProbeServiceHook func(*model.OOAPIService)
 	selectedProbeService     *model.OOAPIService
 	softwareName             string
@@ -132,8 +132,8 @@ type sessionProbeServicesClientForCheckIn interface {
 //
 // 5. Create a compound resolver for the session that will attempt
 // to use a bunch of DoT/DoH servers before falling back to the system
-// resolver if nothing else works (see the sessionresolver pkg). This
-// sessionresolver will be using the configured proxy, if any.
+// resolver if nothing else works (see the engineresolver pkg). This
+// engineresolver will be using the configured proxy, if any.
 //
 // 6. Create the default HTTP transport that we should be using when
 // we communicate with the OONI backends. This transport will be
@@ -208,7 +208,7 @@ func NewSession(ctx context.Context, config SessionConfig) (*Session, error) {
 		}
 	}
 	sess.proxyURL = proxyURL
-	sess.resolver = &sessionresolver.Resolver{
+	sess.resolver = &engineresolver.Resolver{
 		ByteCounter: sess.byteCounter,
 		KVStore:     config.KVStore,
 		Logger:      sess.logger,

internal/sessionresolver/doc.go → internal/engineresolver/doc.go

@@ -1,4 +1,4 @@
-// Package sessionresolver contains the resolver used by the session. This
+// Package engineresolver contains the resolver used by the OONI engine. This
 // resolver will try to figure out which is the best service for running
 // domain name resolutions and will consistently use it.
 //
@@ -21,4 +21,4 @@
 // We also support a socks5 proxy. When such a proxy is configured,
 // the code WILL skip http3 resolvers AS WELL AS the system
 // resolver, in an attempt to avoid leaking your queries.
-package sessionresolver
+package engineresolver

internal/sessionresolver/errwrapper.go → internal/engineresolver/errwrapper.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 //
 // Error wrapping

internal/sessionresolver/errwrapper_test.go → internal/engineresolver/errwrapper_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"errors"

internal/sessionresolver/factory.go → internal/engineresolver/factory.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"errors"

internal/sessionresolver/factory_test.go → internal/engineresolver/factory_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"context"

internal/sessionresolver/integration_test.go → internal/engineresolver/integration_test.go

@@ -1,18 +1,18 @@
-package sessionresolver_test
+package engineresolver_test
 
 import (
 	"context"
 	"testing"
 
+	"github.com/ooni/probe-cli/v3/internal/engineresolver"
 	"github.com/ooni/probe-cli/v3/internal/kvstore"
-	"github.com/ooni/probe-cli/v3/internal/sessionresolver"
 )
 
 func TestSessionResolverGood(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skip test in short mode")
 	}
-	reso := &sessionresolver.Resolver{
+	reso := &engineresolver.Resolver{
 		KVStore: &kvstore.Memory{},
 	}
 	defer reso.CloseIdleConnections()

internal/sessionresolver/jsoncodec.go → internal/engineresolver/jsoncodec.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 //
 // JSON codec

internal/sessionresolver/jsoncodec_test.go → internal/engineresolver/jsoncodec_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"testing"

internal/sessionresolver/lookup.go → internal/engineresolver/lookup.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 //
 // Actual lookup code

internal/sessionresolver/lookup_test.go → internal/engineresolver/lookup_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"context"

internal/sessionresolver/resolver.go → internal/engineresolver/resolver.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 //
 // Implementation of model.Resolver

internal/sessionresolver/resolver_test.go → internal/engineresolver/resolver_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"context"

internal/sessionresolver/resolvermaker.go → internal/engineresolver/resolvermaker.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 //
 // High-level code for creating a new child resolver

internal/sessionresolver/resolvermaker_test.go → internal/engineresolver/resolvermaker_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"strings"

internal/sessionresolver/state.go → internal/engineresolver/state.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 //
 // Persistent on-disk state
@@ -9,6 +9,9 @@ import (
 	"sort"
 )
 
+// TODO(bassosimone): we may want to change the key and rename or
+// remove the old file inside the statedir
+
 // storekey is the key used by the key value store to store
 // the state required by this package.
 const storekey = "sessionresolver.state"

internal/sessionresolver/state_test.go → internal/engineresolver/state_test.go

@@ -1,4 +1,4 @@
-package sessionresolver
+package engineresolver
 
 import (
 	"errors"