initial implementation of RequestLoggerContext and example usage in ProvisionerJobs logs

ibetitsmike · ibetitsmike · commit 0e397edf6197 · 2025-04-07T09:45:46.000Z
diff --git a/coderd/httpmw/logger.go b/coderd/httpmw/logger.go
@@ -35,7 +35,14 @@ func Logger(log slog.Logger) func(next http.Handler) http.Handler {
 				slog.F("start", start),
 			)
 
-			next.ServeHTTP(sw, r)
+			logContext := &RequestLoggerContext{}
+			defer func() {
+				logContext.WriteLog(r.Context(), "", sw.Status)
+			}()
+
+			ctx := context.WithValue(r.Context(), logContextKey{}, logContext)
+
+			next.ServeHTTP(sw, r.WithContext(ctx))
 
 			end := time.Now()
 
@@ -74,3 +81,37 @@ func Logger(log slog.Logger) func(next http.Handler) http.Handler {
 		})
 	}
 }
+
+type RequestLoggerContext struct {
+	Fields map[string]any
+
+	log     *slog.Logger
+	written bool
+}
+
+func (c *RequestLoggerContext) WriteLog(ctx context.Context, msg string, status int) {
+	if c.written {
+		return
+	}
+	c.written = true
+	// append extra fields to the logger
+	for k, v := range c.Fields {
+		c.log.With(slog.F(k, v))
+	}
+
+	if status >= http.StatusInternalServerError {
+		c.log.Error(ctx, msg)
+	} else {
+		c.log.Debug(ctx, msg)
+	}
+}
+
+type logContextKey struct{}
+
+func FromContext(ctx context.Context) *RequestLoggerContext {
+	val := ctx.Value(logContextKey{})
+	if logCtx, ok := val.(*RequestLoggerContext); ok {
+		return logCtx
+	}
+	return nil
+}
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -554,6 +554,10 @@ func (f *logFollower) follow() {
 		return
 	}
 
+	// write the initial logs to the connection
+	httpmw.FromContext(f.ctx).WriteLog(
+		f.ctx, "ProvisionerJobs log follower WS connection established", http.StatusAccepted)
+
 	// no need to wait if the job is done
 	if f.complete {
 		return
