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
44 lines
1.2 KiB
Go
44 lines
1.2 KiB
Go
// Package oldhttptransport contains HTTP transport extensions. Here we
|
|
// define a http.Transport that emits events.
|
|
package oldhttptransport
|
|
|
|
import (
|
|
"net/http"
|
|
)
|
|
|
|
// Transport performs single HTTP transactions and emits
|
|
// measurement events as they happen.
|
|
type Transport struct {
|
|
roundTripper http.RoundTripper
|
|
}
|
|
|
|
// New creates a new Transport.
|
|
func New(roundTripper http.RoundTripper) *Transport {
|
|
return &Transport{
|
|
roundTripper: NewTransactioner(NewBodyTracer(
|
|
NewTraceTripper(roundTripper))),
|
|
}
|
|
}
|
|
|
|
// RoundTrip executes a single HTTP transaction, returning
|
|
// a Response for the provided Request.
|
|
func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
|
|
// Make sure we're not sending Go's default User-Agent
|
|
// if the user has configured no user agent
|
|
if req.Header.Get("User-Agent") == "" {
|
|
req.Header["User-Agent"] = nil
|
|
}
|
|
return t.roundTripper.RoundTrip(req)
|
|
}
|
|
|
|
// CloseIdleConnections closes the idle connections.
|
|
func (t *Transport) CloseIdleConnections() {
|
|
// Adapted from net/http code
|
|
type closeIdler interface {
|
|
CloseIdleConnections()
|
|
}
|
|
if tr, ok := t.roundTripper.(closeIdler); ok {
|
|
tr.CloseIdleConnections()
|
|
}
|
|
}
|