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 "components/metrics/metrics_log_uploader.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,
     MetricsLogUploader::MetricServiceType service_type,
     const base::Callback<void(int)>& on_upload_complete)
     : MetricsLogUploader(server_url,
                          mime_type,
                          service_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"(

[Alexei Svitkine (slow), 2017/02/27 15:42:56]

This is only correct for the MetricsLogUploader::UMA case. You need to provide
different descriptions for the MetricsLogUploader::UKM case.

Rob and Dominic should be able to help you formulate these.

[Ramin Halavati, 2017/02/27 18:17:23]

I separate the two cases.

+        semantics {
+          sender: "Metrics Log Uploader"
+          description:
+            "Report of usage statistics and crash-related data about Google "
+            "Chrome. Usage statistics contain information such as preferences, "
+            "button clicks, and memory usage and do not include web page URLs "
+            "or personal information. See more at "
+            "https://www.google.com/chrome/browser/privacy/ under 'Usage "
+            "statistics and crash reports'."
+          trigger:
+            "Reports are automatically generated on startup and at intervals "
+            "while Chrome is running."
+          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 disabling "
+            "'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);
 
   auto service = data_use_measurement::DataUseUserData::UMA;
 
   switch (service_type_) {
     case MetricsLogUploader::UMA:
       service = data_use_measurement::DataUseUserData::UMA;
       break;
     case MetricsLogUploader::UKM:
       service = data_use_measurement::DataUseUserData::UKM;
       break;
   }
   data_use_measurement::DataUseUserData::AttachToFetcher(current_fetch_.get(),
                                                          service);
+
   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);
 
   // Drop cookies and auth data.
@@ skipping 10 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