Attach performance tracing data to feedback reports

chrome/browser/feedback/feedback_data.cc

 // Copyright (c) 2012 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 "chrome/browser/feedback/feedback_data.h"
 
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/feedback/feedback_util.h"
+#include "chrome/browser/feedback/tracing_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #endif
 
 using content::BrowserThread;
 
 #if defined(OS_CHROMEOS)
 namespace {
 
 const char kMultilineIndicatorString[] = "<multiline>\n";
 const char kMultilineStartString[] = "---------- START ----------\n";
 const char kMultilineEndString[] = "---------- END ----------\n\n";
 
+const char kTraceFilename[] = "tracing.log\n";
+
 std::string LogsToString(chromeos::SystemLogsResponse* sys_info) {
   std::string syslogs_string;
   for (chromeos::SystemLogsResponse::const_iterator it = sys_info->begin();
       it != sys_info->end(); ++it) {
     std::string key = it->first;
     std::string value = it->second;
 
     TrimString(key, "\n ", &key);
     TrimString(value, "\n ", &value);
 
@@ skipping 19 matching lines @@
   }
 }
 
 }  // namespace
 #endif // OS_CHROMEOS
 
 FeedbackData::FeedbackData() : profile_(NULL),
                                feedback_page_data_complete_(false) {
 #if defined(OS_CHROMEOS)
   sys_info_.reset(NULL);
+  trace_id_ = 0;
   attached_filedata_.reset(NULL);
   send_sys_info_ = true;
   read_attached_file_complete_ = false;
   syslogs_collection_complete_ = false;
 #endif
 }
 
 FeedbackData::~FeedbackData() {
 }
 
 bool FeedbackData::DataCollectionComplete() {
 #if defined(OS_CHROMEOS)
   return (syslogs_collection_complete_ || !send_sys_info_) &&
       read_attached_file_complete_ &&
       feedback_page_data_complete_;
 #else
   return feedback_page_data_complete_;
 #endif
 }
 void FeedbackData::SendReport() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (DataCollectionComplete())
     FeedbackUtil::SendReport(this);
 }
 
 void FeedbackData::FeedbackPageDataComplete() {
 #if defined(OS_CHROMEOS)
+  if (trace_id_ != 0) {
+    TracingManager* manager = TracingManager::Get();
+    if (manager &&
+        manager->GetTraceData(
+            trace_id_,
+            base::Bind(&FeedbackData::OnGetTraceData, this))) {
+      return;

[rkc, 2013/08/09 21:15:44]

Nit: Document this early return, this confused me a bit.

[Zachary Kuznia, 2013/08/09 21:45:28]

Done.

+    } else {
+      trace_id_ = 0;
+    }
+  }
   if (attached_filename_.size() &&
       base::FilePath::IsSeparator(attached_filename_[0]) &&
       !attached_filedata_.get()) {
     // Read the attached file and then send this report. The allocated string
     // will be freed in FeedbackUtil::SendReport.
     attached_filedata_.reset(new std::string);
 
     base::FilePath root =
         ash::Shell::GetInstance()->delegate()->
             GetCurrentBrowserContext()->GetPath();
@@ skipping 64 matching lines @@
   fetcher->Fetch(base::Bind(&FeedbackData::CompressSyslogs, this));
 }
 
 // private
 void FeedbackData::ReadAttachedFile(const base::FilePath& from) {
   if (!file_util::ReadFileToString(from, attached_filedata_.get())) {
     if (attached_filedata_.get())
       attached_filedata_->clear();
   }
 }
+
+void FeedbackData::OnGetTraceData(
+    scoped_refptr<base::RefCountedString> trace_data) {
+  scoped_ptr<std::string> data(new std::string(trace_data->data()));
+
+  set_attached_filename(kTraceFilename);
+  set_attached_filedata(data.Pass());
+  trace_id_ = 0;
+  FeedbackPageDataComplete();
+}
+
 #endif