Index: chrome/test/chromedriver/performance_logger.cc |
diff --git a/chrome/test/chromedriver/performance_logger.cc b/chrome/test/chromedriver/performance_logger.cc |
index 44d837b9befae29554be85668ffd118dcd5b0d36..822092d3a307e903ed29c1ea535706a31ec189cf 100644 |
--- a/chrome/test/chromedriver/performance_logger.cc |
+++ b/chrome/test/chromedriver/performance_logger.cc |
@@ -2,24 +2,53 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "chrome/test/chromedriver/performance_logger.h" |
+ |
#include <string> |
#include <vector> |
-#include "chrome/test/chromedriver/performance_logger.h" |
- |
+#include "base/bind.h" |
#include "base/json/json_writer.h" |
#include "base/strings/string_util.h" |
#include "base/values.h" |
+#include "chrome/test/chromedriver/chrome/chrome.h" |
#include "chrome/test/chromedriver/chrome/devtools_client.h" |
#include "chrome/test/chromedriver/chrome/devtools_client_impl.h" |
#include "chrome/test/chromedriver/chrome/log.h" |
#include "chrome/test/chromedriver/chrome/status.h" |
+#include "chrome/test/chromedriver/chrome/version.h" |
+#include "chrome/test/chromedriver/session.h" |
namespace { |
// DevTools event domain prefixes to intercept. |
const char* const kDomains[] = {"Network.", "Page.", "Timeline."}; |
+// Whitelist of WebDriver commands on which to request buffered trace events. |
+const char* const kRequestTraceCommands[] = {"GetLog" /* required */, |
+ "Navigate"}; |
+ |
+bool IsBrowserwideClient(DevToolsClient* client) { |
+ return (client->GetId() == DevToolsClientImpl::kBrowserwideDevToolsClientId); |
+} |
+ |
+bool IsEnabled(const PerfLoggingPrefs::InspectorDomainStatus& domain_status) { |
+ return (domain_status == |
+ PerfLoggingPrefs::InspectorDomainStatus::kDefaultEnabled || |
+ domain_status == |
+ PerfLoggingPrefs::InspectorDomainStatus::kExplicitlyEnabled); |
+} |
+ |
+// Returns whether |command| is in kRequestTraceCommands[] (case-insensitive). |
+bool ShouldRequestTraceEvents(const std::string& command) { |
+ for (size_t i_domain = 0; i_domain < arraysize(kRequestTraceCommands); |
+ ++i_domain) { |
+ if (base::strcasecmp(command.c_str(), kRequestTraceCommands[i_domain]) == 0) |
+ return true; |
+ } |
+ return false; |
+} |
+ |
// Returns whether the event belongs to one of kDomains. |
bool ShouldLogEvent(const std::string& method) { |
for (size_t i_domain = 0; i_domain < arraysize(kDomains); ++i_domain) { |
@@ -29,37 +58,86 @@ bool ShouldLogEvent(const std::string& method) { |
return false; |
} |
-bool IsEnabled(const PerfLoggingPrefs::InspectorDomainStatus& domain_status) { |
- return (domain_status == |
- PerfLoggingPrefs::InspectorDomainStatus::kDefaultEnabled || |
- domain_status == |
- PerfLoggingPrefs::InspectorDomainStatus::kExplicitlyEnabled); |
-} |
- |
} // namespace |
-PerformanceLogger::PerformanceLogger(Log* log) |
- : log_(log) {} |
+PerformanceLogger::PerformanceLogger(Log* log, const Session* session) |
+ : log_(log), |
+ session_(session), |
+ browser_client_(NULL), |
+ trace_buffering_(false) {} |
-PerformanceLogger::PerformanceLogger(Log* log, const PerfLoggingPrefs& prefs) |
+PerformanceLogger::PerformanceLogger(Log* log, |
+ const Session* session, |
+ const PerfLoggingPrefs& prefs) |
: log_(log), |
- prefs_(prefs) { |
- if (!prefs_.trace_categories.empty()) { |
- LOG(WARNING) << "Ignoring trace categories because tracing support not yet " |
- << "implemented: " << prefs_.trace_categories; |
- prefs_.trace_categories = ""; |
- } |
-} |
+ session_(session), |
+ prefs_(prefs), |
+ browser_client_(NULL), |
+ trace_buffering_(false) {} |
bool PerformanceLogger::subscribes_to_browser() { |
return true; |
} |
Status PerformanceLogger::OnConnected(DevToolsClient* client) { |
- if (client->GetId() == DevToolsClientImpl::kBrowserwideDevToolsClientId) { |
- // TODO(johnmoore): Implement tracing log. |
+ if (IsBrowserwideClient(client)) { |
+ browser_client_ = client; |
+ if (!prefs_.trace_categories.empty()) { |
+ Status status = StartTrace(); |
+ if (status.IsError()) |
+ return status; |
+ } |
return Status(kOk); |
} |
+ return EnableInspectorDomains(client); |
+} |
+ |
+Status PerformanceLogger::OnEvent( |
+ DevToolsClient* client, |
+ const std::string& method, |
+ const base::DictionaryValue& params) { |
+ if (IsBrowserwideClient(client)) { |
+ return HandleTraceEvents(client, method, params); |
+ } else { |
+ return HandleInspectorEvents(client, method, params); |
+ } |
+} |
+ |
+Status PerformanceLogger::BeforeCommand(const std::string& command_name) { |
+ // Only dump trace buffer after tracing has been started. |
+ if (trace_buffering_ && ShouldRequestTraceEvents(command_name)) { |
+ Status status = CollectTraceEvents(); |
+ if (status.IsError()) |
+ return status; |
+ } |
+ return Status(kOk); |
+} |
+ |
+void PerformanceLogger::AddLogEntry( |
+ Log::Level level, |
+ const std::string& webview, |
+ const std::string& method, |
+ const base::DictionaryValue& params) { |
+ base::DictionaryValue log_message_dict; |
+ log_message_dict.SetString("webview", webview); |
+ log_message_dict.SetString("message.method", method); |
+ log_message_dict.Set("message.params", params.DeepCopy()); |
+ std::string log_message_json; |
+ base::JSONWriter::Write(&log_message_dict, &log_message_json); |
+ |
+ // TODO(klm): extract timestamp from params? |
+ // Look at where it is for Page, Network, Timeline, and trace events. |
+ log_->AddEntry(level, log_message_json); |
+} |
+ |
+void PerformanceLogger::AddLogEntry( |
+ const std::string& webview, |
+ const std::string& method, |
+ const base::DictionaryValue& params) { |
+ AddLogEntry(Log::kInfo, webview, method, params); |
+} |
+ |
+Status PerformanceLogger::EnableInspectorDomains(DevToolsClient* client) { |
std::vector<std::string> enable_commands; |
if (IsEnabled(prefs_.network)) |
enable_commands.push_back("Network.enable"); |
@@ -82,27 +160,137 @@ Status PerformanceLogger::OnConnected(DevToolsClient* client) { |
return Status(kOk); |
} |
-Status PerformanceLogger::OnEvent( |
+Status PerformanceLogger::HandleInspectorEvents( |
DevToolsClient* client, |
const std::string& method, |
const base::DictionaryValue& params) { |
if (!ShouldLogEvent(method)) |
return Status(kOk); |
- base::DictionaryValue log_message_dict; |
- log_message_dict.SetString("webview", client->GetId()); |
- log_message_dict.SetString("message.method", method); |
- log_message_dict.Set("message.params", params.DeepCopy()); |
- std::string log_message_json; |
- // TODO(klm): extract timestamp from params? |
- // Look at where it is for Page, Network, Timeline events. |
- base::JSONWriter::Write(&log_message_dict, &log_message_json); |
+ AddLogEntry(client->GetId(), method, params); |
+ return Status(kOk); |
+} |
- log_->AddEntry(Log::kInfo, log_message_json); |
+Status PerformanceLogger::HandleTraceEvents( |
+ DevToolsClient* client, |
+ const std::string& method, |
+ const base::DictionaryValue& params) { |
+ if (method == "Tracing.tracingComplete") { |
+ trace_buffering_ = false; |
+ } else if (method == "Tracing.dataCollected") { |
+ // The Tracing.dataCollected event contains a list of trace events. |
+ // Add each one as an individual log entry of method Tracing.dataCollected. |
+ const base::ListValue* traces; |
+ if (!params.GetList("value", &traces)) { |
+ return Status(kUnknownError, |
+ "received DevTools trace data in unexpected format"); |
+ } |
+ for (base::ListValue::const_iterator it = traces->begin(); |
+ it != traces->end(); |
+ ++it) { |
+ base::DictionaryValue* event_dict; |
+ if (!(*it)->GetAsDictionary(&event_dict)) |
+ return Status(kUnknownError, "trace event must be a dictionary"); |
+ AddLogEntry(client->GetId(), "Tracing.dataCollected", *event_dict); |
+ } |
+ } else if (method == "Tracing.bufferUsage") { |
+ // 'value' will be between 0-1 and represents how full the DevTools trace |
+ // buffer is. If the buffer is full, warn the user. |
+ double buffer_usage = 0; |
+ if (!params.GetDouble("value", &buffer_usage)) { |
+ // Tracing.bufferUsage event will occur once per second, and it really |
+ // only serves as a warning, so if we can't reliably tell whether the |
+ // buffer is full, just fail silently instead of spamming the logs. |
+ return Status(kOk); |
+ } |
+ if (buffer_usage >= 0.99999) { |
+ base::DictionaryValue params; |
+ std::string err("Chrome's trace buffer filled while collecting events, " |
+ "so some trace events may have been lost"); |
+ params.SetString("error", err); |
+ // Expose error to client via perf log using same format as other entries. |
+ AddLogEntry(Log::kWarning, |
+ DevToolsClientImpl::kBrowserwideDevToolsClientId, |
+ "Tracing.bufferUsage", params); |
+ LOG(WARNING) << err; |
+ } |
+ } |
return Status(kOk); |
} |
-// TODO(johnmoore): Use BeforeCommand to implement tracing log. |
-Status PerformanceLogger::BeforeCommand(const std::string& command_name) { |
+bool PerformanceLogger::ShouldReportTracingError() { |
+ // Chromium builds 1967-2000, which correspond to Blink revisions 172887- |
+ // 174227, contain a regression where Tracing.start and Tracing.end commands |
+ // erroneously return error -32601 "no such method". The commands still work. |
+ if (session_->chrome) { |
+ const BrowserInfo* browser_info = session_->chrome->GetBrowserInfo(); |
+ |
+ bool should_report_error = true; |
+ if (browser_info->browser_name == "chrome") { |
+ should_report_error = !(browser_info->build_no >= 1967 && |
+ browser_info->build_no <= 2000); |
+ } else { |
+ should_report_error = !(browser_info->blink_revision >= 172887 && |
+ browser_info->blink_revision <= 174227); |
+ } |
+ return should_report_error; |
+ } |
+ |
+ // We're not yet able to tell the Chrome version, so don't report this error. |
+ return false; |
+} |
+ |
+Status PerformanceLogger::StartTrace() { |
+ if (!browser_client_) { |
+ return Status(kUnknownError, "tried to start tracing, but connection to " |
+ "browser was not yet established"); |
+ } |
+ if (trace_buffering_) { |
+ LOG(WARNING) << "tried to start tracing, but a trace was already started"; |
+ return Status(kOk); |
+ } |
+ base::DictionaryValue params; |
+ params.SetString("categories", prefs_.trace_categories); |
+ // Ask DevTools to report buffer usage. |
+ params.SetInteger("bufferUsageReportingInterval", |
+ prefs_.buffer_usage_reporting_interval); |
+ Status status = browser_client_->SendCommand("Tracing.start", params); |
+ if (status.IsError() && ShouldReportTracingError()) { |
+ LOG(ERROR) << "error when starting trace: " << status.message(); |
+ return status; |
+ } |
+ trace_buffering_ = true; |
+ return Status(kOk); |
+} |
+ |
+Status PerformanceLogger::CollectTraceEvents() { |
+ if (!browser_client_) { |
+ return Status(kUnknownError, "tried to collect trace events, but " |
+ "connection to browser was not yet established"); |
+ } |
+ if (!trace_buffering_) { |
+ return Status(kUnknownError, "tried to collect trace events, but tracing " |
+ "was not started"); |
+ } |
+ |
+ Status status = browser_client_->SendCommand("Tracing.end", |
+ base::DictionaryValue()); |
+ if (status.IsError() && ShouldReportTracingError()) { |
+ LOG(ERROR) << "error when stopping trace: " << status.message(); |
+ return status; |
+ } |
+ |
+ // Block up to 30 seconds until Tracing.tracingComplete event is received. |
+ status = browser_client_->HandleEventsUntil( |
+ base::Bind(&PerformanceLogger::IsTraceDone, base::Unretained(this)), |
+ base::TimeDelta::FromSeconds(30)); |
+ if (status.IsError()) |
+ return status; |
+ |
+ return StartTrace(); |
+} |
+ |
+Status PerformanceLogger::IsTraceDone(bool* trace_done) const { |
+ *trace_done = !trace_buffering_; |
return Status(kOk); |
} |