From b93dc201db098a7ac6307fb3c42ed05ed76be8fe Mon Sep 17 00:00:00 2001 From: Himadri Singh Date: Thu, 4 Dec 2025 21:33:49 +0530 Subject: [PATCH] job_kind name consistent matching ``` { "caller": "jobexecutor/job_executor.go:341", "level": "error", "job_id": 69807, "error": "failed to delete github ", "job_kind": "delete_unused_github_repos", "ts": "2025-12-04T00:00:17.869Z" } ``` --- admin/jobs/river/river.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/jobs/river/river.go b/admin/jobs/river/river.go index 2362603688c..dde6ff8700a 100644 --- a/admin/jobs/river/river.go +++ b/admin/jobs/river/river.go @@ -805,7 +805,7 @@ func (h *ErrorHandler) HandleError(ctx context.Context, job *rivertype.JobRow, e if job.Attempt >= job.MaxAttempts { var args string _ = json.Unmarshal(job.EncodedArgs, &args) // ignore parse errors - h.logger.Error("Job failed, max attempts reached", zap.Int64("job_id", job.ID), zap.Int("num_attempt", job.Attempt), zap.Int("max_attempts", job.MaxAttempts), zap.String("kind", job.Kind), zap.String("args", args), zap.Error(err)) + h.logger.Error("Job failed, max attempts reached", zap.Int64("job_id", job.ID), zap.Int("num_attempt", job.Attempt), zap.Int("max_attempts", job.MaxAttempts), zap.String("job_kind", job.Kind), zap.String("args", args), zap.Error(err)) } return nil } @@ -813,7 +813,7 @@ func (h *ErrorHandler) HandleError(ctx context.Context, job *rivertype.JobRow, e func (h *ErrorHandler) HandlePanic(ctx context.Context, job *rivertype.JobRow, panicVal any, trace string) *river.ErrorHandlerResult { var args string _ = json.Unmarshal(job.EncodedArgs, &args) // ignore parse errors - h.logger.Error("Job panicked", zap.Int64("job_id", job.ID), zap.String("kind", job.Kind), zap.String("args", args), zap.Any("panic_val", panicVal), zap.String("trace", trace)) + h.logger.Error("Job panicked", zap.Int64("job_id", job.ID), zap.String("job_kind", job.Kind), zap.String("args", args), zap.Any("panic_val", panicVal), zap.String("trace", trace)) // Set the job to be immediately cancelled return &river.ErrorHandlerResult{SetCancelled: true} } @@ -845,13 +845,13 @@ func work(ctx context.Context, logger *zap.Logger, name string, fn func(context. defer span.End() start := time.Now() - logger.Info("job started", zap.String("name", name), observability.ZapCtx(ctx)) + logger.Info("job started", zap.String("job_kind", name), observability.ZapCtx(ctx)) err := fn(ctx) jobLatencyHistogram.Record(ctx, time.Since(start).Milliseconds(), metric.WithAttributes(attribute.String("name", name), attribute.Bool("failed", err != nil))) if err != nil { - logger.Error("job failed", zap.String("name", name), zap.Error(err), zap.Duration("duration", time.Since(start)), observability.ZapCtx(ctx)) + logger.Error("job failed", zap.String("job_kind", name), zap.Error(err), zap.Duration("duration", time.Since(start)), observability.ZapCtx(ctx)) return err } - logger.Info("job completed", zap.String("name", name), zap.Duration("duration", time.Since(start)), observability.ZapCtx(ctx)) + logger.Info("job completed", zap.String("job_kind", name), zap.Duration("duration", time.Since(start)), observability.ZapCtx(ctx)) return nil }