commit ac8037d3e6102e225d924bc8eb38bb2492077f6a
author Alex Vakulenko <avakulenko@chromium.org> Tue Nov 11 11:42:05 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Nov 12 02:42:35 2014 +0000
tree 95f9c3dd6561d557a3355375f098eccaf729cc50
parent b66a93040e5af7ea191488ef130f1f44c7730ff6

libchromeos: Add error location informaion to chromeos::Error

The error information logged always appears to come from error.cc
file in libchormeos since that's where LOG(ERROR) statement is.

Added the ability to pass in the actual source of the error by
using tracked_objects::Location parameter and "FROM_HERE" macros
used in base::TaskRunner-based classes.

While all the system log messages looked like this:

[ERROR:error.cc(15)] Domain=peerd, Code=service.info, Message=Invalid service key.

Now they appear as this:

ERROR:service.cc(155)] IsValidServiceInfo(...): Domain=peerd, Code=service.info, Message=Invalid service key.

We report the actual source file and line number where the error is
coming from, as well as the function name.

BUG=None
TEST=FEATURES=test emerge-link libchromeos buffet lorgnette peerd privetd

Change-Id: I647997c24d61a03f3b481e4c9ca336c90e99e9a3
Reviewed-on: https://chromium-review.googlesource.com/229071
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>

buffet/device_registration_info.cc

diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index b925033..8fccc02 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -84,10 +84,10 @@
       std::string error_code, error_message;
       if (resp->GetString("error", &error_code) &&
           resp->GetString("error_description", &error_message)) {
-        chromeos::Error::AddTo(error, buffet::kErrorDomainOAuth2, error_code,
-                               error_message);
+        chromeos::Error::AddTo(error, FROM_HERE, buffet::kErrorDomainOAuth2,
+                               error_code, error_message);
       } else {
-        chromeos::Error::AddTo(error, buffet::kErrorDomainOAuth2,
+        chromeos::Error::AddTo(error, FROM_HERE, buffet::kErrorDomainOAuth2,
                                "unexpected_response", "Unexpected OAuth error");
       }
     }
@@ -97,8 +97,8 @@
 }
 
 inline void SetUnexpectedError(chromeos::ErrorPtr* error) {
-  chromeos::Error::AddTo(error, buffet::kErrorDomainGCD, "unexpected_response",
-                         "Unexpected GCD error");
+  chromeos::Error::AddTo(error, FROM_HERE, buffet::kErrorDomainGCD,
+                         "unexpected_response", "Unexpected GCD error");
 }
 
 void ParseGCDError(const base::DictionaryValue* json,
@@ -125,7 +125,7 @@
     std::string error_code, error_message;
     if (error_object->GetString("reason", &error_code) &&
         error_object->GetString("message", &error_message)) {
-      chromeos::Error::AddTo(error, buffet::kErrorDomainGCDServer,
+      chromeos::Error::AddTo(error, FROM_HERE, buffet::kErrorDomainGCDServer,
                              error_code, error_message);
     } else {
       SetUnexpectedError(error);
@@ -264,7 +264,8 @@
       device_id_.empty() ||
       device_robot_account_.empty()) {
     LOG(INFO) << "No valid device registration record found.";
-    chromeos::Error::AddTo(error, kErrorDomainGCD, "device_not_registered",
+    chromeos::Error::AddTo(error, FROM_HERE, kErrorDomainGCD,
+                           "device_not_registered",
                            "No valid device registration record found");
     return false;
   }
@@ -302,7 +303,7 @@
       access_token_.empty() ||
       expires_in <= 0) {
     LOG(ERROR) << "Access token unavailable.";
-    chromeos::Error::AddTo(error, kErrorDomainOAuth2,
+    chromeos::Error::AddTo(error, FROM_HERE, kErrorDomainOAuth2,
                            "unexpected_server_response",
                            "Access token unavailable");
     return false;
@@ -370,7 +371,8 @@
   if (!param_value.empty())
     return true;
 
-  chromeos::Error::AddToPrintf(error, kErrorDomainBuffet, "missing_parameter",
+  chromeos::Error::AddToPrintf(error, FROM_HERE, kErrorDomainBuffet,
+                               "missing_parameter",
                                "Parameter %s not specified",
                                param_name.c_str());
   return false;
@@ -434,7 +436,8 @@
   if (!json_resp->GetString("robotAccountEmail", &device_robot_account_) ||
       !json_resp->GetString("robotAccountAuthorizationCode", &auth_code) ||
       !json_resp->GetString("deviceDraft.id", &device_id_)) {
-    chromeos::Error::AddTo(error, kErrorDomainGCD, "unexpected_response",
+    chromeos::Error::AddTo(error, FROM_HERE, kErrorDomainGCD,
+                           "unexpected_response",
                            "Device account missing in response");
     return std::string();
   }
@@ -460,7 +463,8 @@
       access_token_.empty() ||
       refresh_token_.empty() ||
       expires_in <= 0) {
-    chromeos::Error::AddTo(error, kErrorDomainGCD, "unexpected_response",
+    chromeos::Error::AddTo(error, FROM_HERE,
+                           kErrorDomainGCD, "unexpected_response",
                            "Device access_token missing in response");
     return std::string();
   }
@@ -559,7 +563,7 @@
     // TODO(antonm): Support Retry-After header.
     on_retriable_failure();
   } else {
-    chromeos::Error::AddTo(&error, chromeos::errors::http::kDomain,
+    chromeos::Error::AddTo(&error, FROM_HERE, chromeos::errors::http::kDomain,
                            std::to_string(status_code),
                            response->GetStatusText());
     PostToCallback(errorback, std::move(error));