Alternative Multi-dimensional Rappor

components/rappor/rappor_service.h

 // 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.
 
 #ifndef COMPONENTS_RAPPOR_RAPPOR_SERVICE_H_
 #define COMPONENTS_RAPPOR_RAPPOR_SERVICE_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "components/metrics/daily_event.h"
 #include "components/rappor/rappor_parameters.h"
+#include "components/rappor/sample.h"
+#include "components/rappor/sampler.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace rappor {
 
@@ skipping 38 matching lines @@
   // Records a sample of the rappor metric specified by |metric_name|.
   // Creates and initializes the metric, if it doesn't yet exist.
   virtual void RecordSample(const std::string& metric_name,
                             RapporType type,
                             const std::string& sample);
 
   // Registers the names of all of the preferences used by RapporService in the
   // provided PrefRegistry. This should be called before calling Start().
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
+  scoped_ptr<Sample> MakeSampleObj(RapporType);

[Alexei Svitkine (slow), 2015/04/23 21:42:34]

I don't think we should use "SampleObj" in the signature. How about
CreateSample() and RecordSample(). Also, these methods need documentation -
should be above the static function above.

[Steven Holte, 2015/04/24 16:59:05]

Renamed to CreateSampleObj, but RecordSample is already used by the string
recording function.  It probably makes sense to rename that to RecordString, but
that would require changing a bunch of callers.

+
+  void RecordSampleObj(const std::string& metric_name,
+                       scoped_ptr<Sample> sample);
+
  protected:
   // Initializes the state of the RapporService.
   void InitializeInternal(scoped_ptr<LogUploaderInterface> uploader,
                           int32_t cohort,
                           const std::string& secret);
 
   // Sets the recording level.
   void SetRecordingLevel(RecordingLevel parameters);
 
   // Cancels the next call to OnLogInterval.
@@ skipping 48 matching lines @@
   // A private LogUploader instance for sending reports to the server.
   scoped_ptr<LogUploaderInterface> uploader_;
 
   // What reporting level of metrics are being reported.
   RecordingLevel recording_level_;
 
   // We keep all registered metrics in a map, from name to metric.
   // The map owns the metrics it contains.
   std::map<std::string, RapporMetric*> metrics_map_;
 
+  internal::Sampler sampler_;
+
   DISALLOW_COPY_AND_ASSIGN(RapporService);
 };
 
 }  // namespace rappor
 
 #endif  // COMPONENTS_RAPPOR_RAPPOR_SERVICE_H_