Fix error handling in HTTP client

Author: ShocOne

httpclient/httpclient_auth_bearer_token.go

@@ -40,20 +40,20 @@ func (c *Client) ObtainToken(log logger.Logger) error {
 
 	req, err := http.NewRequest("POST", authenticationEndpoint, nil)
 	if err != nil {
-		log.LogError("authentication_request_creation_error", "POST", authenticationEndpoint, 0, err, "Failed to create new request for token")
+		log.LogError("authentication_request_creation_error", "POST", authenticationEndpoint, 0, "", err, "Failed to create new request for token")
 		return err
 	}
 	req.SetBasicAuth(c.BearerTokenAuthCredentials.Username, c.BearerTokenAuthCredentials.Password)
 
 	resp, err := c.httpClient.Do(req)
 	if err != nil {
-		log.LogError("authentication_request_error", "POST", authenticationEndpoint, 0, err, "Failed to make request for token")
+		log.LogError("authentication_request_error", "POST", authenticationEndpoint, resp.StatusCode, resp.Status, err, "Failed to make request for token")
 		return err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		log.LogError("token_authentication_failed", "POST", authenticationEndpoint, resp.StatusCode, fmt.Errorf("authentication failed with status code: %d", resp.StatusCode), "Token acquisition attempt resulted in a non-OK response")
+		log.LogError("token_authentication_failed", "POST", authenticationEndpoint, resp.StatusCode, resp.Status, fmt.Errorf("authentication failed with status code: %d", resp.StatusCode), "Token acquisition attempt resulted in a non-OK response")
 		return fmt.Errorf("received non-OK response status: %d", resp.StatusCode)
 	}
 

httpclient/httpclient_error_response.go

@@ -57,6 +57,7 @@ func handleAPIErrorResponse(resp *http.Response, log logger.Logger) *APIError {
 				resp.Request.Method,              // method
 				resp.Request.URL.String(),        // url
 				resp.StatusCode,                  // statusCode
+				resp.Status,                      // status
 				fmt.Errorf(apiError.Message),     // err
 				apiError.Raw,                     // raw resp
 			)
@@ -67,7 +68,15 @@ func handleAPIErrorResponse(resp *http.Response, log logger.Logger) *APIError {
 		var genericErr map[string]interface{}
 		if err := json.Unmarshal(bodyBytes, &genericErr); err == nil {
 			apiError.updateFromGenericError(genericErr)
-			log.LogError("json_generic_error_detected", resp.Request.Method, resp.Request.URL.String(), resp.StatusCode, fmt.Errorf(apiError.Message), "")
+			log.LogError(
+				"json_generic_error_detected", // event
+				resp.Request.Method,           // method
+				resp.Request.URL.String(),     // url
+				resp.StatusCode,               // statusCode
+				resp.Status,                   // status
+				fmt.Errorf(apiError.Message),  // err
+				apiError.Raw,                  // raw resp
+			)
 			return apiError
 		}
 	} else if isHTMLResponse(resp) {
@@ -78,6 +87,7 @@ func handleAPIErrorResponse(resp *http.Response, log logger.Logger) *APIError {
 			resp.Request.Method,          // method
 			resp.Request.URL.String(),    // url
 			resp.StatusCode,              // statusCode
+			resp.Status,                  // status
 			fmt.Errorf(apiError.Message), // err
 			apiError.Raw,                 // raw resp
 		)
@@ -86,12 +96,13 @@ func handleAPIErrorResponse(resp *http.Response, log logger.Logger) *APIError {
 		// Handle other non-JSON responses
 		apiError.Raw = string(bodyBytes)
 		log.LogError(
-			"api_non_json_error",                           // event
-			resp.Request.Method,                            // method
-			resp.Request.URL.String(),                      // url
-			resp.StatusCode,                                // statusCode
+			"api_non_json_error",      // event
+			resp.Request.Method,       // method
+			resp.Request.URL.String(), // url
+			resp.StatusCode,           // statusCode
+			resp.Status,               // status
 			fmt.Errorf("Non-JSON error response received"), // err
-			apiError.Raw,                                   // raw resp
+			apiError.Raw, // raw resp
 		)
 		return apiError
 	}