From 68e6d08c768b789987a753d42f66caf73ce10ee1 Mon Sep 17 00:00:00 2001 From: Daenney Date: Fri, 17 Feb 2023 12:02:29 +0100 Subject: [feature] Add a request ID and include it in logs (#1476) This adds a lightweight form of tracing to GTS. Each incoming request is assigned a Request ID which we then pass on and log in all our log lines. Any function that gets called downstream from an HTTP handler should now emit a requestID=value pair whenever it logs something. Co-authored-by: kim --- internal/processing/admin/createdomainblock.go | 7 ++++--- internal/processing/admin/mediarefetch.go | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'internal/processing/admin') diff --git a/internal/processing/admin/createdomainblock.go b/internal/processing/admin/createdomainblock.go index 1c80ee78f..5c3542f79 100644 --- a/internal/processing/admin/createdomainblock.go +++ b/internal/processing/admin/createdomainblock.go @@ -89,9 +89,10 @@ func (p *processor) DomainBlockCreate(ctx context.Context, account *gtsmodel.Acc // 2. Delete the instance account for that instance if it exists. // 3. Select all accounts from this instance and pass them through the delete functionality of the processor. func (p *processor) initiateDomainBlockSideEffects(ctx context.Context, account *gtsmodel.Account, block *gtsmodel.DomainBlock) { - l := log.WithFields(kv.Fields{ - {"domain", block.Domain}, - }...) + l := log.WithContext(ctx). + WithFields(kv.Fields{ + {"domain", block.Domain}, + }...) l.Debug("processing domain block side effects") diff --git a/internal/processing/admin/mediarefetch.go b/internal/processing/admin/mediarefetch.go index 6bb068d58..a73580d98 100644 --- a/internal/processing/admin/mediarefetch.go +++ b/internal/processing/admin/mediarefetch.go @@ -35,12 +35,12 @@ func (p *processor) MediaRefetch(ctx context.Context, requestingAccount *gtsmode } go func() { - log.Info("starting emoji refetch") + log.Info(ctx, "starting emoji refetch") refetched, err := p.mediaManager.RefetchEmojis(context.Background(), domain, transport.DereferenceMedia) if err != nil { - log.Errorf("error refetching emojis: %s", err) + log.Errorf(ctx, "error refetching emojis: %s", err) } else { - log.Infof("refetched %d emojis from remote", refetched) + log.Infof(ctx, "refetched %d emojis from remote", refetched) } }() -- cgit v1.2.3