Revert of Trace the stats report as JSON instead of each stat separately.

webrtc/pc/rtcstatscollector.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 14 matching lines @@
 #include "webrtc/pc/webrtcsession.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/stringutils.h"
 #include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/rtc_base/trace_event.h"
 
 namespace webrtc {
 
 namespace {
 
+const int kStatTypeMemberNameAndIdMaxLen = 1024;
+
+std::string GetStatTypeMemberNameAndId(const RTCStats& stats,
+                                       const RTCStatsMemberInterface* member) {
+  RTC_DCHECK(strlen(stats.type()) + strlen(member->name())
+             + stats.id().size() + 3 < kStatTypeMemberNameAndIdMaxLen);
+  char buffer[kStatTypeMemberNameAndIdMaxLen];
+  rtc::sprintfn(&buffer[0], sizeof(buffer), "%s.%s.%s", stats.type(),
+                member->name(), stats.id().c_str());
+  return buffer;
+}
+
 std::string RTCCertificateIDFromFingerprint(const std::string& fingerprint) {
   return "RTCCertificate_" + fingerprint;
 }
 
 std::string RTCCodecStatsIDFromDirectionMediaAndPayload(
     bool inbound, bool audio, uint32_t payload_type) {
   // TODO(hbos): The present codec ID assignment is not sufficient to support
   // Unified Plan or unbundled connections in all cases. When we are able to
   // handle multiple m= lines of the same media type (and multiple BaseChannels
   // for the same type is possible?) this needs to be updated to differentiate
@@ skipping 711 matching lines @@
   if (!num_pending_partial_reports_) {
     cache_timestamp_us_ = partial_report_timestamp_us_;
     cached_report_ = partial_report_;
     partial_report_ = nullptr;
     channel_name_pairs_.reset();
     track_media_info_map_.reset();
     track_to_id_.clear();
     // Trace WebRTC Stats when getStats is called on Javascript.
     // This allows access to WebRTC stats from trace logs. To enable them,
     // select the "webrtc_stats" category when recording traces.
-    TRACE_EVENT_INSTANT1("webrtc_stats", "webrtc_stats", "report",
-                         cached_report_->ToJson());
+    for (const RTCStats& stats : *cached_report_) {
+      for (const RTCStatsMemberInterface* member : stats.Members()) {
+        if (member->is_defined()) {
+          TRACE_EVENT_INSTANT2("webrtc_stats", "webrtc_stats",
+                               "value", member->ValueToString(),
+                               "type.name.id", GetStatTypeMemberNameAndId(
+                                   stats, member));
+        }
+      }
+    }
     DeliverCachedReport();
   }
 }
 
 void RTCStatsCollector::DeliverCachedReport() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   RTC_DCHECK(!callbacks_.empty());
   RTC_DCHECK(cached_report_);
   for (const rtc::scoped_refptr<RTCStatsCollectorCallback>& callback :
        callbacks_) {
@@ skipping 477 matching lines @@
     const std::string& type) {
   return CandidateTypeToRTCIceCandidateType(type);
 }
 
 const char* DataStateToRTCDataChannelStateForTesting(
     DataChannelInterface::DataState state) {
   return DataStateToRTCDataChannelState(state);
 }
 
 }  // namespace webrtc