From f4e92212616235939514794d31222f1ac3eea51a Mon Sep 17 00:00:00 2001 From: AulakhHarsh <115346020+AulakhHarsh@users.noreply.github.com> Date: Mon, 25 Nov 2024 18:14:36 +0530 Subject: [PATCH] [MM-61768] Fix #29337 Errcheck in channels/app/platform/metrics.go (#29347) --- server/.golangci.yml | 1 - server/channels/app/platform/metrics.go | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index 79e248684a..41e9632548 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -101,7 +101,6 @@ issues: channels/app/platform/helper_test.go|\ channels/app/platform/license.go|\ channels/app/platform/log.go|\ - channels/app/platform/metrics.go|\ channels/app/platform/searchengine.go|\ channels/app/platform/service.go|\ channels/app/platform/service_test.go|\ diff --git a/server/channels/app/platform/metrics.go b/server/channels/app/platform/metrics.go index 90dc37089b..6dec8d1082 100644 --- a/server/channels/app/platform/metrics.go +++ b/server/channels/app/platform/metrics.go @@ -165,7 +165,9 @@ func (pm *platformMetrics) initMetricsRouter() error { } rootHandler := func(w http.ResponseWriter, r *http.Request) { - metricsPageTmpl.Execute(w, pm.metricsImpl != nil) + if err := metricsPageTmpl.Execute(w, pm.metricsImpl != nil); err != nil { + pm.logger.Error("Failed to execute template", mlog.Err(err)) + } } pm.router.HandleFunc("/", rootHandler) @@ -204,7 +206,9 @@ func (pm *platformMetrics) servePluginMetricsRequest(w http.ResponseWriter, r *h mlog.Error(appErr.Error()) w.WriteHeader(appErr.StatusCode) w.Header().Set("Content-Type", "application/json") - w.Write([]byte(appErr.ToJSON())) + if _, writeErr := w.Write([]byte(appErr.ToJSON())); writeErr != nil { + mlog.Error("Failed to write error response", mlog.Err(writeErr)) + } return } @@ -225,7 +229,9 @@ func (pm *platformMetrics) servePluginMetricsRequest(w http.ResponseWriter, r *h mlog.Error(appErr.Error()) w.WriteHeader(appErr.StatusCode) w.Header().Set("Content-Type", "application/json") - w.Write([]byte(appErr.ToJSON())) + if _, writeErr := w.Write([]byte(appErr.ToJSON())); writeErr != nil { + mlog.Error("Failed to write error response", mlog.Err(writeErr)) + } return }