added handling of internal test circumventing RequestLoggerContext injection path

ibetitsmike · ibetitsmike · commit 1649116b5597 · 2025-04-07T09:45:47.000Z
diff --git a/coderd/inboxnotifications.go b/coderd/inboxnotifications.go
@@ -220,7 +220,10 @@ func (api *API) watchInboxNotifications(rw http.ResponseWriter, r *http.Request)
 	defer encoder.Close(websocket.StatusNormalClosure)
 
 	// Log the request immediately instead of after it completes.
-	httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx, http.StatusAccepted)
+	requestLogger := httpmw.RequestLoggerFromContext(ctx)
+	if requestLogger != nil {
+		requestLogger.WriteLog(ctx, http.StatusAccepted)
+	}
 
 	for {
 		select {
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -555,7 +555,10 @@ func (f *logFollower) follow() {
 	}
 
 	// Log the request immediately instead of after it completes.
-	httpmw.RequestLoggerFromContext(f.ctx).WriteLog(f.ctx, http.StatusAccepted)
+	requestLogger := httpmw.RequestLoggerFromContext(f.ctx)
+	if requestLogger != nil {
+		requestLogger.WriteLog(f.ctx, http.StatusAccepted)
+	}
 
 	// no need to wait if the job is done
 	if f.complete {
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -556,7 +556,10 @@ func (api *API) workspaceAgentLogs(rw http.ResponseWriter, r *http.Request) {
 	defer t.Stop()
 
 	// Log the request immediately instead of after it completes.
-	httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx, http.StatusAccepted)
+	requestLogger := httpmw.RequestLoggerFromContext(ctx)
+	if requestLogger != nil {
+		requestLogger.WriteLog(ctx, http.StatusAccepted)
+	}
 
 	go func() {
 		defer func() {
@@ -932,7 +935,10 @@ func (api *API) derpMapUpdates(rw http.ResponseWriter, r *http.Request) {
 	defer encoder.Close(websocket.StatusGoingAway)
 
 	// Log the request immediately instead of after it completes.
-	httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx, http.StatusAccepted)
+	requestLogger := httpmw.RequestLoggerFromContext(ctx)
+	if requestLogger != nil {
+		requestLogger.WriteLog(ctx, http.StatusAccepted)
+	}
 
 	go func(ctx context.Context) {
 		// TODO(mafredri): Is this too frequent? Use separate ping disconnect timeout?
@@ -1322,7 +1328,10 @@ func (api *API) watchWorkspaceAgentMetadata(
 	defer sendTicker.Stop()
 
 	// Log the request immediately instead of after it completes.
-	httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx, http.StatusAccepted)
+	requestLogger := httpmw.RequestLoggerFromContext(ctx)
+	if requestLogger != nil {
+		requestLogger.WriteLog(ctx, http.StatusAccepted)
+	}
 
 	// Send initial metadata.
 	sendMetadata()
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -378,7 +378,10 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
 	})
 
 	// Log the request immediately instead of after it completes.
-	httpmw.RequestLoggerFromContext(ctx).WriteLog(ctx, http.StatusAccepted)
+	requestLogger := httpmw.RequestLoggerFromContext(ctx)
+	if requestLogger != nil {
+		requestLogger.WriteLog(ctx, http.StatusAccepted)
+	}
 
 	err = server.Serve(ctx, session)
 	srvCancel()
