Skip to content

Commit

Permalink
Revert "Feedback: Add extra verbose loggings"
Browse files Browse the repository at this point in the history
This reverts commit 2883fee.

Reason for revert: Extra logging is no longer needed

Original change's description:
> Feedback: Add extra verbose loggings
>
> To help investigate whether the issue of dropped
> feedback reports is a client side problem, we add
> extra verbose loggings to various stages during
> the report preparation and uploading.
>
> BUG=909096
> TEST=deploy image on eve, and run chrome with --vmodule=*feedback*=1
>      and make sure the verbose loggings show up in /home/chronos/user/log/chrome
>
> Change-Id: I9cfbad6af21f375fa5c099aa58ddcb4c4a381add
> Reviewed-on: https://chromium-review.googlesource.com/c/1383541
> Reviewed-by: Toni Baržić <tbarzic@chromium.org>
> Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#617878}

TBR=semenzato@chromium.org,tbarzic@chromium.org,afakhry@chromium.org

Bug: 909096
Change-Id: Ie119a8b88d1ade4713653afafcdb0b4faa2c51af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594919
Reviewed-by: Jeffrey Kardatzke <jkardatzke@google.com>
Commit-Queue: Jeffrey Kardatzke <jkardatzke@google.com>
Cr-Commit-Position: refs/heads/master@{#656521}
  • Loading branch information
Narflex authored and Commit Bot committed May 3, 2019
1 parent c316b40 commit 573bb1d
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,12 @@ void ChromeFeedbackPrivateDelegate::FetchExtraLogs(
constexpr bool scrub = true;

if (system_logs::ContainsIwlwifiLogs(feedback_data->sys_info())) {
VLOG(1) << "Fetching WiFi dump logs.";
system_logs::SystemLogsFetcher* fetcher =
new system_logs::SystemLogsFetcher(scrub);
fetcher->AddSource(std::make_unique<system_logs::IwlwifiDumpLogSource>());
fetcher->Fetch(base::BindOnce(&OnFetchedExtraLogs, feedback_data,
std::move(callback)));
} else {
VLOG(1) << "WiFi dump logs are not present.";
std::move(callback).Run(feedback_data);
}
}
Expand Down
5 changes: 0 additions & 5 deletions components/feedback/feedback_uploader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,7 @@ void FeedbackUploader::OnReportUploadFailure(bool should_retry) {
retry_delay_ *= 2;
report_being_dispatched_->set_upload_at(retry_delay_ + base::Time::Now());
reports_queue_.emplace(report_being_dispatched_);
VLOG(1) << "Report upload failed. Will retry again after "
<< retry_delay_.InSeconds() << " seconds.";
} else {
VLOG(1) << "Report upload failed. Will discard.";
// The report won't be retried, hence explicitly delete its file on disk.
report_being_dispatched_->DeleteReportOnDisk();
}
Expand All @@ -132,7 +129,6 @@ void FeedbackUploader::AppendExtraHeadersToUploadRequest(
network::ResourceRequest* resource_request) {}

void FeedbackUploader::DispatchReport() {
VLOG(1) << "Uploading report.";
net::NetworkTrafficAnnotationTag traffic_annotation =
net::DefineNetworkTrafficAnnotation("chrome_feedback_report_app", R"(
semantics {
Expand Down Expand Up @@ -260,7 +256,6 @@ void FeedbackUploader::UpdateUploadTimer() {

void FeedbackUploader::QueueReportWithDelay(std::unique_ptr<std::string> data,
base::TimeDelta delay) {
VLOG(1) << "Queuing report with delay = " << delay.InSeconds() << " seconds.";
reports_queue_.emplace(base::MakeRefCounted<FeedbackReport>(
feedback_reports_path_, base::Time::Now() + delay, std::move(data),
task_runner_));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ ExtensionFunction::ResponseAction FeedbackPrivateGetUserEmailFunction::Run() {

ExtensionFunction::ResponseAction
FeedbackPrivateGetSystemInformationFunction::Run() {
VLOG(1) << "Fetching system logs started.";
// Self-deleting object.
system_logs::SystemLogsFetcher* fetcher =
ExtensionsAPIClient::Get()
Expand All @@ -229,7 +228,6 @@ FeedbackPrivateGetSystemInformationFunction::Run() {

void FeedbackPrivateGetSystemInformationFunction::OnCompleted(
std::unique_ptr<system_logs::SystemLogsResponse> sys_info) {
VLOG(1) << "Received system logs.";
SystemInformationList sys_info_list;
if (sys_info) {
sys_info_list.reserve(sys_info->size());
Expand Down Expand Up @@ -294,7 +292,6 @@ void FeedbackPrivateReadLogSourceFunction::OnCompleted(
#endif // defined(OS_CHROMEOS)

ExtensionFunction::ResponseAction FeedbackPrivateSendFeedbackFunction::Run() {
VLOG(1) << "Sending feedback report started.";
std::unique_ptr<feedback_private::SendFeedback::Params> params(
feedback_private::SendFeedback::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params);
Expand Down Expand Up @@ -368,7 +365,6 @@ void FeedbackPrivateSendFeedbackFunction::OnAllLogsFetched(
bool send_histograms,
bool send_bluetooth_logs,
scoped_refptr<feedback::FeedbackData> feedback_data) {
VLOG(1) << "All logs have been fetched. Proceeding with sending the report.";

feedback_data->CompressSystemInfo();

Expand Down
3 changes: 0 additions & 3 deletions extensions/browser/api/feedback_private/feedback_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ void FeedbackService::SendFeedback(scoped_refptr<FeedbackData> feedback_data,
feedback_data->set_user_agent(ExtensionsBrowserClient::Get()->GetUserAgent());

if (!feedback_data->attached_file_uuid().empty()) {
VLOG(1) << "Attaching file to the report.";
// Self-deleting object.
BlobReader* attached_file_reader =
new BlobReader(browser_context_, feedback_data->attached_file_uuid(),
Expand All @@ -50,7 +49,6 @@ void FeedbackService::SendFeedback(scoped_refptr<FeedbackData> feedback_data,
}

if (!feedback_data->screenshot_uuid().empty()) {
VLOG(1) << "Attaching screenshot to the report.";
// Self-deleting object.
BlobReader* screenshot_reader =
new BlobReader(browser_context_, feedback_data->screenshot_uuid(),
Expand Down Expand Up @@ -101,7 +99,6 @@ void FeedbackService::CompleteSendFeedback(
const bool screenshot_completed = feedback_data->screenshot_uuid().empty();

if (screenshot_completed && attached_file_completed) {
VLOG(1) << "Attachments are ready.";
#if defined(OS_CHROMEOS)
// Send feedback to Assistant server if triggered from Google Assistant.
if (feedback_data->from_assistant()) {
Expand Down

0 comments on commit 573bb1d

Please sign in to comment.