Merge third_party/metrics_proto from tag 70.0.3538.124

third_party/metrics_proto/BUILD.gn

@@ -1,16 +1,6 @@
-# Copyright 2023 The Cobalt Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 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.
 
 import("//third_party/protobuf/proto_library.gni")
 

third_party/metrics_proto/METADATA

@@ -5,9 +5,9 @@ description:
 third_party {
   url {
     type: GIT
-    value: "https://chromium.googlesource.com/chromium/src/third_party/metrics_proto/"
+    value: "https://chromium.googlesource.com/chromium/src"
   }
-  version: "fd3a73980b82eea000403c2c9c1f204f6612e7cf"
+  version: "70.0.3538.124"
   last_upgrade_date {
     year: 2018
     month: 8

third_party/metrics_proto/README.cobalt → third_party/metrics_proto/README.chromium

@@ -1,15 +1,19 @@
 Name: Metrics Protos
 Short Name: metrics_proto
 URL: This is the canonical public repository
-Version: 210142511
-Date: 2018/08/24 UTC
+Version: 210962504
+Date: 2018/08/30 UTC
 License: BSD
 Security Critical: Yes
 
 Description:
 This package contains the protos that are used to upload metrics data to Google.
 Updates to this code should be made by changing the internal copies, and then
-propagating them here.
+running the export script.
+
+blaze run //analysis/uma/proto_export:proto_export -- \
+  --from_piper \
+  --output=$CHROMIUM_SRC/third_party/metrics_proto
 
 Local Modifications:
-Unchanged from internal proto.
+Unchanged from the output of the export script.

third_party/metrics_proto/cast_logs.proto

@@ -160,7 +160,7 @@ message CastLogsProto {
   repeated CastConnectionInfo cast_connection_info = 2;
 
   // Stores Cast-enabled device specific events with a various context data.
-  // Next tag: 18
+  // Next tag: 19
   message CastEventProto {
     // The name of the action, hashed by same logic used to hash user action
     // event and histogram.
@@ -203,6 +203,8 @@ message CastLogsProto {
 
     optional string aogh_request_id = 16;
 
+    optional int64 aogh_local_agent_id = 18;
+
     // Optional value associated with the event. For example, may be used for
     // error codes.
     message Metadata {

third_party/metrics_proto/sampled_profile.proto

@@ -46,6 +46,11 @@ message SampledProfile {
 
     // The profile was collected after a thread was determined to be hung.
     THREAD_HUNG = 6;
+
+    // The heap profile was triggered by periodic sampling. The time intervals
+    // between trigger events conform to the Poisson process with certain mean
+    // interval between collections.
+    PERIODIC_HEAP_COLLECTION = 7;
   }
   optional TriggerEvent trigger_event = 1;
 

third_party/metrics_proto/system_profile.proto

@@ -960,6 +960,7 @@ message SystemProfileProto {
     RTANALYTICS_LIGHT = 21;
     RTANALYTICS_FULL = 22;
     CELLULAR = 23;
+    DEMO_MODE_RESOURCES = 24;
   }
 
   // Information about what Chrome components are registered and at which