Source release 17.1.0

metrics/include/event_metric.h

@@ -1,26 +1,24 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // This file contains the declarations for the EventMetric class and related
 // types.
 #ifndef WVCDM_METRICS_EVENT_METRIC_H_
 #define WVCDM_METRICS_EVENT_METRIC_H_
-
-#include <cstdarg>
 #include <map>
 #include <mutex>
 #include <string>
-#include <vector>
 
-#include "OEMCryptoCENC.h"
 #include "attribute_handler.h"
 #include "distribution.h"
+#include "field_tuples.h"
 #include "log.h"
 #include "pow2bucket.h"
 #include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {
-
 class EventMetricTest;
 
 // This base class provides the common defintion used by all templated
@@ -36,12 +34,12 @@ class BaseEventMetric {
   // Record will look for an existing instance of the Distribution identified
   // by the distribution_key string and update it. If the instance does
   // not exist, this will create it.
-  void Record(const std::string &distribution_key, double value);
+  void Record(const std::string& distribution_key, double value);
 
   // value_map_ contains a mapping from the string key (attribute name/values)
   // to the distribution instance which holds the metric information
   // (min, max, sum, etc.).
-  std::map<std::string, Distribution *> value_map_;
+  std::map<std::string, Distribution*> value_map_;
 
  private:
   friend class EventMetricTest;
@@ -90,34 +88,33 @@ template <int I1 = 0, typename F1 = util::Unused, int I2 = 0,
 class EventMetric : public BaseEventMetric {
  public:
   // Create an EventMetric instance with no attribute breakdowns.
-  explicit EventMetric() : BaseEventMetric(){}
+  explicit EventMetric() : BaseEventMetric() {}
 
   // Record will update the statistics of the EventMetric broken down by the
   // given field values.
   void Record(double value, F1 field1 = util::Unused(),
               F2 field2 = util::Unused(), F3 field3 = util::Unused(),
               F4 field4 = util::Unused()) {
-    std::string key =
-        attribute_handler_.GetSerializedAttributes(field1, field2,
-                                                   field3, field4);
+    std::string key = attribute_handler_.GetSerializedAttributes(
+        field1, field2, field3, field4);
     BaseEventMetric::Record(key, value);
   }
 
-  const std::map<std::string, Distribution *>* GetDistributions() const {
+  const std::map<std::string, Distribution*>* GetDistributions() const {
     return &value_map_;
   };
 
   void ToProto(
-      ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>
-          *distributions_proto) const;
+      ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>*
+          distributions_proto) const;
 
  private:
   friend class EventMetricTest;
   AttributeHandler<I1, F1, I2, F2, I3, F3, I4, F4> attribute_handler_;
 
   inline void SetDistributionValues(
-      const Distribution &distribution,
-      drm_metrics::DistributionMetric *metric_proto) const {
+      const Distribution& distribution,
+      drm_metrics::DistributionMetric* metric_proto) const {
     metric_proto->set_mean(distribution.Mean());
     metric_proto->set_operation_count(distribution.Count());
     if (distribution.Count() > 1) {
@@ -138,13 +135,14 @@ template <>
 inline void EventMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0,
                         util::Unused>::
     ToProto(
-        ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>
-            *distributions_proto) const {
-  const std::map<std::string, Distribution *>* distributions
-      = GetDistributions();
-  for (std::map<std::string, Distribution *>::const_iterator it =
-       distributions->begin(); it != distributions->end(); it++) {
-    drm_metrics::DistributionMetric *new_metric = distributions_proto->Add();
+        ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>*
+            distributions_proto) const {
+  const std::map<std::string, Distribution*>* distributions =
+      GetDistributions();
+  for (std::map<std::string, Distribution*>::const_iterator it =
+           distributions->begin();
+       it != distributions->end(); it++) {
+    drm_metrics::DistributionMetric* new_metric = distributions_proto->Add();
     SetDistributionValues(*it->second, new_metric);
   }
 }
@@ -152,21 +150,20 @@ inline void EventMetric<0, util::Unused, 0, util::Unused, 0, util::Unused, 0,
 template <int I1, typename F1, int I2, typename F2, int I3, typename F3, int I4,
           typename F4>
 inline void EventMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto(
-    ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>
-        *distributions_proto) const {
-  const std::map<std::string, Distribution *>* distributions
-      = GetDistributions();
-  for (std::map<std::string, Distribution *>::const_iterator it =
-       distributions->begin(); it != distributions->end(); it++) {
-    drm_metrics::DistributionMetric *new_metric = distributions_proto->Add();
+    ::google::protobuf::RepeatedPtrField<drm_metrics::DistributionMetric>*
+        distributions_proto) const {
+  const std::map<std::string, Distribution*>* distributions =
+      GetDistributions();
+  for (std::map<std::string, Distribution*>::const_iterator it =
+           distributions->begin();
+       it != distributions->end(); it++) {
+    drm_metrics::DistributionMetric* new_metric = distributions_proto->Add();
     if (!new_metric->mutable_attributes()->ParseFromString(it->first)) {
       LOGE("Failed to parse the attributes from a string.");
     }
     SetDistributionValues(*it->second, new_metric);
   }
 }
-
 }  // namespace metrics
 }  // namespace wvcdm
-
 #endif  // WVCDM_METRICS_EVENT_METRIC_H_