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);
-
   auto service = data_use_measurement::DataUseUserData::UMA;
-
+  net::NetworkTrafficAnnotationTag traffic_annotation =
+      NO_TRAFFIC_ANNOTATION_YET;
   switch (service_type_) {
     case MetricsLogUploader::UMA:
       service = data_use_measurement::DataUseUserData::UMA;
+      traffic_annotation =
+          net::DefineNetworkTrafficAnnotation("metrics_report_uma", R"(
+              semantics {
+                sender: "Metrics Log Uploader"
+                description:
+                  "Report of usage statistics and crash-related data about "
+                  "Chromium. 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 Chromium 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 Chromium's settings under Advanced Settings, "
+                  "Privacy. The feature is enabled by default."
+                policy {
+                  MetricsReportingEnabled {
+                    policy_options {mode: MANDATORY}
+                    value: false
+                  }
+                }
+              })");
       break;
     case MetricsLogUploader::UKM:
       service = data_use_measurement::DataUseUserData::UKM;
+      traffic_annotation =
+          net::DefineNetworkTrafficAnnotation("metrics_report_ukm", R"(
+            semantics {
+              sender: "Metrics Log Uploader"

[rkaplow, 2017/03/02 00:18:28]

you mention it doesn't need to be unique, but seems odd for it to be the same.

Maybe UKM Log Uploader

[Ramin Halavati, 2017/03/02 06:13:16]

Done.

+              description:
+                "Report of usage statistics and crash-related data about "

[rkaplow, 2017/03/02 00:18:28]

Report of usage statistics that are keyed by URLs to Chromium, sent only if the
profile has History Sync. This includes information about the web pages you
visit and your usage of them, such as page load speed. This will also include
URLs and statistics related to downloaded files. If Extension Sync is enabled,
these statistics will also include information about the extensions that have
been installed from Chrome Web Store. Google only stores usage statistics
associated with published extensions, and URLs that are known by Google’s search
index.

Is my suggestion. However this hasn't been published to the whitepaper yet.
Dominic - what is your suggestion here for timing this. I would also add the
"see more" bit, but that doesn't exist yet.

+                "Chromium. 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 Chromium is running."

[rkaplow, 2017/03/02 00:18:28]

... running with Sync enabled.

[Ramin Halavati, 2017/03/02 06:13:17]

Done.

+              data:
+                "A protocol buffer with usage statistics and crash related "

[rkaplow, 2017/03/02 00:18:28]

"A protocol buffer with usage statistics and associated URLs.

[Ramin Halavati, 2017/03/02 06:13:17]

Done.

+                "data."
+              destination: GOOGLE_OWNED_SERVICE
+            }
+            policy {
+              cookies_allowed: false
+              setting:
+                "Users can enable or disable this feature by disabling "

[rkaplow, 2017/03/02 00:18:28]

Users can enable or disable this feature by disabling 'Automatically send usage
statistics and crash reports to Google' in Chromium's settings under Advanced
Settings, Privacy. This is only enabled if all active profiles have
History/Extension Sync enabled without a Sync passphrase. 

[Ramin Halavati, 2017/03/02 06:13:16]

Done.

+                "'Automatically send usage statistics and crash reports to "
+                "Google' in Chromium's settings under Advanced Settings, "
+                "Privacy. The feature is enabled by default."
+              policy {
+                MetricsReportingEnabled {
+                  policy_options {mode: MANDATORY}
+                  value: false
+                }
+              }
+            })");
       break;
   }
+  current_fetch_ = net::URLFetcher::Create(
+      GURL(server_url_), net::URLFetcher::POST, this, traffic_annotation);
+
   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