fix body close in heartbeat and refactor (#668)

* fix: close body after heartbeat

Author: semyon-dev

metrics/README.md

@@ -43,7 +43,7 @@ Heartbeats will be enabled by default and they cant be disabled.
 
 ##### Configuration
 
-* **service_heartbeat_type** (mandatory. ```http|grpc```) - though All services must be using grpc, for the
+* **service_heartbeat_type** (optional, default `tcp`, ```http|grpc|tcp```) - though All services must be using grpc, for the
   simplicity of heartbeat implementation, both http and gRPC-based heartbeat end points are supported.
 
 * **heartbeat_endpoint** (mandatory ```must be a valid http|https|grpc url```) - It is service heartbeat endpoint.

metrics/clients.go

@@ -2,7 +2,7 @@
 // All rights reserved.
 // <<add licence terms for code reuse>>
 
-// package for monitoring and reporting the daemon metrics
+// Package metrics for monitoring and reporting the daemon metrics
 package metrics
 
 import (
@@ -59,11 +59,12 @@ func callHTTPServiceHeartbeat(serviceURL string) ([]byte, error) {
 		zap.L().Info("the service request failed with an error", zap.Error(err))
 		return nil, err
 	}
+	defer response.Body.Close()
 	if response.StatusCode != http.StatusOK {
 		zap.L().Warn("wrong status code", zap.Int("StatusCode", response.StatusCode))
 		return nil, errors.New("unexpected error with the service")
 	}
-	// Read the response
+	// Read the response but ignore
 	serviceHeartbeat, _ := io.ReadAll(response.Body)
 	// Check if we got an empty response
 	if string(serviceHeartbeat) == "" {
@@ -131,6 +132,7 @@ func callRegisterService(daemonID string, serviceURL string) (status bool) {
 		zap.L().Info("unable to reach registration service", zap.Error(err))
 		return false
 	}
+	defer response.Body.Close()
 	// process the response and set the Authorization token
 	daemonAuthorizationToken, status = getTokenFromResponse(response)
 	zap.L().Debug("daemon authorization token", zap.Any("value", daemonAuthorizationToken))

metrics/heartbeat.go

@@ -83,8 +83,8 @@ func (state Status) String() string {
 func ValidateHeartbeatConfig(heartbeatType, heartbeatEndpoint string) error {
 	// initialize the url state to false
 	// check if the configured type is not supported
-	if heartbeatType != "grpc" && heartbeatType != "http" && heartbeatType != "https" && heartbeatType != "none" && heartbeatType != "" {
-		return fmt.Errorf("unrecognized heartbet service type : '%+v'", heartbeatType)
+	if heartbeatType != "grpc" && heartbeatType != "http" && heartbeatType != "https" && heartbeatType != "none" && heartbeatType != "" && heartbeatType != "tcp" {
+		return fmt.Errorf("unrecognized heartbeat service type : '%+v'", heartbeatType)
 	}
 
 	// if the URLs are empty, or hbtype is None or empty, consider it as not configured
@@ -165,6 +165,8 @@ func GetHeartbeat(serviceEndpoint string, serviceHeartbeatURL string, heartbeatT
 		zap.L().Debug("Get heartbeat", zap.String("serviceHeartbeatURL", serviceHeartbeatURL), zap.String("serviceHeartbeatBytes", string(serviceHeartbeatBytes)), zap.Error(err))
 	case "none":
 		fallthrough
+	case "tcp":
+		fallthrough
 	case "":
 		// trying to ping the service with serviceEndpoint
 		err = tcpPingService(serviceEndpoint)