Apr 8, 2025 · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025
diff --git a/coderd/httpmw/logger.go b/coderd/httpmw/logger.go
 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()

 })
 }
 }

 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
 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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))
ibetitsmike marked this conversation as resolved. Show resolvedHide resolved

		end := time.Now()

Expand DownExpand Up		@@ -74,3 +81,37 @@ func Logger(log slog.Logger) func(next http.Handler) http.Handler {
		})
		}
		}

		type RequestLoggerContext struct {
		Fields map[string]any
ibetitsmike marked this conversation as resolved. OutdatedShow resolvedHide resolved

		log *slog.Logger
		written bool
		}

		func (c *RequestLoggerContext) WriteLog(ctx context.Context, msg string, status int) {
ibetitsmike marked this conversation as resolved. OutdatedShow resolvedHide resolved
		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 {
ibetitsmike marked this conversation as resolved. OutdatedShow resolvedHide resolved
		val := ctx.Value(logContextKey{})
		if logCtx, ok := val.(*RequestLoggerContext); ok {
		return logCtx
		}
		return nil
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand Down