Enhanced logging for webhooks

Signed-off-by: Peter Broadhurst <[email protected]>

Author: peterbroadhurst

internal/events/webhooks/webhooks.go

@@ -63,12 +63,13 @@ type whResponse struct {
 func (wh *WebHooks) Name() string { return "webhooks" }
 
 func (wh *WebHooks) Init(ctx context.Context, config config.Section) (err error) {
+	connID := fftypes.ShortID()
 	*wh = WebHooks{
-		ctx:          ctx,
+		ctx:          log.WithLogField(ctx, "webhook", wh.connID),
 		capabilities: &events.Capabilities{},
 		callbacks:    make(map[string]events.Callbacks),
 		client:       ffresty.New(ctx, config),
-		connID:       fftypes.ShortID(),
+		connID:       connID,
 	}
 	return nil
 }
@@ -85,7 +86,9 @@ func (wh *WebHooks) Capabilities() *events.Capabilities {
 
 func (wh *WebHooks) buildRequest(options fftypes.JSONObject, firstData fftypes.JSONObject) (req *whRequest, err error) {
 	req = &whRequest{
-		r:         wh.client.R().SetDoNotParseResponse(true),
+		r: wh.client.R().
+			SetDoNotParseResponse(true).
+			SetContext(wh.ctx),
 		url:       options.GetString("url"),
 		method:    options.GetString("method"),
 		forceJSON: options.GetBool("json"),
@@ -223,8 +226,10 @@ func (wh *WebHooks) attemptRequest(sub *core.Subscription, event *core.EventDeli
 		}
 	}
 
+	log.L(wh.ctx).Debugf("Webhook-> %s %s event %s on subscription %s", req.method, req.url, event.ID, sub.ID)
 	resp, err := req.r.Execute(req.method, req.url)
 	if err != nil {
+		log.L(wh.ctx).Errorf("Webhook<-! %s %s event %s on subscription %s failed: %s", req.method, req.url, event.ID, sub.ID, err)
 		return nil, nil, err
 	}
 	defer func() { _ = resp.RawBody().Close() }()
@@ -233,6 +238,7 @@ func (wh *WebHooks) attemptRequest(sub *core.Subscription, event *core.EventDeli
 		Status:  resp.StatusCode(),
 		Headers: fftypes.JSONObject{},
 	}
+	log.L(wh.ctx).Infof("Webhook<- %s %s event %s on subscription %s returned %d", req.method, req.url, event.ID, sub.ID, res.Status)
 	header := resp.Header()
 	for h := range header {
 		res.Headers[h] = header.Get(h)
@@ -292,6 +298,7 @@ func (wh *WebHooks) doDelivery(connID string, reply bool, sub *core.Subscription
 			txType = fftypes.FFEnum(strings.ToLower(req.replyTx))
 		}
 		if cb, ok := wh.callbacks[sub.Namespace]; ok {
+			log.L(wh.ctx).Tracef("Sending reply message in response to webhook message %s", event.Message.Header.ID)
 			cb.DeliveryResponse(connID, &core.EventDeliveryResponse{
 				ID:           event.ID,
 				Rejected:     false,