Add test for log context

Author: davecrighton

internal/events/webhooks/webhooks_test.go

@@ -40,10 +40,12 @@ import (
 	"github.com/hyperledger/firefly-common/pkg/ffresty"
 	"github.com/hyperledger/firefly-common/pkg/fftls"
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
+	fflog "github.com/hyperledger/firefly-common/pkg/log"
 	"github.com/hyperledger/firefly/internal/coreconfig"
 	"github.com/hyperledger/firefly/mocks/eventsmocks"
 	"github.com/hyperledger/firefly/pkg/core"
 	"github.com/hyperledger/firefly/pkg/events"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
@@ -470,14 +472,10 @@ func TestRequestWithBodyReplyEndToEndWithTLS(t *testing.T) {
 
 	ctx, cancelCtx := context.WithCancel(context.Background())
 	go func() {
-		select {
-		case <-ctx.Done():
-			shutdownContext, cancel := context.WithTimeout(context.Background(), 2*time.Second)
-			defer cancel()
-			if err := server.Shutdown(shutdownContext); err != nil {
-				return
-			}
-		}
+		<-ctx.Done()
+		shutdownContext, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+		defer cancel()
+		_ = server.Shutdown(shutdownContext)
 	}()
 
 	server.Handler = r
@@ -1490,3 +1488,68 @@ func TestRequestWithBodyReplyEndToEndWithBatch(t *testing.T) {
 func TestFirstDataNeverNil(t *testing.T) {
 	assert.NotNil(t, (&whPayload{}).firstData())
 }
+
+// testHook captures logrus entries for assertions
+type testHook struct{ entries []*logrus.Entry }
+
+func (h *testHook) Levels() []logrus.Level { return logrus.AllLevels }
+func (h *testHook) Fire(e *logrus.Entry) error {
+	h.entries = append(h.entries, e)
+	return nil
+}
+
+func TestLoggingContextPreserved(t *testing.T) {
+	wh, cancel := newTestWebHooks(t)
+	defer cancel()
+
+	// Capture logs at debug level
+	logger := logrus.StandardLogger()
+	origHooks := logger.Hooks
+	hook := &testHook{}
+	logger.AddHook(hook)
+	logrus.SetLevel(logrus.DebugLevel)
+	defer logger.ReplaceHooks(origHooks)
+
+	// Minimal HTTP server to exercise delivery path
+	r := mux.NewRouter()
+	r.HandleFunc("/ping", func(res http.ResponseWriter, req *http.Request) {
+		res.WriteHeader(200)
+		_, _ = res.Write([]byte(`ok`))
+	}).Methods(http.MethodPost)
+	server := httptest.NewServer(r)
+	defer server.Close()
+
+	sub := &core.Subscription{
+		SubscriptionRef: core.SubscriptionRef{Namespace: "ns1"},
+	}
+	to := sub.Options.TransportOptions()
+	to["url"] = fmt.Sprintf("http://%s/ping", server.Listener.Addr())
+	// Ensure we log via buildPayload/attemptRequest path
+	event := &core.EventDelivery{
+		EnrichedEvent: core.EnrichedEvent{Event: core.Event{ID: fftypes.NewUUID()}},
+		Subscription:  core.SubscriptionRef{ID: sub.ID},
+	}
+
+	parentCtx := fflog.WithLogField(context.Background(), "httpReq", "req-123")
+
+	// Expect the DeliveryResponse callback invoked along the non-reply path
+	mcb := wh.callbacks.handlers["ns1"].(*eventsmocks.Callbacks)
+	mcb.On("DeliveryResponse", mock.Anything, mock.MatchedBy(func(resp *core.EventDeliveryResponse) bool {
+		return !resp.Rejected
+	})).Return(nil)
+
+	err := wh.DeliveryRequest(parentCtx, mock.Anything, sub, event, nil)
+	assert.NoError(t, err)
+
+	// Find any log entry with the preserved fields
+	found := false
+	for _, e := range hook.entries {
+		if e.Data["httpReq"] == "req-123" && e.Data["webhook"] != nil {
+			found = true
+			break
+		}
+	}
+	assert.True(t, found, "expected log entry with preserved httpReq and webhook fields")
+
+	mcb.AssertExpectations(t)
+}