d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
31 lines
872 B
Go
31 lines
872 B
Go
package resolver
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/dialid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/transactionid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
)
|
|
|
|
// ErrorWrapperResolver is a Resolver that knows about wrapping errors.
|
|
type ErrorWrapperResolver struct {
|
|
Resolver
|
|
}
|
|
|
|
// LookupHost implements Resolver.LookupHost
|
|
func (r ErrorWrapperResolver) LookupHost(ctx context.Context, hostname string) ([]string, error) {
|
|
dialID := dialid.ContextDialID(ctx)
|
|
txID := transactionid.ContextTransactionID(ctx)
|
|
addrs, err := r.Resolver.LookupHost(ctx, hostname)
|
|
err = errorx.SafeErrWrapperBuilder{
|
|
DialID: dialID,
|
|
Error: err,
|
|
Operation: errorx.ResolveOperation,
|
|
TransactionID: txID,
|
|
}.MaybeBuild()
|
|
return addrs, err
|
|
}
|
|
|
|
var _ Resolver = ErrorWrapperResolver{}
|