Merge pull request #102 from deploymenttheory/dev

Dev

Author: ShocOne

httpclient/httpclient_error_response.go

@@ -30,9 +30,13 @@ type StructuredError struct {
 	} `json:"error"`
 }
 
-// Error returns a string representation of the APIError.
+// Error returns a JSON representation of the APIError.
 func (e *APIError) Error() string {
-	return fmt.Sprintf("API Error (Type: %s, Code: %d): %s", e.Type, e.StatusCode, e.Message)
+	data, err := json.Marshal(e)
+	if err != nil {
+		return fmt.Sprintf("Error encoding APIError to JSON: %s", err)
+	}
+	return string(data)
 }
 
 // handleAPIErrorResponse attempts to parse the error response from the API and logs using the zap logger.

httpclient/httpclient_mocklogger.go

@@ -77,8 +77,8 @@ func (m *MockLogger) LogRequestEnd(event string, method string, url string, stat
 	m.Called(event, method, url, statusCode, duration)
 }
 
-func (m *MockLogger) LogError(event string, method string, url string, statusCode int, serverStatusMessage string, err error, stacktrace string) {
-	m.Called(event, method, url, statusCode, serverStatusMessage, err, stacktrace)
+func (m *MockLogger) LogError(event string, method string, url string, statusCode int, serverStatusMessage string, err error, rawResponse string) {
+	m.Called(event, method, url, statusCode, serverStatusMessage, err, rawResponse)
 }
 
 func (m *MockLogger) LogAuthTokenError(event string, method string, url string, statusCode int, err error) {

logger/zaplogger_logfields.go

@@ -36,7 +36,7 @@ func (d *defaultLogger) LogRequestEnd(event string, method string, url string, s
 }
 
 // LogError logs an error that occurs during the processing of an HTTP request or any other event, if the current log level permits.
-func (d *defaultLogger) LogError(event string, method, url string, statusCode int, serverStatusMessage string, err error, stacktrace string) {
+func (d *defaultLogger) LogError(event string, method, url string, statusCode int, serverStatusMessage string, err error, rawResponse string) {
 	if d.logLevel <= LogLevelError {
 		errorMessage := ""
 		if err != nil {
@@ -50,7 +50,7 @@ func (d *defaultLogger) LogError(event string, method, url string, statusCode in
 			zap.Int("status_code", statusCode),
 			zap.String("status_message", serverStatusMessage),
 			zap.String("error_message", errorMessage),
-			zap.String("stacktrace", stacktrace),
+			zap.String("raw_response", rawResponse),
 		}
 		d.logger.Error("Error occurred", fields...)
 	}

logger/zaplogger_logger.go

@@ -34,7 +34,7 @@ type Logger interface {
 	// Updated method signatures to include the 'event' parameter
 	LogRequestStart(event string, requestID string, userID string, method string, url string, headers map[string][]string)
 	LogRequestEnd(event string, method string, url string, statusCode int, duration time.Duration)
-	LogError(event string, method string, url string, statusCode int, serverStatusMessage string, err error, stacktrace string)
+	LogError(event string, method string, url string, statusCode int, serverStatusMessage string, err error, rawResponse string)
 	LogAuthTokenError(event string, method string, url string, statusCode int, err error)
 	LogRetryAttempt(event string, method string, url string, attempt int, reason string, waitDuration time.Duration, err error)
 	LogRateLimiting(event string, method string, url string, retryAfter string, waitDuration time.Duration)