Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1794)

Unified Diff: components/metrics/metrics_service.cc

Issue 1818613002: Implement UMA log throttling for cellular connections (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: singleton pattern removed Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/metrics/metrics_service.cc
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
index d17911a0bf9c259e20748f11b2b3720e8fb32a5b..99f74e44cd3dc1edfce64a5e0caab1c32d05065a 100644
--- a/components/metrics/metrics_service.cc
+++ b/components/metrics/metrics_service.cc
@@ -149,6 +149,7 @@
#include "base/tracked_objects.h"
#include "base/values.h"
#include "build/build_config.h"
+#include "components/metrics/data_use_tracker.h"
#include "components/metrics/metrics_log.h"
#include "components/metrics/metrics_log_manager.h"
#include "components/metrics/metrics_log_uploader.h"
@@ -258,6 +259,7 @@ void MetricsService::RegisterPrefs(PrefRegistrySimple* registry) {
DCHECK(IsSingleThreaded());
MetricsStateManager::RegisterPrefs(registry);
MetricsLog::RegisterPrefs(registry);
+ DataUseTracker::RegisterPrefs(registry);
registry->RegisterInt64Pref(prefs::kInstallDate, 0);
@@ -280,7 +282,8 @@ void MetricsService::RegisterPrefs(PrefRegistrySimple* registry) {
MetricsService::MetricsService(MetricsStateManager* state_manager,
MetricsServiceClient* client,
- PrefService* local_state)
+ PrefService* local_state,
+ base::Callback<void(bool*)> cellular_callback)
: log_manager_(local_state, kUploadLogAvoidRetransmitSize),
histogram_snapshot_manager_(this),
state_manager_(state_manager),
@@ -294,6 +297,7 @@ MetricsService::MetricsService(MetricsStateManager* state_manager,
log_upload_in_progress_(false),
idle_since_last_transmission_(false),
session_id_(-1),
+ cellular_callback_(cellular_callback),
self_ptr_factory_(this),
state_saver_factory_(this) {
DCHECK(IsSingleThreaded());
@@ -305,6 +309,7 @@ MetricsService::MetricsService(MetricsStateManager* state_manager,
int64_t install_date = local_state_->GetInt64(prefs::kInstallDate);
if (install_date == 0)
local_state_->SetInt64(prefs::kInstallDate, base::Time::Now().ToTimeT());
+ data_use_tracker_.reset(new DataUseTracker(local_state_));
}
MetricsService::~MetricsService() {
@@ -545,6 +550,10 @@ void MetricsService::PushExternalLog(const std::string& log) {
log_manager_.StoreLog(log, MetricsLog::ONGOING_LOG);
}
+base::WeakPtr<DataUseTracker> MetricsService::GetDataUseTracker() {
+ return data_use_tracker_->GetWeakPtr();
+}
+
//------------------------------------------------------------------------------
// private methods
//------------------------------------------------------------------------------
@@ -866,7 +875,20 @@ void MetricsService::SendNextLog() {
}
if (!log_manager_.has_staged_log())
log_manager_.StageNextLogForUpload();
- SendStagedLog();
+
+ // Proceed to stage the log for upload if log size satisfies cellular log
+ // upload constrains.
+ bool is_cellular = false;
+
+ if (!cellular_callback_.is_null()) {
+ cellular_callback_.Run(&is_cellular);
+ }
+
+ if (is_cellular &&
+ data_use_tracker_->CanUploadUMALog(log_manager_.staged_log_hash().size()))
+ SendStagedLog();
+ else
+ scheduler_->UploadCancelled();
}
bool MetricsService::ProvidersHaveInitialStabilityMetrics() {

Powered by Google App Engine
This is Rietveld 408576698