Commit 99c53bcf authored by Misha Efimov's avatar Misha Efimov Committed by Commit Bot

Prevent PII logging in domain reliability component.

Bug: 905262
Change-Id: I84199aa390a7b67e996d9022e94a826363084796
Reviewed-on: https://chromium-review.googlesource.com/c/1335954Reviewed-by: default avatarEric Orth <ericorth@chromium.org>
Commit-Queue: Misha Efimov <mef@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608109}
parent fbdbb023
...@@ -231,7 +231,7 @@ void DomainReliabilityContext::RollbackUpload() { ...@@ -231,7 +231,7 @@ void DomainReliabilityContext::RollbackUpload() {
void DomainReliabilityContext::RemoveOldestBeacon() { void DomainReliabilityContext::RemoveOldestBeacon() {
DCHECK(!beacons_.empty()); DCHECK(!beacons_.empty());
VLOG(1) << "Beacon queue for " << config().origin << " full; " DVLOG(1) << "Beacon queue for " << config().origin << " full; "
<< "removing oldest beacon"; << "removing oldest beacon";
beacons_.pop_front(); beacons_.pop_front();
......
...@@ -36,7 +36,7 @@ void DomainReliabilityContextManager::SetConfig( ...@@ -36,7 +36,7 @@ void DomainReliabilityContextManager::SetConfig(
std::string key = origin.host(); std::string key = origin.host();
if (!contexts_.count(key) && !removed_contexts_.count(key)) { if (!contexts_.count(key) && !removed_contexts_.count(key)) {
LOG(WARNING) << "Ignoring NEL header for unknown origin " << origin.spec() DLOG(WARNING) << "Ignoring NEL header for unknown origin " << origin.spec()
<< "."; << ".";
return; return;
} }
......
...@@ -234,7 +234,7 @@ std::unique_ptr<DomainReliabilityHeader> DomainReliabilityHeader::Parse( ...@@ -234,7 +234,7 @@ std::unique_ptr<DomainReliabilityHeader> DomainReliabilityHeader::Parse(
include_subdomains = true; include_subdomains = true;
got_include_subdomains = true; got_include_subdomains = true;
} else { } else {
LOG(WARNING) << "Ignoring unknown NEL header directive " << name << "."; DLOG(WARNING) << "Ignoring unknown NEL header directive " << name << ".";
} }
} }
......
...@@ -410,7 +410,7 @@ void DomainReliabilityMonitor::MaybeHandleHeader( ...@@ -410,7 +410,7 @@ void DomainReliabilityMonitor::MaybeHandleHeader(
std::string ignored_header_value; std::string ignored_header_value;
if (request.response_info.headers->EnumerateHeader( if (request.response_info.headers->EnumerateHeader(
&iter, kHeaderNameString, &ignored_header_value)) { &iter, kHeaderNameString, &ignored_header_value)) {
LOG(WARNING) << "Request to " << request.url << " had (at least) two " DLOG(WARNING) << "Request to " << request.url << " had (at least) two "
<< kHeaderNameString << " headers: \"" << header_value << kHeaderNameString << " headers: \"" << header_value
<< "\" and \"" << ignored_header_value << "\"."; << "\" and \"" << ignored_header_value << "\".";
return; return;
...@@ -430,7 +430,7 @@ void DomainReliabilityMonitor::MaybeHandleHeader( ...@@ -430,7 +430,7 @@ void DomainReliabilityMonitor::MaybeHandleHeader(
context_manager_.ClearConfig(origin); context_manager_.ClearConfig(origin);
break; break;
case DomainReliabilityHeader::PARSE_ERROR: case DomainReliabilityHeader::PARSE_ERROR:
LOG(WARNING) << "Request to " << request.url << " had invalid " DLOG(WARNING) << "Request to " << request.url << " had invalid "
<< kHeaderNameString << " header \"" << header_value << kHeaderNameString << " header \"" << header_value
<< "\"."; << "\".";
break; break;
......
...@@ -76,14 +76,14 @@ class DomainReliabilityUploaderImpl ...@@ -76,14 +76,14 @@ class DomainReliabilityUploaderImpl
int max_upload_depth, int max_upload_depth,
const GURL& upload_url, const GURL& upload_url,
const DomainReliabilityUploader::UploadCallback& callback) override { const DomainReliabilityUploader::UploadCallback& callback) override {
VLOG(1) << "Uploading report to " << upload_url; DVLOG(1) << "Uploading report to " << upload_url;
VLOG(2) << "Report JSON: " << report_json; DVLOG(2) << "Report JSON: " << report_json;
if (discard_uploads_) if (discard_uploads_)
discarded_upload_count_++; discarded_upload_count_++;
if (discard_uploads_ || shutdown_) { if (discard_uploads_ || shutdown_) {
VLOG(1) << "Discarding report instead of uploading."; DVLOG(1) << "Discarding report instead of uploading.";
UploadResult result; UploadResult result;
result.status = UploadResult::SUCCESS; result.status = UploadResult::SUCCESS;
callback.Run(result); callback.Run(result);
...@@ -134,7 +134,7 @@ class DomainReliabilityUploaderImpl ...@@ -134,7 +134,7 @@ class DomainReliabilityUploaderImpl
void SetDiscardUploads(bool discard_uploads) override { void SetDiscardUploads(bool discard_uploads) override {
discard_uploads_ = discard_uploads; discard_uploads_ = discard_uploads;
VLOG(1) << "Setting discard_uploads to " << discard_uploads; DVLOG(1) << "Setting discard_uploads to " << discard_uploads;
} }
void Shutdown() override { void Shutdown() override {
...@@ -169,9 +169,9 @@ class DomainReliabilityUploaderImpl ...@@ -169,9 +169,9 @@ class DomainReliabilityUploaderImpl
} }
} }
VLOG(1) << "Upload finished with net error " << net_error DVLOG(1) << "Upload finished with net error " << net_error
<< ", response code " << http_response_code << ", response code " << http_response_code << ", retry after "
<< ", retry after " << retry_after; << retry_after;
base::UmaHistogramSparse("DomainReliability.UploadResponseCode", base::UmaHistogramSparse("DomainReliability.UploadResponseCode",
http_response_code); http_response_code);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment