Merge pull request #1008 from brave/improve-stats-update

Update stats can undercount when laptop is suspended

browser/BUILD.gn

@@ -23,6 +23,8 @@ source_set("browser_process") {
     "brave_stats_updater.h",
     "brave_stats_updater_params.cc",
     "brave_stats_updater_params.h",
+    "brave_stats_updater_util.cc",
+    "brave_stats_updater_util.h",
     "brave_tab_helpers.cc",
     "brave_tab_helpers.h",
     "brave_rewards/donations_dialog.cc",

browser/brave_stats_updater.cc

@@ -6,6 +6,7 @@
 
 #include "base/sys_info.h"
 #include "brave/browser/brave_stats_updater_params.h"
+#include "brave/browser/brave_stats_updater_util.h"
 #include "brave/browser/version_info.h"
 #include "brave/common/pref_names.h"
 #include "chrome/browser/browser_process.h"
@@ -25,8 +26,9 @@
 // Ping the update server shortly after startup (units are seconds).
 const int kUpdateServerStartupPingDelay = 3;
 
-// Ping the update server once an hour (units are seconds).
-const int kUpdateServerPeriodicPingFrequency = 60 * 60;
+// Every five minutes, check if we need to ping the update server for
+// today (units are seconds).
+const int kUpdateServerPeriodicPingFrequency = 5 * 60;
 
 namespace {
 
@@ -112,7 +114,7 @@ void BraveStatsUpdater::Start() {
   server_ping_periodic_timer_->Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(kUpdateServerPeriodicPingFrequency), this,
-      &BraveStatsUpdater::OnServerPingPeriodicTimerFired);
+      &BraveStatsUpdater::OnServerPingTimerFired);
   DCHECK(server_ping_periodic_timer_->IsRunning());
 }
 
@@ -155,11 +157,13 @@ void BraveStatsUpdater::OnSimpleLoaderComplete(
   VLOG(1) << "Brave stats ping, url: " << final_url.spec();
 }
 
-void BraveStatsUpdater::OnServerPingStartupTimerFired() {
-  SendServerPing();
-}
+void BraveStatsUpdater::OnServerPingTimerFired() {
+  // If we already pinged the stats server today, then we're done.
+  std::string today_ymd = brave::GetDateAsYMD(base::Time::Now());
+  std::string last_check_ymd = pref_service_->GetString(kLastCheckYMD);
+  if (base::CompareCaseInsensitiveASCII(today_ymd, last_check_ymd) == 0)
+    return;
 
-void BraveStatsUpdater::OnServerPingPeriodicTimerFired() {
   SendServerPing();
 }
 
@@ -170,7 +174,7 @@ void BraveStatsUpdater::OnReferralCheckedForPromoCodeFileChanged() {
 void BraveStatsUpdater::StartServerPingStartupTimer() {
   server_ping_startup_timer_->Start(
       FROM_HERE, base::TimeDelta::FromSeconds(kUpdateServerStartupPingDelay),
-      this, &BraveStatsUpdater::OnServerPingStartupTimerFired);
+      this, &BraveStatsUpdater::OnServerPingTimerFired);
   DCHECK(server_ping_startup_timer_->IsRunning());
 }
 

browser/brave_stats_updater.h

@@ -53,11 +53,8 @@ class BraveStatsUpdater {
       std::unique_ptr<brave::BraveStatsUpdaterParams> stats_updater_params,
       scoped_refptr<net::HttpResponseHeaders> headers);
 
-  // Invoked when server ping startup timer fires.
-  void OnServerPingStartupTimerFired();
-
-  // Invoked when server ping periodic timer fires.
-  void OnServerPingPeriodicTimerFired();
+  // Invoked when server ping timer fires.
+  void OnServerPingTimerFired();
 
   // Invoked when the specified referral preference changes.
   void OnReferralCheckedForPromoCodeFileChanged();

browser/brave_stats_updater_params.cc

@@ -6,9 +6,9 @@
 
 #include "brave/browser/brave_stats_updater_params.h"
 
-#include "base/strings/stringprintf.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
+#include "brave/browser/brave_stats_updater_util.h"
 #include "brave/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 
@@ -83,15 +83,8 @@ std::string BraveStatsUpdaterParams::BooleanToString(bool bool_value) const {
   return bool_value ? "true" : "false";
 }
 
-std::string BraveStatsUpdaterParams::GetDateAsYMD(const base::Time& time) const {
-  base::Time::Exploded exploded;
-  time.LocalExplode(&exploded);
-  return base::StringPrintf("%d-%02d-%02d", exploded.year, exploded.month,
-                            exploded.day_of_month);
-}
-
 std::string BraveStatsUpdaterParams::GetCurrentDateAsYMD() const {
-  return GetDateAsYMD(g_current_time);
+  return brave::GetDateAsYMD(g_current_time);
 }
 
 std::string BraveStatsUpdaterParams::GetLastMondayAsYMD() const {
@@ -104,7 +97,7 @@ std::string BraveStatsUpdaterParams::GetLastMondayAsYMD() const {
       now.ToJsTime() -
       ((exploded.day_of_week - 1) * base::Time::kMillisecondsPerDay));
 
-  return GetDateAsYMD(last_monday);
+  return brave::GetDateAsYMD(last_monday);
 }
 
 int BraveStatsUpdaterParams::GetCurrentMonth() const {

browser/brave_stats_updater_util.cc

@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/brave_stats_updater_util.h"
+
+#include "base/strings/stringprintf.h"
+
+namespace brave {
+
+std::string GetDateAsYMD(const base::Time& time) {
+  base::Time::Exploded exploded;
+  time.LocalExplode(&exploded);
+  return base::StringPrintf("%d-%02d-%02d", exploded.year, exploded.month,
+                            exploded.day_of_month);
+}
+
+}  // namespace brave

browser/brave_stats_updater_util.h

@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_BRAVE_STATS_UPDATER_UTIL_H_
+#define BRAVE_BROWSER_BRAVE_STATS_UPDATER_UTIL_H_
+
+#include <string>
+
+#include "base/time/time.h"
+
+namespace brave {
+
+std::string GetDateAsYMD(const base::Time& time);
+
+}  // namespace brave
+
+#endif  // BRAVE_BROWSER_BRAVE_STATS_UPDATER_UTIL_H_