debug exception (#552)

feat: added loggining * Make TriggerCheckException log messages more consitent Co-authored-by: Nikolay <[email protected]> Co-authored-by: Borovsky Arkady <[email protected]>
moira-alert · Jul 6, 2020 · e6d10e9 · e6d10e9
1 parent 76053ee
commit e6d10e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/checker/check.go b/checker/check.go
@@ -66,6 +66,7 @@ func (triggerChecker *TriggerChecker) handlePrepareError(checkData moira.CheckDa
 	case ErrUnexpectedAloneMetric:
 		checkData.State = moira.StateEXCEPTION
 		checkData.Message = err.Error()
+		triggerChecker.logger.Warning(formatTriggerCheckException(triggerChecker.triggerID, err))
 	default:
 		return false, checkData, triggerChecker.handleUndefinedError(checkData, err)
 	}
@@ -99,11 +100,11 @@ func (triggerChecker *TriggerChecker) handleFetchError(checkData moira.CheckData
 			checkData.Message = fmt.Sprintf("Remote server unavailable. Trigger is not checked for %d seconds", timeSinceLastSuccessfulCheck)
 			checkData, err = triggerChecker.compareTriggerStates(checkData)
 		}
-		triggerChecker.logger.Errorf("Trigger %s: %s", triggerChecker.triggerID, err.Error())
+		triggerChecker.logger.Warning(formatTriggerCheckException(triggerChecker.triggerID, err))
 	case local.ErrUnknownFunction, local.ErrEvalExpr:
 		checkData.State = moira.StateEXCEPTION
 		checkData.Message = err.Error()
-		triggerChecker.logger.Warningf("Trigger %s: %s", triggerChecker.triggerID, err.Error())
+		triggerChecker.logger.Warning(formatTriggerCheckException(triggerChecker.triggerID, err))
 	default:
 		return triggerChecker.handleUndefinedError(checkData, err)
 	}
@@ -127,6 +128,10 @@ func (triggerChecker *TriggerChecker) handleUndefinedError(checkData moira.Check
 	return triggerChecker.database.SetTriggerLastCheck(triggerChecker.triggerID, &checkData, triggerChecker.trigger.IsRemote)
 }
 
+func formatTriggerCheckException(triggerId string, err error) string {
+	return fmt.Sprintf("TriggerCheckException %T Trigger %s: %v", err, triggerId, err)
+}
+
 // Set new last check timestamp that equal to "until" targets fetch interval
 // Do not copy message, it will be set if needed
 func newCheckData(lastCheck *moira.CheckData, checkTimeStamp int64) moira.CheckData {

diff --git a/checker/check_test.go b/checker/check_test.go
@@ -1413,12 +1413,14 @@ func TestTriggerChecker_handlePrepareError(t *testing.T) {
 	Convey("Test handlePrepareError", t, func() {
 		mockCtrl := gomock.NewController(t)
 		dataBase := mock_moira_alert.NewMockDatabase(mockCtrl)
+		logger, _ := logging.GetLogger("Test")
 
 		trigger := &moira.Trigger{}
 		triggerChecker := TriggerChecker{
 			triggerID: "test trigger",
 			trigger:   trigger,
 			database:  dataBase,
+			logger:    logger,
 		}
 		checkData := moira.CheckData{}
 

diff --git a/metric_source/remote/request.go b/metric_source/remote/request.go
@@ -26,19 +26,25 @@ func (remote *Remote) prepareRequest(from, until int64, target string) (*http.Re
 
 func (remote *Remote) makeRequest(req *http.Request) ([]byte, error) {
 	var body []byte
+
 	resp, err := remote.client.Do(req)
 	if resp != nil {
 		defer resp.Body.Close()
 	}
+
 	if err != nil {
-		return body, err
+		return body, fmt.Errorf("The remote server is not available or the response was reset by timeout. " +
+			"TTL: %s, PATH: %s, ERROR: %v ", remote.client.Timeout.String(), req.URL.RawPath, err)
 	}
+
 	body, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return body, err
 	}
+
 	if resp.StatusCode != 200 {
 		return body, fmt.Errorf("bad response status %d: %s", resp.StatusCode, string(body))
 	}
+
 	return body, nil
 }