Add log date to the metrics log

components/metrics/persisted_logs.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_METRICS_PERSISTED_LOGS_H_
 #define COMPONENTS_METRICS_PERSISTED_LOGS_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 33 matching lines @@
   // Calling code is responsible for ensuring that the lifetime of |local_state|
   // is longer than the lifetime of PersistedLogs.
   //
   // When saving logs to disk, stores either the first |min_log_count| logs, or
   // at least |min_log_bytes| bytes of logs, whichever is greater.
   //
   // If the optional |max_log_size| parameter is non-zero, all logs larger than
   // that limit will be skipped when writing to disk.
   PersistedLogs(PrefService* local_state,
                 const char* pref_name,
+                const char* outdated_pref_name,
                 size_t min_log_count,
                 size_t min_log_bytes,
                 size_t max_log_size);
   ~PersistedLogs();
 
   // Write list to storage.
   void SerializeLogs() const;
 
   // Reads the list from the preference.
   LogReadStatus DeserializeLogs();
@@ skipping 16 matching lines @@
     DCHECK(has_staged_log());
     return list_[staged_log_index_].compressed_log_data;
   }
 
   // Returns the element in the front of the list.
   const std::string& staged_log_hash() const {
     DCHECK(has_staged_log());
     return list_[staged_log_index_].hash;
   }
 
+  // Returns the timestamp of the element in the front of the list.
+  const std::string& staged_log_timestamp() const {
+    DCHECK(has_staged_log());
+    return list_[staged_log_index_].timestamp;
+  }
+
   // The number of elements currently stored.
   size_t size() const { return list_.size(); }
 
   // True if there are no stored logs.
   bool empty() const { return list_.empty(); }
 
  private:
   // Writes the list to the ListValue.
   void WriteLogsToPrefList(base::ListValue* list) const;
 
   // Reads the list from the ListValue.
   LogReadStatus ReadLogsFromPrefList(const base::ListValue& list);
 
+  // Reads the list from the ListValue in the old Log-hash pair format.
+  LogReadStatus ReadLogsFromOldFormatPrefList(const base::ListValue& list);
+
   // A weak pointer to the PrefService object to read and write the preference
   // from.  Calling code should ensure this object continues to exist for the
   // lifetime of the PersistedLogs object.
   PrefService* local_state_;
 
   // The name of the preference to serialize logs to/from.
   const char* pref_name_;
 
+  // The name of the preference to serialize logs to/from which may contain log
+  // in the old formatting.
+  const char* outdated_pref_name_;
+
   // We will keep at least this |min_log_count_| logs or |min_log_bytes_| bytes
   // of logs, whichever is greater, when writing to disk.  These apply after
   // skipping logs greater than |max_log_size_|.
   const size_t min_log_count_;
   const size_t min_log_bytes_;
 
   // Logs greater than this size will not be written to disk.
   const size_t max_log_size_;
 
-  struct LogHashPair {
+  struct LogInfo {

[gayane -on leave until 09-2017, 2016/09/30 17:01:56]

no constructor here because we turned the timestamp to be a string

     // Initializes the members based on uncompressed |log_data|.
     void Init(const std::string& log_data);
 
     // Compressed log data - a serialized protobuf that's been gzipped.
     std::string compressed_log_data;
 
     // The SHA1 hash of log, stored to catch errors from memory corruption.
     std::string hash;
+
+    // The timestamp of when the log was created in seconds. Seconds is enough
+    // as decision for removing old logs wouldn't need more granularity.
+    std::string timestamp;
   };
   // A list of all of the stored logs, stored with SHA1 hashes to check for
   // corruption while they are stored in memory.
-  std::vector<LogHashPair> list_;
+  std::vector<LogInfo> list_;
 
   // The index and type of the log staged for upload. If nothing has been
   // staged, the index will be -1.
   int staged_log_index_;
 
   DISALLOW_COPY_AND_ASSIGN(PersistedLogs);
 };
 
 }  // namespace metrics
 
 #endif  // COMPONENTS_METRICS_PERSISTED_LOGS_H_