Cater for body exclusion in LogRequestInfo

logs/logs.go

@@ -219,11 +219,14 @@ func LogShipmentID(id int64) {
 	}, "Current-shipment-ID")
 }
 
-func LogRequestInfo(req events.APIGatewayProxyRequest, extraFields ...map[string]interface{}) {
+func LogRequestInfo(req events.APIGatewayProxyRequest, shouldExcludeBody bool, extraFields map[string]interface{}) {
 	fields := map[string]interface{}{
 		"path":   req.Path,
 		"method": req.HTTPMethod,
-		"body":   req.Body,
+	}
+
+	if !shouldExcludeBody {
+		fields["body"] = req.Body
 	}
 
 	if req.QueryStringParameters != nil {
@@ -234,13 +237,11 @@ func LogRequestInfo(req events.APIGatewayProxyRequest, extraFields ...map[string
 		fields["client_version"] = req.Headers["client-version"]
 	}
 
-	if extraFields != nil {
-		for i := range extraFields {
-			for k, v := range extraFields[i] {
+	for k, v := range extraFields {
+		if k != "" {
 			fields[k] = v
 		}
 	}
-	}
 
 	InfoWithFields(fields, "Req")
 }