Network traffic annotation added to NetMetricsLogUploader.

components/metrics/net/net_metrics_log_uploader.cc

 // Copyright 2014 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 "components/metrics/net/net_metrics_log_uploader.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "net/base/load_flags.h"
+#include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "url/gurl.h"
 
 namespace metrics {
 
 NetMetricsLogUploader::NetMetricsLogUploader(
     net::URLRequestContextGetter* request_context_getter,
     const std::string& server_url,
     const std::string& mime_type,
     const base::Callback<void(int)>& on_upload_complete)
     : MetricsLogUploader(server_url, mime_type, on_upload_complete),
       request_context_getter_(request_context_getter) {
 }
 
 NetMetricsLogUploader::~NetMetricsLogUploader() {
 }
 
 void NetMetricsLogUploader::UploadLog(const std::string& compressed_log_data,
                                       const std::string& log_hash) {
-  current_fetch_ =
-      net::URLFetcher::Create(GURL(server_url_), net::URLFetcher::POST, this);
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      net::DefineNetworkTrafficAnnotation("metrics_report", R"(
+        semantics {
+          sender: "Metrics Log Uploader"
+          description:
+            "Report of usage statistics and crash-related data about Google "
+            "Chrome."

[Ramin Halavati, 2017/02/22 11:48:08]

Would you like to add any details here, like example, a link to a specification
doc, etc.?

[Steven Holte, 2017/02/22 20:10:46]

The best links might be this one:

https://support.google.com/chrome/answer/96817
or
maybe https://www.google.com/chrome/browser/privacy/

the relevant text from privacy doc is:
 
Usage statistics contain information such as preferences, button clicks, and
memory usage. Usage statistics do not include web page URLs or personal
information.

I'm not sure that we'd want to include that directly here, because I worry it
would not be kept up to date as accurately.

[Ramin Halavati, 2017/02/23 06:57:12]

Thanks.

+          trigger: "Reports are automatically generated."

[Ramin Halavati, 2017/02/22 11:48:09]

Would you like to add any occasion, interval, etc., specifying why and when they
are generated?

[Steven Holte, 2017/02/22 20:10:47]

Currently the reports are generated on startup, and approximately every 5
minutes (though I believe there is a different interval for devices on cellular
connections).  I'm not sure that we won't change that interval, so I'd be a bit
worried about this getting out of date.  Maybe it could say "on startup and at
intervals while chrome is running."

[Ramin Halavati, 2017/02/23 06:57:12]

Done.

+          data:
+            "A protocol buffer with usage statistics and crash related data."
+          destination: GOOGLE_OWNED_SERVICE
+        }
+        policy {
+          cookies_allowed: false
+          setting:
+            "Users can enable or disable this feature by stoping "
+            "'Automatically send usage statistics and crash reports to Google' "
+            "in Chrome's settings under Advanced Settings, Privacy. The "
+            "feature is enabled by default."
+          policy {
+            MetricsReportingEnabled {
+              policy_options {mode: MANDATORY}
+              value: false
+            }
+          }
+        })");
+  current_fetch_ = net::URLFetcher::Create(
+      GURL(server_url_), net::URLFetcher::POST, this, traffic_annotation);
   data_use_measurement::DataUseUserData::AttachToFetcher(
       current_fetch_.get(), data_use_measurement::DataUseUserData::UMA);
   current_fetch_->SetRequestContext(request_context_getter_);
   current_fetch_->SetUploadData(mime_type_, compressed_log_data);
 
   // Tell the server that we're uploading gzipped protobufs.
   current_fetch_->SetExtraRequestHeaders("content-encoding: gzip");
 
   DCHECK(!log_hash.empty());
   current_fetch_->AddExtraRequestHeader("X-Chrome-UMA-Log-SHA1: " + log_hash);
@@ skipping 12 matching lines @@
   DCHECK_EQ(current_fetch_.get(), source);
 
   int response_code = source->GetResponseCode();
   if (response_code == net::URLFetcher::RESPONSE_CODE_INVALID)
     response_code = -1;
   current_fetch_.reset();
   on_upload_complete_.Run(response_code);
 }
 
 }  // namespace metrics