refactor(httpapi): logger belongs to endpoint

This diff changes httpapi Endpoint and Descriptor such that the
logger field is part of the Endpoint rather than Descriptor.

This changes makes sense because the logger to use should be the
same for every API call. What matters, instead, is whether to log
bodies, which remains a property of the API Descriptor.

While I authored this diff originally as part of the work done
in #997, it seems it's
required in #1002 as well.

Hence, the reference issue is ooni/probe#2379.

internal/engine/experiment/webconnectivity/control.go

@@ -24,8 +24,8 @@ func Control(
 	ctx context.Context, sess model.ExperimentSession,
 	testhelpers []model.OOAPIService, creq ControlRequest) (ControlResponse, *model.OOAPIService, error) {
 	seqCaller := httpapi.NewSequenceCaller(
-		httpapi.MustNewPOSTJSONWithJSONResponseDescriptor(sess.Logger(), "/", creq).WithBodyLogging(true),
-		httpapi.NewEndpointList(sess.DefaultHTTPClient(), sess.UserAgent(), testhelpers...)...,
+		httpapi.MustNewPOSTJSONWithJSONResponseDescriptor("/", creq).WithBodyLogging(true),
+		httpapi.NewEndpointList(sess.DefaultHTTPClient(), sess.Logger(), sess.UserAgent(), testhelpers...)...,
 	)
 	sess.Logger().Infof("control for %s...", creq.HTTPRequest)
 	var out ControlResponse

internal/experiment/webconnectivity/control.go

@@ -110,8 +110,8 @@ func (c *Control) Run(parentCtx context.Context) {
 
 	// create an httpapi sequence caller
 	seqCaller := httpapi.NewSequenceCaller(
-		httpapi.MustNewPOSTJSONWithJSONResponseDescriptor(c.Logger, "/", creq).WithBodyLogging(true),
-		httpapi.NewEndpointList(c.Session.DefaultHTTPClient(), c.Session.UserAgent(), c.TestHelpers...)...,
+		httpapi.MustNewPOSTJSONWithJSONResponseDescriptor("/", creq).WithBodyLogging(true),
+		httpapi.NewEndpointList(c.Session.DefaultHTTPClient(), c.Logger, c.Session.UserAgent(), c.TestHelpers...)...,
 	)
 
 	// issue the control request and wait for the response

internal/httpapi/call.go

@@ -48,9 +48,9 @@ func newRequest(ctx context.Context, endpoint *Endpoint, desc *Descriptor) (*htt
 	var reqBody io.Reader
 	if len(desc.RequestBody) > 0 {
 		reqBody = bytes.NewReader(desc.RequestBody)
-		desc.Logger.Debugf("httpapi: request body length: %d", len(desc.RequestBody))
+		endpoint.Logger.Debugf("httpapi: request body length: %d", len(desc.RequestBody))
 		if desc.LogBody {
-			desc.Logger.Debugf("httpapi: request body: %s", string(desc.RequestBody))
+			endpoint.Logger.Debugf("httpapi: request body: %s", string(desc.RequestBody))
 		}
 	}
 	request, err := http.NewRequestWithContext(ctx, desc.Method, URL.String(), reqBody)
@@ -120,9 +120,9 @@ func docall(endpoint *Endpoint, desc *Descriptor, request *http.Request) (*http.
 	if err != nil {
 		return response, nil, &errMaybeCensorship{err}
 	}
-	desc.Logger.Debugf("httpapi: response body length: %d bytes", len(data))
+	endpoint.Logger.Debugf("httpapi: response body length: %d bytes", len(data))
 	if desc.LogBody {
-		desc.Logger.Debugf("httpapi: response body: %s", string(data))
+		endpoint.Logger.Debugf("httpapi: response body: %s", string(data))
 	}
 	if response.StatusCode >= 400 {
 		return response, nil, &ErrHTTPRequestFailed{response.StatusCode}
@@ -174,7 +174,7 @@ func CallWithJSONResponse(ctx context.Context, desc *Descriptor, endpoint *Endpo
 		return err
 	}
 	if ctype := httpResp.Header.Get("Content-Type"); !goodContentTypeForJSON[ctype] {
-		desc.Logger.Warnf("httpapi: unexpected content-type: %s", ctype)
+		endpoint.Logger.Warnf("httpapi: unexpected content-type: %s", ctype)
 		// fallthrough
 	}
 	return json.Unmarshal(rawRespBody, response)