Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 412c5912 authored by Frank Li's avatar Frank Li Committed by Android (Google) Code Review
Browse files

Merge changes from topic "DNS telemetry" into qt-r1-dev 

* changes:
  Add one field(sampling_rate_denom) in NetworkDnsEventReported for recording sample rate.
  Add NS_R_INTERNAL_ERROR item into NsRcode
  Refine the proto dns_resolver.proto
parents 3bf7017f 762eb4a2

cmds/statsd/src/atoms.proto

+4 −1
Original line number Diff line number Diff line
@@ -5301,7 +5301,7 @@ message NetworkDnsEventReported { 
    // Only valid for event_type = EVENT_RESNSEND.

    optional int32 res_nsend_flags = 5;



    optional android.stats.dnsresolver.Transport network_type = 6;

    optional android.stats.dnsresolver.NetworkType network_type = 6;



    // The DNS over TLS mode on a specific netId.

    optional android.stats.dnsresolver.PrivateDnsModes private_dns_modes = 7;
@@ -5309,6 +5309,9 @@ message NetworkDnsEventReported { 
    // Additional pass-through fields opaque to statsd.

    // The DNS resolver Mainline module can add new fields here without requiring an OS update.

    optional android.stats.dnsresolver.DnsQueryEvents dns_query_events = 8 [(log_mode) = MODE_BYTES];



    // The sample rate of DNS stats (to statsd) is 1/sampling_rate_denom.

    optional int32 sampling_rate_denom = 9;

}



/**

core/proto/android/stats/dnsresolver/dns_resolver.proto

+217 −214
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ enum NsRcode { 
    // NS_R_BADSIG  = 16,

    NS_R_BADKEY = 17;

    NS_R_BADTIME = 18;

    NS_R_INTERNAL_ERROR = 254;

    NS_R_TIMEOUT = 255;

}



// Currently defined type values for resources and queries.
@@ -143,11 +145,11 @@ enum IpVersion { 
    IV_IPV6 = 2;

}



enum TransportType {

    TT_UNKNOWN = 0;

    TT_UDP = 1;

    TT_TCP = 2;

    TT_DOT = 3;

enum Protocol {

    PROTO_UNKNOWN = 0;

    PROTO_UDP = 1;

    PROTO_TCP = 2;

    PROTO_DOT = 3;

}



enum PrivateDnsModes {
@@ -157,21 +159,22 @@ enum PrivateDnsModes { 
    PDM_STRICT = 3;

}



enum Transport {

enum NetworkType {

    NT_UNKNOWN = 0;

    // Indicates this network uses a Cellular transport.

    TRANSPORT_DEFAULT = 0;  // TRANSPORT_CELLULAR

    NT_CELLULAR = 1;

    // Indicates this network uses a Wi-Fi transport.

    TRANSPORT_WIFI = 1;

    NT_WIFI = 2;

    // Indicates this network uses a Bluetooth transport.

    TRANSPORT_BLUETOOTH = 2;

    NT_BLUETOOTH = 3;

    // Indicates this network uses an Ethernet transport.

    TRANSPORT_ETHERNET = 3;

    NT_ETHERNET = 4;

    // Indicates this network uses a VPN transport.

    TRANSPORT_VPN = 4;

    NT_VPN = 5;

    // Indicates this network uses a Wi-Fi Aware transport.

    TRANSPORT_WIFI_AWARE = 5;

    NT_WIFI_AWARE = 6;

    // Indicates this network uses a LoWPAN transport.

    TRANSPORT_LOWPAN = 6;

    NT_LOWPAN = 7;

}



enum CacheStatus{
@@ -195,13 +198,13 @@ message DnsQueryEvent { 


    optional android.stats.dnsresolver.IpVersion ip_version = 4;



    optional android.stats.dnsresolver.TransportType transport = 5;

    optional android.stats.dnsresolver.Protocol protocol = 5;



    // Number of DNS query retry times

    optional int32 retry_times = 6;



    // Ordinal number of name server.

    optional int32 dns_server_count = 7;

    optional int32 dns_server_index = 7;



    // Used only by TCP and DOT. True for new connections.

    optional bool connected = 8;