[chore] Update more log calls to include context (#1517)

In #1476 we updated log.WithFields() but we forgot about
log.WithField(). Also updates a few explicit log.Entry{} creations.

6 files changed, 10 insertions, 6 deletions

diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go
index f5cee2088..d3e227a10 100644
--- a/internal/federation/federatingdb/accept.go
+++ b/internal/federation/federatingdb/accept.go
@@ -39,7 +39,8 @@ func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsA
 		if err != nil {
 			return err
 		}
-		l := log.WithField("accept", i)
+		l := log.WithContext(ctx).
+			WithField("accept", i)
 		l.Debug("entering Accept")
 	}
 
diff --git a/internal/federation/federatingdb/announce.go b/internal/federation/federatingdb/announce.go
index 0768077ee..f4d145148 100644
--- a/internal/federation/federatingdb/announce.go
+++ b/internal/federation/federatingdb/announce.go
@@ -35,7 +35,8 @@ func (f *federatingDB) Announce(ctx context.Context, announce vocab.ActivityStre
 		if err != nil {
 			return err
 		}
-		l := log.WithField("announce", i)
+		l := log.WithContext(ctx).
+			WithField("announce", i)
 		l.Debug("entering Announce")
 	}
 
diff --git a/internal/federation/federatingdb/reject.go b/internal/federation/federatingdb/reject.go
index 7dbd4fda6..3c3cd7c75 100644
--- a/internal/federation/federatingdb/reject.go
+++ b/internal/federation/federatingdb/reject.go
@@ -38,7 +38,8 @@ func (f *federatingDB) Reject(ctx context.Context, reject vocab.ActivityStreamsR
 		if err != nil {
 			return err
 		}
-		l := log.WithField("reject", i)
+		l := log.WithContext(ctx).
+			WithField("reject", i)
 		l.Debug("entering Reject")
 	}
 
diff --git a/internal/federation/federatingdb/undo.go b/internal/federation/federatingdb/undo.go
index 913befe93..b239aabb4 100644
--- a/internal/federation/federatingdb/undo.go
+++ b/internal/federation/federatingdb/undo.go
@@ -32,7 +32,7 @@ import (
 )
 
 func (f *federatingDB) Undo(ctx context.Context, undo vocab.ActivityStreamsUndo) error {
-	l := log.Entry{}
+	l := log.Entry{}.WithContext(ctx)
 
 	if log.Level() >= level.DEBUG {
 		i, err := marshalItem(undo)
diff --git a/internal/federation/federatingdb/update.go b/internal/federation/federatingdb/update.go
index 04ce39a77..570729a31 100644
--- a/internal/federation/federatingdb/update.go
+++ b/internal/federation/federatingdb/update.go
@@ -42,7 +42,7 @@ import (
 //
 // The library makes this call only after acquiring a lock first.
 func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
-	l := log.Entry{}
+	l := log.Entry{}.WithContext(ctx)
 
 	if log.Level() >= level.DEBUG {
 		i, err := marshalItem(asType)
diff --git a/internal/federation/federatingdb/util.go b/internal/federation/federatingdb/util.go
index 1eb27dc03..64f32d39c 100644
--- a/internal/federation/federatingdb/util.go
+++ b/internal/federation/federatingdb/util.go
@@ -69,7 +69,8 @@ func (f *federatingDB) NewID(ctx context.Context, t vocab.Type) (idURL *url.URL,
 		if err != nil {
 			return nil, err
 		}
-		l := log.WithField("newID", i)
+		l := log.WithContext(ctx).
+			WithField("newID", i)
 		l.Debug("entering NewID")
 	}