diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/components/domain_reliability | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/domain_reliability')
8 files changed, 6 insertions, 87 deletions
diff --git a/chromium/components/domain_reliability/context.cc b/chromium/components/domain_reliability/context.cc index 3754f29ba4d..a68bf85d711 100644 --- a/chromium/components/domain_reliability/context.cc +++ b/chromium/components/domain_reliability/context.cc @@ -26,12 +26,6 @@ using base::Value; namespace domain_reliability { -namespace { -void LogOnBeaconDidEvictHistogram(bool evicted) { - UMA_HISTOGRAM_BOOLEAN("DomainReliability.OnBeaconDidEvict", evicted); -} -} // namespace - // static const int DomainReliabilityContext::kMaxUploadDepthToSchedule = 1; @@ -69,34 +63,16 @@ DomainReliabilityContext::~DomainReliabilityContext() { ClearBeacons(); } -bool DomainReliabilityContext::OnBeacon( +void DomainReliabilityContext::OnBeacon( std::unique_ptr<DomainReliabilityBeacon> beacon) { bool success = (beacon->status == "ok"); double sample_rate = beacon->details.quic_port_migration_detected ? 1.0 : config().GetSampleRate(success); - bool should_report = base::RandDouble() < sample_rate; - UMA_HISTOGRAM_BOOLEAN("DomainReliability.BeaconReported", should_report); - if (!should_report) { - // If the beacon isn't queued to be reported, it definitely cannot evict - // an older beacon. (This histogram is also logged below based on whether - // an older beacon was actually evicted.) - LogOnBeaconDidEvictHistogram(false); - return false; - } + if (base::RandDouble() >= sample_rate) + return; beacon->sample_rate = sample_rate; - UMA_HISTOGRAM_SPARSE_SLOWLY("DomainReliability.ReportedBeaconError", - -beacon->chrome_error); - if (!beacon->server_ip.empty()) { - UMA_HISTOGRAM_SPARSE_SLOWLY( - "DomainReliability.ReportedBeaconError_HasServerIP", - -beacon->chrome_error); - } - UMA_HISTOGRAM_COUNTS_100("DomainReliability.ReportedBeaconUploadDepth", - beacon->upload_depth); - // TODO(juliatuttle): Histogram HTTP response code? - // Allow beacons about reports, but don't schedule an upload for more than // one layer of recursion, to avoid infinite report loops. if (beacon->upload_depth <= kMaxUploadDepthToSchedule) @@ -105,17 +81,6 @@ bool DomainReliabilityContext::OnBeacon( bool should_evict = beacons_.size() > kMaxQueuedBeacons; if (should_evict) RemoveOldestBeacon(); - - LogOnBeaconDidEvictHistogram(should_evict); - - base::TimeTicks now = base::TimeTicks::Now(); - if (last_queued_beacon_time_ != base::TimeTicks()) { - UMA_HISTOGRAM_LONG_TIMES("DomainReliability.BeaconInterval", - now - last_queued_beacon_time_); - } - last_queued_beacon_time_ = now; - - return true; } void DomainReliabilityContext::ClearBeacons() { @@ -198,13 +163,6 @@ void DomainReliabilityContext::StartUpload() { base::Bind( &DomainReliabilityContext::OnUploadComplete, weak_factory_.GetWeakPtr())); - - UMA_HISTOGRAM_SPARSE_SLOWLY("DomainReliability.UploadCollectorIndex", - static_cast<int>(collector_index)); - if (!last_upload_time_.is_null()) { - UMA_HISTOGRAM_LONG_TIMES("DomainReliability.UploadInterval", - upload_time_ - last_upload_time_); - } } void DomainReliabilityContext::OnUploadComplete( @@ -223,8 +181,6 @@ void DomainReliabilityContext::OnUploadComplete( DCHECK(!upload_time_.is_null()); UMA_HISTOGRAM_MEDIUM_TIMES("DomainReliability.UploadDuration", now - upload_time_); - UMA_HISTOGRAM_LONG_TIMES("DomainReliability.UploadCollectorRetryDelay", - scheduler_.last_collector_retry_delay()); last_upload_time_ = upload_time_; upload_time_ = base::TimeTicks(); } diff --git a/chromium/components/domain_reliability/context.h b/chromium/components/domain_reliability/context.h index d44c2f71054..5038c531f8c 100644 --- a/chromium/components/domain_reliability/context.h +++ b/chromium/components/domain_reliability/context.h @@ -65,10 +65,7 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityContext { // Notifies the context of a beacon on its domain(s); may or may not save the // actual beacon to be uploaded, depending on the sample rates in the config, // but will increment one of the request counters in any case. - // - // Returns |true| if the beacon was queued or |false| if it was discarded, - // for metrics purposes. - bool OnBeacon(std::unique_ptr<DomainReliabilityBeacon> beacon); + void OnBeacon(std::unique_ptr<DomainReliabilityBeacon> beacon); // Called to clear browsing data, since beacons are like browsing history. void ClearBeacons(); @@ -134,8 +131,6 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityContext { const base::TimeTicks* last_network_change_time_; const UploadAllowedCallback& upload_allowed_callback_; - base::TimeTicks last_queued_beacon_time_; - base::WeakPtrFactory<DomainReliabilityContext> weak_factory_; DISALLOW_COPY_AND_ASSIGN(DomainReliabilityContext); diff --git a/chromium/components/domain_reliability/context_manager.cc b/chromium/components/domain_reliability/context_manager.cc index 81811c940c8..e0f6a8e10e3 100644 --- a/chromium/components/domain_reliability/context_manager.cc +++ b/chromium/components/domain_reliability/context_manager.cc @@ -26,16 +26,7 @@ void DomainReliabilityContextManager::RouteBeacon( if (!context) return; - bool queued = context->OnBeacon(std::move(beacon)); - if (!queued) - return; - - base::TimeTicks now = base::TimeTicks::Now(); - if (!last_routed_beacon_time_.is_null()) { - UMA_HISTOGRAM_LONG_TIMES("DomainReliability.BeaconIntervalGlobal", - now - last_routed_beacon_time_); - } - last_routed_beacon_time_ = now; + context->OnBeacon(std::move(beacon)); } void DomainReliabilityContextManager::SetConfig( @@ -57,8 +48,6 @@ void DomainReliabilityContextManager::SetConfig( // needlessly; make sure the config has actually changed before recreating // the context. bool config_same = contexts_[key]->config().Equals(*config); - UMA_HISTOGRAM_BOOLEAN("DomainReliability.SetConfigRecreatedContext", - !config_same); if (!config_same) { DVLOG(1) << "Ignoring unchanged NEL header for existing origin " << origin.spec() << "."; diff --git a/chromium/components/domain_reliability/context_manager.h b/chromium/components/domain_reliability/context_manager.h index c9b1d93adc0..c4a667907c7 100644 --- a/chromium/components/domain_reliability/context_manager.h +++ b/chromium/components/domain_reliability/context_manager.h @@ -73,8 +73,6 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityContextManager { // context manager knows they are allowed to set a config again later. std::unordered_set<std::string> removed_contexts_; - base::TimeTicks last_routed_beacon_time_; - DISALLOW_COPY_AND_ASSIGN(DomainReliabilityContextManager); }; diff --git a/chromium/components/domain_reliability/scheduler.cc b/chromium/components/domain_reliability/scheduler.cc index f598c947354..5c473de2e55 100644 --- a/chromium/components/domain_reliability/scheduler.cc +++ b/chromium/components/domain_reliability/scheduler.cc @@ -144,7 +144,6 @@ void DomainReliabilityScheduler::OnUploadComplete( backoff->InformOfRequest(result.is_success()); if (result.is_retry_after()) backoff->SetCustomReleaseTime(time_->NowTicks() + result.retry_after); - last_collector_retry_delay_ = backoff->GetTimeUntilRelease(); if (!result.is_success()) { // Restore upload_pending_ and first_beacon_time_ to pre-upload state, diff --git a/chromium/components/domain_reliability/scheduler.h b/chromium/components/domain_reliability/scheduler.h index cf86a2d74d0..7c26960d984 100644 --- a/chromium/components/domain_reliability/scheduler.h +++ b/chromium/components/domain_reliability/scheduler.h @@ -83,13 +83,6 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityScheduler { // uploaded. base::TimeTicks first_beacon_time() const { return first_beacon_time_; } - // Gets the time until the next upload attempt on the last collector used. - // This will be 0 if the upload was a success; it does not take into account - // minimum_upload_delay and maximum_upload_delay. - base::TimeDelta last_collector_retry_delay() const { - return last_collector_retry_delay_; - } - private: void MaybeScheduleUpload(); @@ -127,10 +120,6 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityScheduler { // first_beacon_time_ saved during uploads. Restored if upload fails. base::TimeTicks old_first_beacon_time_; - // Time until the next upload attempt on the last collector used. (Saved for - // histograms in Context.) - base::TimeDelta last_collector_retry_delay_; - // Extra bits to return in GetWebUIData. base::TimeTicks scheduled_min_time_; base::TimeTicks scheduled_max_time_; diff --git a/chromium/components/domain_reliability/uploader.cc b/chromium/components/domain_reliability/uploader.cc index a9ed70b4afc..a4cc7de4af9 100644 --- a/chromium/components/domain_reliability/uploader.cc +++ b/chromium/components/domain_reliability/uploader.cc @@ -130,13 +130,6 @@ class DomainReliabilityUploaderImpl fetcher->Start(); uploads_[fetcher] = {std::move(owned_fetcher), callback}; - - base::TimeTicks now = base::TimeTicks::Now(); - if (!last_upload_start_time_.is_null()) { - UMA_HISTOGRAM_LONG_TIMES("DomainReliability.UploadIntervalGlobal", - now - last_upload_start_time_); - } - last_upload_start_time_ = now; } void SetDiscardUploads(bool discard_uploads) override { @@ -204,7 +197,6 @@ class DomainReliabilityUploaderImpl std::pair<std::unique_ptr<net::URLFetcher>, UploadCallback>> uploads_; bool discard_uploads_; - base::TimeTicks last_upload_start_time_; bool shutdown_; int discarded_upload_count_; }; diff --git a/chromium/components/domain_reliability/util.cc b/chromium/components/domain_reliability/util.cc index f1a1fd8c48c..18764300e2a 100644 --- a/chromium/components/domain_reliability/util.cc +++ b/chromium/components/domain_reliability/util.cc @@ -130,6 +130,7 @@ std::string GetDomainReliabilityProtocol( case net::HttpResponseInfo::CONNECTION_INFO_QUIC_40: case net::HttpResponseInfo::CONNECTION_INFO_QUIC_41: case net::HttpResponseInfo::CONNECTION_INFO_QUIC_42: + case net::HttpResponseInfo::CONNECTION_INFO_QUIC_43: return "QUIC"; case net::HttpResponseInfo::NUM_OF_CONNECTION_INFOS: NOTREACHED(); |