diff options
Diffstat (limited to 'chromium/third_party/metrics_proto')
8 files changed, 103 insertions, 56 deletions
diff --git a/chromium/third_party/metrics_proto/README.chromium b/chromium/third_party/metrics_proto/README.chromium index a5d0bd9b29b..14ab9bc8e8c 100644 --- a/chromium/third_party/metrics_proto/README.chromium +++ b/chromium/third_party/metrics_proto/README.chromium @@ -1,8 +1,8 @@ Name: Metrics Protos Short Name: metrics_proto URL: This is the canonical public repository -Version: 310964844 -Date: 2020/05/11 UTC +Version: 317162786 +Date: 2020/06/18 UTC License: BSD Security Critical: Yes diff --git a/chromium/third_party/metrics_proto/cast_assistant_logs.proto b/chromium/third_party/metrics_proto/cast_assistant_logs.proto index 2ece9f3a825..b94b803da14 100644 --- a/chromium/third_party/metrics_proto/cast_assistant_logs.proto +++ b/chromium/third_party/metrics_proto/cast_assistant_logs.proto @@ -11,6 +11,7 @@ option java_package = "org.chromium.components.metrics"; package metrics; +// Deprecated. Use CastLogsProto instead. // CastAssistant specific device information. // Next id: 13 message CastAssistantLogsProto { diff --git a/chromium/third_party/metrics_proto/cast_logs.proto b/chromium/third_party/metrics_proto/cast_logs.proto index 2d5ee01dd23..81804f4ace4 100644 --- a/chromium/third_party/metrics_proto/cast_logs.proto +++ b/chromium/third_party/metrics_proto/cast_logs.proto @@ -164,7 +164,7 @@ message CastLogsProto { repeated CastConnectionInfo cast_connection_info = 2; // Stores Cast-enabled device specific events with a various context data. - // Next tag: 23 + // Next tag: 26 message CastEventProto { // The name of the action, hashed by same logic used to hash user action // event and histogram. @@ -233,6 +233,16 @@ message CastLogsProto { // Optional field to log SELINUX audit detail. optional string selinux_audit_detail = 22; + + // List of event ids belonging to a particular interaction. One interaction + // could receive multiple assistant outputs, hence multiple event ids. + repeated string event_id_list = 23; + + // Duo core version. + optional fixed64 duo_core_version = 24; + + // Model version of hotword detector. + optional string hotword_model_id = 25; } repeated CastEventProto cast_event = 3; @@ -241,7 +251,7 @@ message CastLogsProto { optional fixed32 virtual_release_track = 4; // Cast specific device information which is expected to change over time. - // Next tag: 10 + // Next tag: 12 message CastDeviceMutableInfo { // This is the last type of reboot the device encountered // Next tag: 14 @@ -297,6 +307,12 @@ message CastLogsProto { // Station ID of the device if connected to Google WiFi network optional string google_wifi_station_shmac = 9; + + // Optional field to log installed manifest platform version. + optional string installed_manifest_platform_version = 10; + + // Optional field to log installed manifest version. + optional uint32 installed_manifest_version = 11; } // The device sends this information at least once per day. optional CastDeviceMutableInfo cast_device_mutable_info = 5; diff --git a/chromium/third_party/metrics_proto/omnibox_event.proto b/chromium/third_party/metrics_proto/omnibox_event.proto index 931ddb1e6ee..760d9516494 100644 --- a/chromium/third_party/metrics_proto/omnibox_event.proto +++ b/chromium/third_party/metrics_proto/omnibox_event.proto @@ -14,7 +14,7 @@ package metrics; import "omnibox_input_type.proto"; // Stores information about an omnibox interaction. -// Next tag: 21 +// Next tag: 22 message OmniboxEventProto { // The timestamp for the event, in seconds. // This value comes from Chromium's TimeTicks::Now(), which is an abstract @@ -387,4 +387,8 @@ message OmniboxEventProto { // or tabbing to it. } optional KeywordModeEntryMethod keyword_mode_entry_method = 20; + + // Whether the omnibox input is a search query that is started + // by clicking on a image tile. + optional bool is_query_started_from_tile = 21; } diff --git a/chromium/third_party/metrics_proto/system_profile.proto b/chromium/third_party/metrics_proto/system_profile.proto index 518af80d003..8f7c56fdc47 100644 --- a/chromium/third_party/metrics_proto/system_profile.proto +++ b/chromium/third_party/metrics_proto/system_profile.proto @@ -141,7 +141,7 @@ message SystemProfileProto { optional OS os = 5; // Information on the user's hardware. - // Next tag: 20 + // Next tag: 21 message Hardware { // CPU architecture. Taken from uname -m and modified in Chromium logic. // Common options are: x86, x86_64, armv7l, armv8l, aarch64. @@ -252,6 +252,58 @@ message SystemProfileProto { // Logged on ChromeOS only. optional bool internal_display_supports_touch = 14; + // Internal storage device information on ChromeOS. + // TODO(dlunev): Expand comment about which milestone this + // started to be logged on once the client code is submitted. + // Next tag: 9 + message InternalStorageDevice { + // Id of the storage device manufcaturer. + // Can be vendor_id(32bit), oemid(16bit) etc. depending on the device + // type. + optional uint32 vendor_id = 1; + + // Id of the storage device product. + // Can be product_id(32bit), PNM(48bit) etc. depending on the device type. + optional uint64 product_id = 2; + + // Revision of the storage device product. + // Can be PCIe rev(8bit), PRV(8bit) etc. depending on the device type. + optional uint32 revision = 3; + + // Storage Device model. Comes from /sys/block/<device>/device/model. + optional string model = 4; + + // Storage Device capacity in MB. + optional uint32 size_mb = 5; + + // 8 byte FW revision of a storage device. Usually a string, but may + // contain non-printable characters. + optional uint64 firmware_version = 6; + + // Type of the storage device interface. + // TYPE_UNKNOWN signifies an error on population side. + enum Type { + TYPE_UNKNOWN = 0; + TYPE_EMMC = 1; + TYPE_NVME = 2; + TYPE_UFS = 3; + TYPE_SD_EXPRESS_INTERNAL = 4; + } + optional Type type = 7; + + // Purpose defines how the OS uses the device. + // PURPOSE_UNKNOWN signifies an error on population side. + enum Purpose { + PURPOSE_UNKNOWN = 0; + PURPOSE_BOOT = 1; + PURPOSE_SWAP = 2; + PURPOSE_BOOT_SWAP = 3; + } + optional Purpose purpose = 8; + } + // List of internal storage devices on a Chrome OS device. + repeated InternalStorageDevice internal_storage_devices = 20; + // Drive messages are currently logged on Windows 7+, iOS, and Android. message Drive { // Whether this drive incurs a time penalty when randomly accessed. This @@ -309,52 +361,6 @@ message SystemProfileProto { // The physical layer mode of the associated wifi access point, if any. optional WifiPHYLayerProtocol wifi_phy_layer_protocol = 4; - // Describe wifi access point information. - message WifiAccessPoint { - // Vendor prefix of the access point's BSSID. These are OUIs - // (Organizationally Unique Identifiers) registered by - // the IEEE and are encoded with the first byte in bits 16-23, the - // second byte in bits 8-15 and the third byte in bits 0-7. - optional uint32 vendor_prefix = 1; - - // Access point security mode definitions. - enum SecurityMode { - SECURITY_UNKNOWN = 0; - SECURITY_WPA = 1; - SECURITY_WEP = 2; - SECURITY_RSN = 3; - SECURITY_802_1X = 4; - SECURITY_PSK = 5; - SECURITY_NONE = 6; - } - // The security mode of the access point. - optional SecurityMode security_mode = 2; - - // Vendor specific information. - message VendorInformation { - // The model number, for example "0". - optional string model_number = 1; - - // The model name (sometimes the same as the model_number), - // for example "WZR-HP-AG300H". - optional string model_name = 2; - - // The device name (sometimes the same as the model_number), - // for example "Dummynet". - optional string device_name = 3; - - // The list of vendor-specific OUIs (Organizationally Unique - // Identifiers). These are provided by the vendor through WPS - // (Wireless Provisioning Service) information elements, which - // identifies the content of the element. - repeated uint32 element_identifier = 4; - } - // The wireless access point vendor information. - optional VendorInformation vendor_info = 3; - } - // Information of the wireless access point that device is connected to. - optional WifiAccessPoint access_point_info = 5; - // Derived from net::NetworkQualityEstimator::EffectiveConnectionType // translated through NetworkMetricsProvider::GetConnectionType. enum EffectiveConnectionType { @@ -597,7 +603,6 @@ message SystemProfileProto { // for this session. optional string variations_seed_version = 28; - // TODO(b/148689907): Deprecate this field once the analysis has been done. // Whether the client_id in the log matches the client_id we used to assign // field trials. optional bool client_id_was_used_for_trial_assignment = 33; diff --git a/chromium/third_party/metrics_proto/ukm/entry.proto b/chromium/third_party/metrics_proto/ukm/entry.proto index 0d390a25049..b9449cf3e23 100644 --- a/chromium/third_party/metrics_proto/ukm/entry.proto +++ b/chromium/third_party/metrics_proto/ukm/entry.proto @@ -26,7 +26,7 @@ message Entry { optional fixed64 event_hash = 4; // For each Event, we have a list of possible metrics included. It's possible - // for a single metric name to be repeated. There is also no guarentee that + // for a single metric name to be repeated. There is also no guarantee that // all metrics that are available for a given event will be provided for a // single Entry. message Metric { diff --git a/chromium/third_party/metrics_proto/ukm/report.proto b/chromium/third_party/metrics_proto/ukm/report.proto index 1991e81f527..7cb62cb0525 100644 --- a/chromium/third_party/metrics_proto/ukm/report.proto +++ b/chromium/third_party/metrics_proto/ukm/report.proto @@ -11,16 +11,22 @@ package ukm; import "ukm/aggregate.proto"; import "ukm/entry.proto"; import "ukm/source.proto"; +import "chrome_user_metrics_extension.proto"; import "system_profile.proto"; import "user_demographics.proto"; // This is the message type sent from Chrome to the UKM collector. -// Next tag: 12 +// Next tag: 13 message Report { // A unique identifier for a Chrome install. This ID should be used only // in UKM reports, and not linked to any other data sources. optional fixed64 client_id = 1; + // The product corresponding to this log. Note: The default value is Chrome, + // so Chrome products will not transmit this field. + optional metrics.ChromeUserMetricsExtension.Product product = 12 + [default = CHROME]; + // The session id for this record. This id is unique within a // particular Chrome session. The client keeps track of the session id // and sends it with each record. The session id is simply an integer diff --git a/chromium/third_party/metrics_proto/ukm/source.proto b/chromium/third_party/metrics_proto/ukm/source.proto index 9331650cf4f..95616d68580 100644 --- a/chromium/third_party/metrics_proto/ukm/source.proto +++ b/chromium/third_party/metrics_proto/ukm/source.proto @@ -8,8 +8,20 @@ option optimize_for = LITE_RUNTIME; package ukm; +// Types of source ids defined by +// https://cs.chromium.org/chromium/src/base/metrics/ukm_source_id.h?l=19 +enum SourceType { + DEFAULT = 0; + NAVIGATION_ID = 1; + APP_ID = 2; + HISTORY_ID = 3; + WEBAPK_ID = 4; + PAYMENT_APP_ID = 5; + DESKTOP_WEB_APP_ID = 6; +} + // Source contains data related to a top-level navigation. -// Next tag: 16 +// Next tag: 17 message Source { // The URL scheme, such as HTTP, HTTPS, CHROME_EXTENSION, etc. enum UrlScheme { @@ -51,6 +63,9 @@ message Source { // navigation source in a tab. optional int64 opener_source_id = 12; + // Type of the source id. + optional SourceType type = 16; + // Holds data about a URL seen by the client. message UrlInfo { // The URL seen by the client. |