Add X-OpenFaaS-Internal to internal HTTP errors

For timeouts and internal server errors, no additional header was being added to differentiate between the handler and the watchdog itself. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
openfaas · Jul 12, 2024 · a6a3f4c · a6a3f4c
1 parent 243c501
commit a6a3f4c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/executor/http_runner.go b/executor/http_runner.go
@@ -148,6 +148,7 @@ func (f *HTTPFunctionRunner) Run(req FunctionRequest, contentLength int64, r *ht
 			// Error unrelated to context / deadline
 			if reqCtx.Err() == nil {
 				w.Header().Set("X-Duration-Seconds", fmt.Sprintf("%f", time.Since(startedTime).Seconds()))
+				w.Header().Add("X-OpenFaaS-Internal", "of-watchdog")
 
 				w.WriteHeader(http.StatusInternalServerError)
 
@@ -160,12 +161,15 @@ func (f *HTTPFunctionRunner) Run(req FunctionRequest, contentLength int64, r *ht
 				// Error due to timeout / deadline
 				log.Printf("Upstream HTTP killed due to exec_timeout: %s\n", f.ExecTimeout)
 				w.Header().Set("X-Duration-Seconds", fmt.Sprintf("%f", time.Since(startedTime).Seconds()))
+				w.Header().Add("X-OpenFaaS-Internal", "of-watchdog")
 
 				w.WriteHeader(http.StatusGatewayTimeout)
 				return nil
 			}
 
 			w.Header().Set("X-Duration-Seconds", fmt.Sprintf("%f", time.Since(startedTime).Seconds()))
+			w.Header().Add("X-OpenFaaS-Internal", "of-watchdog")
+
 			w.WriteHeader(http.StatusInternalServerError)
 			return err
 		}