From 56c9ea5430a2284c01da7da982cfd5461914232f Mon Sep 17 00:00:00 2001 From: makeavish Date: Tue, 22 Feb 2022 17:49:02 +0530 Subject: [PATCH 1/2] fix: avoid panic by handling getOutboundIP() error --- pkg/query-service/telemetry/telemetry.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go index 90632784e7..eaaf098cc3 100644 --- a/pkg/query-service/telemetry/telemetry.go +++ b/pkg/query-service/telemetry/telemetry.go @@ -61,6 +61,10 @@ func getOutboundIP() string { ip := []byte("NA") resp, err := http.Get("https://api.ipify.org?format=text") + if err != nil { + return "" + } + defer resp.Body.Close() if err == nil { ipBody, err := ioutil.ReadAll(resp.Body) From ab72e92fc638807fc371eff8446dc792ffa4a165 Mon Sep 17 00:00:00 2001 From: Vishal Sharma Date: Fri, 25 Feb 2022 17:11:45 +0530 Subject: [PATCH 2/2] return string(ip) instead of empty string on error --- pkg/query-service/telemetry/telemetry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go index eaaf098cc3..dd963e7910 100644 --- a/pkg/query-service/telemetry/telemetry.go +++ b/pkg/query-service/telemetry/telemetry.go @@ -62,7 +62,7 @@ func getOutboundIP() string { resp, err := http.Get("https://api.ipify.org?format=text") if err != nil { - return "" + return string(ip) } defer resp.Body.Close()