commit d1c2a8b907dab254ef7a63c7ab4345309efb6ec6
author Luigi Semenzato <semenzato@chromium.org> Mon May 19 15:30:42 2014
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon May 19 23:06:27 2014
tree 86fda142c2dc6786769b29f016d3dc49e9bab6ba
parent 1d0528cbf3b984bf609b803df188854c635c8c9e

metrics library: complete switchover from /var/log to /var/run

This removes the double metrics even file use to facilitate
the transition.  The corresponding change has been in Chromium
for 2 days now.

BUG=chromium:373833
TEST=manually verified

Change-Id: I36ff355e6519b3894c0a4579758ae87bdac6b148
Reviewed-on: https://chromium-review.googlesource.com/200426
Reviewed-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Luigi Semenzato <semenzato@chromium.org>
Tested-by: Luigi Semenzato <semenzato@chromium.org>

metrics_library.cc

diff --git a/metrics_library.cc b/metrics_library.cc
index c71234e..b15fd49 100644
--- a/metrics_library.cc
+++ b/metrics_library.cc
@@ -24,8 +24,7 @@
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 static const char kAutotestPath[] = "/var/log/metrics/autotest-events";
-static const char kUMAEventsPath[] = "/var/log/metrics/uma-events";
-static const char kNewUMAEventsPath[] = "/var/run/metrics/uma-events";
+static const char kUMAEventsPath[] = "/var/run/metrics/uma-events";
 static const char kConsentFile[] = "/home/chronos/Consent To Send Stats";
 static const int32_t kBufferSize = 1024;
 static const char kCrosEventHistogramName[] = "Platform.CrOSEvent";
@@ -172,8 +171,7 @@
   return cached_enabled_;
 }
 
-bool MetricsLibrary::StoreMessageInFile(const std::string& message,
-                                        const std::string& events_file) {
+bool MetricsLibrary::SendMessageToChrome(const std::string& message) {
   int size = static_cast<int>(message.size());
   if (size > kBufferSize) {
     LOG(ERROR) << "chrome message too big (" << size << " bytes)";
@@ -181,12 +179,12 @@
   }
   // Use libc here instead of chromium base classes because we need a UNIX fd
   // for flock.
-  int chrome_fd = HANDLE_EINTR(open(events_file.c_str(),
+  int chrome_fd = HANDLE_EINTR(open(uma_events_file_.c_str(),
                                     O_WRONLY | O_APPEND | O_CREAT,
                                     READ_WRITE_ALL_FILE_FLAGS));
   // If we failed to open it, return.
   if (chrome_fd < 0) {
-    PLOG(ERROR) << events_file << ": open";
+    PLOG(ERROR) << uma_events_file_ << ": open";
     return false;
   }
 
@@ -198,14 +196,14 @@
   // Grab an exclusive lock to protect Chrome from truncating
   // underneath us.
   if (HANDLE_EINTR(flock(chrome_fd, LOCK_EX)) < 0) {
-    PLOG(ERROR) << events_file << ": flock";
+    PLOG(ERROR) << uma_events_file_ << ": flock";
     IGNORE_EINTR(close(chrome_fd));
     return false;
   }
 
   bool success = true;
   if (WriteFileDescriptor(chrome_fd, message.c_str(), size) != size) {
-    PLOG(ERROR) << events_file << ": write";
+    PLOG(ERROR) << uma_events_file_ << ": write";
     success = false;
   }
 
@@ -214,17 +212,6 @@
   return success;
 }
 
-bool MetricsLibrary::SendMessageToChrome(const std::string& message) {
-  // TEMPORARY: store to both new and old file, to facilitate change if the
-  // Chrome side is out of sync with this.  See crbug.com/373833.
-
-  // If one store fails, we'll be cool... hey man it's OK, you know, whatever.
-  // If both stores fail, then definitely something is wrong.
-  bool success = StoreMessageInFile(message, uma_events_file_);
-  success |= StoreMessageInFile(message, new_uma_events_file_);
-  return success;
-}
-
 const std::string MetricsLibrary::FormatChromeMessage(
     const std::string& name,
     const std::string& value) {
@@ -241,7 +228,6 @@
 
 void MetricsLibrary::Init() {
   uma_events_file_ = kUMAEventsPath;
-  new_uma_events_file_ = kNewUMAEventsPath;
 }
 
 bool MetricsLibrary::SendToAutotest(const std::string& name, int value) {

metrics_library.h

diff --git a/metrics_library.h b/metrics_library.h
index a3f43c5..e34ff4a 100644
--- a/metrics_library.h
+++ b/metrics_library.h
@@ -131,11 +131,6 @@
                        char* buffer, int buffer_size,
                        bool* result);
 
-  // TEMPORARY (see crbug.com/373833).  Stores a message to Chrome in the
-  // events file.
-  bool StoreMessageInFile(const std::string& message,
-                          const std::string& events_file);
-
   // Sends message to Chrome for transport to UMA and returns true on success.
   bool SendMessageToChrome(const std::string& message);
 
@@ -158,7 +153,6 @@
   static bool cached_enabled_;
 
   std::string uma_events_file_;
-  std::string new_uma_events_file_;  // TEMPORARY see crbug.com/373833.
   std::string consent_file_;
 
   scoped_ptr<policy::PolicyProvider> policy_provider_;