Domain Reliability: Add more upload-related histograms.

components/domain_reliability/context_manager.cc

 // Copyright 2015 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.
 
 #include "components/domain_reliability/context_manager.h"
 
 #include <utility>
 
+#include "base/metrics/histogram_macros.h"
+
 namespace domain_reliability {
 
 DomainReliabilityContextManager::DomainReliabilityContextManager(
     DomainReliabilityContext::Factory* context_factory)
     : context_factory_(context_factory) {
 }
 
 DomainReliabilityContextManager::~DomainReliabilityContextManager() {
   RemoveContexts(
       base::Callback<bool(const GURL&)>() /* no filter - delete everything */);
 }
 
 void DomainReliabilityContextManager::RouteBeacon(
     std::unique_ptr<DomainReliabilityBeacon> beacon) {
   DomainReliabilityContext* context = GetContextForHost(beacon->url.host());
   if (!context)
     return;
 
-  context->OnBeacon(std::move(beacon));
+  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;
 }
 
 void DomainReliabilityContextManager::SetConfig(
     const GURL& origin,
     std::unique_ptr<DomainReliabilityConfig> config,
     base::TimeDelta max_age) {
   std::string key = origin.host();
 
   if (!contexts_.count(key) && !removed_contexts_.count(key)) {
     LOG(WARNING) << "Ignoring NEL header for unknown origin " << origin.spec()
                  << ".";
     return;
   }
 
   if (contexts_.count(key)) {
     // Currently, there is no easy way to change the config of a context, so
     // updating the config requires recreating the context, which loses
     // pending beacons and collector backoff state. Therefore, don't do so
     // needlessly; make sure the config has actually changed before recreating
     // the context.
     if (contexts_[key]->config().Equals(*config)) {
       DVLOG(1) << "Ignoring unchanged NEL header for existing origin "
                << origin.spec() << ".";
+      UMA_HISTOGRAM_BOOLEAN("DomainReliability.SetConfigRecreatedContext",
+                            false);
       return;
+    } else {
+      UMA_HISTOGRAM_BOOLEAN("DomainReliability.SetConfigRecreatedContext",
+                            true);

[Alexei Svitkine (slow), 2016/11/01 14:49:46]

Please refactor the code to avoid having two macro invocations for the same
histogram. Each macro expands to a bunch of code which bloats the binary.

[Julia Tuttle, 2016/11/01 15:52:47]

Done.

     }
     // TODO(juliatuttle): Make Context accept Config changes.
   }
 
-  DVLOG(1) << "Adding/replacing context for existing origin " << origin.spec()

[Julia Tuttle, 2016/10/31 23:32:05]

Note to self: Put this back.

[Julia Tuttle, 2016/11/01 15:52:47]

Done.

-           << ".";
   removed_contexts_.erase(key);
   config->origin = origin;
   AddContextForConfig(std::move(config));
 }
 
 void DomainReliabilityContextManager::ClearConfig(const GURL& origin) {
   std::string key = origin.host();
 
   if (contexts_.count(key)) {
     DVLOG(1) << "Removing context for existing origin " << origin.spec() << ".";
@@ skipping 67 matching lines @@
   context_it = contexts_.find(parent_host);
   if (context_it != contexts_.end()
       && context_it->second->config().include_subdomains) {
     return context_it->second;
   }
 
   return nullptr;
 }
 
 }  // namespace domain_reliability