Multi-dimension rappor metrics

components/rappor/rappor_service.cc

 // 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.
 
 #include "components/rappor/rappor_service.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "components/metrics/metrics_hashes.h"
@@ skipping 34 matching lines @@
     return GURL(server_url);
   else
     return GURL(kDefaultServerUrl);
 }
 
 const RapporParameters kRapporParametersForType[NUM_RAPPOR_TYPES] = {
     // ETLD_PLUS_ONE_RAPPOR_TYPE
     {128 /* Num cohorts */,
      16 /* Bloom filter size bytes */,
      2 /* Bloom filter hash count */,
+     0,
      rappor::PROBABILITY_50 /* Fake data probability */,
      rappor::PROBABILITY_50 /* Fake one probability */,
      rappor::PROBABILITY_75 /* One coin probability */,
      rappor::PROBABILITY_25 /* Zero coin probability */,
      FINE_LEVEL /* Recording level */},
     // COARSE_RAPPOR_TYPE
     {128 /* Num cohorts */,
      1 /* Bloom filter size bytes */,
      2 /* Bloom filter hash count */,
+     0,
      rappor::PROBABILITY_50 /* Fake data probability */,
      rappor::PROBABILITY_50 /* Fake one probability */,
      rappor::PROBABILITY_75 /* One coin probability */,
+     rappor::PROBABILITY_25 /* Zero coin probability */,
+     COARSE_LEVEL /* Recording level */},
+    // STRING_W_FLAGS_SB_RAPPOR_TYPE
+    {128 /* Num cohorts */,
+     1 /* Bloom filter size bytes */,
+     2 /* Bloom filter hash count */,
+     1,
+     rappor::PROBABILITY_50 /* Fake data probability */,
+     rappor::PROBABILITY_50 /* Fake one probability */,
+     rappor::PROBABILITY_75 /* One coin probability */,
      rappor::PROBABILITY_25 /* Zero coin probability */,
      COARSE_LEVEL /* Recording level */},
 };
 
 }  // namespace
 
 RapporService::RapporService(
     PrefService* pref_service,
     const base::Callback<bool(void)> is_incognito_callback)
     : pref_service_(pref_service),
@@ skipping 128 matching lines @@
   STLDeleteValues(&metrics_map_);
   return true;
 }
 
 bool RapporService::IsInitialized() const {
   return cohort_ >= 0;
 }
 
 void RapporService::RecordSample(const std::string& metric_name,
                                  RapporType type,
-                                 const std::string& sample) {
+                                 const std::string& str) {
   // Ignore the sample if the service hasn't started yet.
   if (!IsInitialized())
     return;
   DCHECK_LT(type, NUM_RAPPOR_TYPES);
   const RapporParameters& parameters = kRapporParametersForType[type];
-  DVLOG(2) << "Recording sample \"" << sample
+  DVLOG(2) << "Recording sample \"" << str
            << "\" for metric \"" << metric_name
            << "\" of type: " << type;
+  Sample sample;
+  DCHECK_EQ(0, parameters.flag_bytes);
+  SetSampleBits(parameters, cohort_, str, 0, &sample);
+  RecordSampleInternal(metric_name, parameters, sample);
+}
+
+void RapporService::RecordStringAndFlags(const std::string& metric_name,
+                                         RapporType type,
+                                         const std::string& str,
+                                         uint64_t flags) {
+  // Ignore the sample if the service hasn't started yet.
+  if (!IsInitialized())
+    return;
+  DCHECK_LT(type, NUM_RAPPOR_TYPES);
+  const RapporParameters& parameters = kRapporParametersForType[type];
+  DVLOG(2) << "Recording sample \"" << str << "\"," << flags
+           << " for metric \"" << metric_name
+           << "\" of type: " << type;
+  Sample sample;
+  SetSampleBits(parameters, cohort_, str, flags, &sample);
   RecordSampleInternal(metric_name, parameters, sample);
 }
 
 void RapporService::RecordSampleInternal(const std::string& metric_name,
                                          const RapporParameters& parameters,
-                                         const std::string& sample) {
+                                         const Sample& sample) {
   DCHECK(IsInitialized());
   if (is_incognito_callback_.Run()) {
     DVLOG(2) << "Metric not logged due to incognito mode.";
     return;
   }
   // Skip this metric if it's reporting level is less than the enabled
   // reporting level.
   if (recording_level_ < parameters.recording_level) {
     DVLOG(2) << "Metric not logged due to recording_level "
              << recording_level_ << " < " << parameters.recording_level;
     return;
   }
   RapporMetric* metric = LookUpMetric(metric_name, parameters);
   metric->AddSample(sample);
 }
 
 RapporMetric* RapporService::LookUpMetric(const std::string& metric_name,
                                           const RapporParameters& parameters) {
   DCHECK(IsInitialized());
   std::map<std::string, RapporMetric*>::const_iterator it =
       metrics_map_.find(metric_name);
   if (it != metrics_map_.end()) {
     RapporMetric* metric = it->second;
     DCHECK_EQ(parameters.ToString(), metric->parameters().ToString());
     return metric;
   }
 
-  RapporMetric* new_metric = new RapporMetric(metric_name, parameters, cohort_);
+  RapporMetric* new_metric = new RapporMetric(metric_name, parameters);
   metrics_map_[metric_name] = new_metric;
   return new_metric;
 }
 
 }  // namespace rappor