From 38f89e4e05846e2c8fba230cf3ebe1787479f107 Mon Sep 17 00:00:00 2001 From: edwinwu Date: Mon, 4 Oct 2021 18:20:53 -0700 Subject: [PATCH] analytics: 3p NC: Update Connections_log.proto PiperOrigin-RevId: 400862464 --- cpp/analytics/BUILD | 2 +- cpp/analytics/analytics_recorder.cc | 2 +- cpp/analytics/analytics_recorder_test.cc | 2 +- cpp/core/BUILD | 4 +-- cpp/core/internal/BUILD | 4 +-- cpp/core/internal/base_endpoint_channel.h | 2 +- cpp/core/internal/client_proxy.h | 2 +- cpp/core/internal/endpoint_channel.h | 2 +- cpp/platform/base/BUILD | 6 ++-- cpp/platform/impl/g3/BUILD | 2 +- cpp/platform/public/BUILD | 4 +-- proto/analytics/BUILD | 6 ++-- proto/analytics/connections_log.proto | 36 +++++++++++------------ 13 files changed, 37 insertions(+), 37 deletions(-) diff --git a/cpp/analytics/BUILD b/cpp/analytics/BUILD index fefcae6b..8b701d47 100644 --- a/cpp/analytics/BUILD +++ b/cpp/analytics/BUILD @@ -37,7 +37,7 @@ cc_library( "//platform/public:types", "//proto:connections_enums_portable_proto", "//proto/analytics:connections_log_cc_proto", - "//third_party/nearby_connections/proto/errorcode:error_code_enums_portable_proto", + "//proto/errorcode:error_code_enums_portable_proto", ], ) diff --git a/cpp/analytics/analytics_recorder.cc b/cpp/analytics/analytics_recorder.cc index 9c34fa99..699c7c8d 100644 --- a/cpp/analytics/analytics_recorder.cc +++ b/cpp/analytics/analytics_recorder.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby_connections/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include #include diff --git a/cpp/analytics/analytics_recorder_test.cc b/cpp/analytics/analytics_recorder_test.cc index 9e76df4d..d356833a 100644 --- a/cpp/analytics/analytics_recorder_test.cc +++ b/cpp/analytics/analytics_recorder_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby_connections/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include #include diff --git a/cpp/core/BUILD b/cpp/core/BUILD index a65c8673..65ba013c 100644 --- a/cpp/core/BUILD +++ b/cpp/core/BUILD @@ -55,7 +55,7 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//core:__subpackages__", ], deps = [ @@ -75,7 +75,7 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", ], deps = [ "//proto/analytics:connections_log_cc_proto", diff --git a/cpp/core/internal/BUILD b/cpp/core/internal/BUILD index ccdb8f15..4c59d0f0 100644 --- a/cpp/core/internal/BUILD +++ b/cpp/core/internal/BUILD @@ -99,7 +99,7 @@ cc_library( "//absl/strings", "//absl/time", "//absl/types:span", - "//third_party/nearby_connections/cpp/analytics", + "//analytics", "//core:core_types", "//core/internal/mediums", "//core/internal/mediums:utils", @@ -196,7 +196,7 @@ cc_test( "//absl/synchronization", "//absl/time", "//absl/types:span", - "//third_party/nearby_connections/cpp/analytics", + "//analytics", "//core:core_types", "//core/internal/mediums", "//core/internal/mediums:utils", diff --git a/cpp/core/internal/base_endpoint_channel.h b/cpp/core/internal/base_endpoint_channel.h index c8dc81d7..94518bda 100644 --- a/cpp/core/internal/base_endpoint_channel.h +++ b/cpp/core/internal/base_endpoint_channel.h @@ -21,7 +21,7 @@ #include "securegcm/d2d_connection_context_v1.h" #include "absl/base/thread_annotations.h" -#include "third_party/nearby_connections/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include "core/internal/endpoint_channel.h" #include "platform/base/byte_array.h" #include "platform/base/input_stream.h" diff --git a/cpp/core/internal/client_proxy.h b/cpp/core/internal/client_proxy.h index f0ceaa33..8bf210f1 100644 --- a/cpp/core/internal/client_proxy.h +++ b/cpp/core/internal/client_proxy.h @@ -20,7 +20,7 @@ #include #include -#include "third_party/nearby_connections/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include "core/listeners.h" #include "core/options.h" #include "core/status.h" diff --git a/cpp/core/internal/endpoint_channel.h b/cpp/core/internal/endpoint_channel.h index 43b219e3..4d9bef39 100644 --- a/cpp/core/internal/endpoint_channel.h +++ b/cpp/core/internal/endpoint_channel.h @@ -20,7 +20,7 @@ #include "securegcm/d2d_connection_context_v1.h" #include "absl/time/clock.h" -#include "third_party/nearby_connections/cpp/analytics/analytics_recorder.h" +#include "analytics/analytics_recorder.h" #include "platform/base/byte_array.h" #include "platform/base/exception.h" #include "platform/public/mutex.h" diff --git a/cpp/platform/base/BUILD b/cpp/platform/base/BUILD index 42a91fc6..1bd35792 100644 --- a/cpp/platform/base/BUILD +++ b/cpp/platform/base/BUILD @@ -43,7 +43,7 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//third_party/nearby_connections/cpp/cal:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", @@ -139,14 +139,14 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//core/internal:__subpackages__", "//platform/impl:__subpackages__", ], deps = [ ":logging", "//proto:connections_enums_portable_proto", - "//third_party/nearby_connections/proto/errorcode:error_code_enums_portable_proto", + "//proto/errorcode:error_code_enums_portable_proto", ], ) diff --git a/cpp/platform/impl/g3/BUILD b/cpp/platform/impl/g3/BUILD index 6021746e..d2588be3 100644 --- a/cpp/platform/impl/g3/BUILD +++ b/cpp/platform/impl/g3/BUILD @@ -107,7 +107,7 @@ cc_library( "platform.cc", ], visibility = [ - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", "//proto/analytics:__subpackages__", diff --git a/cpp/platform/public/BUILD b/cpp/platform/public/BUILD index 61392ff0..f6e1a779 100644 --- a/cpp/platform/public/BUILD +++ b/cpp/platform/public/BUILD @@ -52,7 +52,7 @@ cc_library( compatible_with = ["//buildenv/target:non_prod"], visibility = [ "//googlemac/iPhone/Shared/Nearby/Connections:__subpackages__", - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//core:__subpackages__", "//platform/base:__pkg__", "//platform/impl/windows:__subpackages__", @@ -111,7 +111,7 @@ cc_library( ], compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//core:__subpackages__", "//platform:__subpackages__", "//proto/analytics:__subpackages__", diff --git a/proto/analytics/BUILD b/proto/analytics/BUILD index 5d89c9cf..dbd3ee60 100644 --- a/proto/analytics/BUILD +++ b/proto/analytics/BUILD @@ -26,9 +26,9 @@ proto_library( cc_api_version = 2, compatible_with = ["//buildenv/target:non_prod"], deps = [ - "//storage/datapol/annotations/proto:datapol_annotations", + "//proto:connections_enums_proto", - "//third_party/nearby_connections/proto/errorcode:error_code_enums_proto", + "//proto/errorcode:error_code_enums_proto", ], ) @@ -36,7 +36,7 @@ cc_proto_library( name = "connections_log_cc_proto", compatible_with = ["//buildenv/target:non_prod"], visibility = [ - "//third_party/nearby_connections/cpp/analytics:__subpackages__", + "//analytics:__subpackages__", "//core:__subpackages__", ], deps = [":connections_log_proto"], diff --git a/proto/analytics/connections_log.proto b/proto/analytics/connections_log.proto index 7b92c236..800aa3d0 100644 --- a/proto/analytics/connections_log.proto +++ b/proto/analytics/connections_log.proto @@ -16,9 +16,9 @@ syntax = "proto2"; package location.nearby.analytics.proto; -import "storage/datapol/annotations/proto/semantic_annotations.proto"; -import "third_party/nearby_connections/proto/connections_enums.proto"; -import "third_party/nearby_connections/proto/errorcode/error_code_enums.proto"; + +import "proto/connections_enums.proto"; +import "proto/errorcode/error_code_enums.proto"; option optimize_for = LITE_RUNTIME; option java_package = "com.google.location.nearby.analytics.proto"; @@ -37,7 +37,7 @@ message ConnectionsLog { optional ClientSession client_session = 2; // The version of Nearby Connections. E.g. "v1.0.4". - optional string version = 3 [(datapol.semantic_type) = ST_SOFTWARE_ID]; + optional string version = 3 ; // for EventType.ERROR_CODE optional ErrorCode error_code = 4; @@ -87,7 +87,7 @@ message ConnectionsLog { // The build version of the user's device (Same value as the Build number in // Settings -> about phone). optional string build_version = 10 - [(datapol.semantic_type) = ST_SOFTWARE_ID]; + ; } // Encapsulates activity during a period of discovery. @@ -110,7 +110,7 @@ message ConnectionsLog { repeated UwbRangingProcess uwb_ranging = 5; // The SendingEvent flow id. - optional int64 client_flow_id = 6 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 client_flow_id = 6 ; // Encapsulates additional discovery information. optional DiscoveryMetadata discovery_metadata = 7; @@ -188,7 +188,7 @@ message ConnectionsLog { repeated ConnectionRequest received_connection_request = 3; // The ReceivingEvent flow id. - optional int64 client_flow_id = 4 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 client_flow_id = 4 ; // Encapsulates additional advertising information. optional AdvertisingMetadata advertising_metadata = 5; @@ -217,7 +217,7 @@ message ConnectionsLog { remote_response = 4; // The SendingEvent flow id. - optional int64 client_flow_id = 5 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 client_flow_id = 5 ; } // An attempt to connect to an endpoint over a particular medium. @@ -241,11 +241,11 @@ message ConnectionsLog { attempt_result = 5; // The ReceivingEvent flow id. - optional int64 client_flow_id = 6 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 client_flow_id = 6 ; // The token used to identify this connection pair. optional string connection_token = 7 - [(datapol.semantic_type) = ST_SESSION_ID]; + ; // Encapsulates additional connection information. optional ConnectionAttemptMetadata connection_attempt_metadata = 8; @@ -270,11 +270,11 @@ message ConnectionsLog { disconnection_reason = 5; // The SendingEvent flow id. - optional int64 client_flow_id = 6 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 client_flow_id = 6 ; // The token use to identify this established connection. optional string connection_token = 7 - [(datapol.semantic_type) = ST_SESSION_ID]; + ; } // A Payload transferred (or attempted to be transferred) between devices. @@ -322,11 +322,11 @@ message ConnectionsLog { error_stage = 6; // The SendingEvent flow id. - optional int64 client_flow_id = 7 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 client_flow_id = 7 ; // The token used to identify this upgrade pair. optional string connection_token = 8 - [(datapol.semantic_type) = ST_SESSION_ID]; + ; } // Next Id: 17 @@ -342,7 +342,7 @@ message ConnectionsLog { // The error description. optional location.nearby.errorcode.proto.Description description = 5; // The flow id which the error occurs on. - optional int64 flow_id = 6 [(datapol.semantic_type) = ST_SESSION_ID]; + optional int64 flow_id = 6 ; // Error code value oneof ErrorCodeDetail { @@ -365,7 +365,7 @@ message ConnectionsLog { // The token use to identify this established connection. optional string connection_token = 16 - [(datapol.semantic_type) = ST_SESSION_ID]; + ; } // Some additional information to keep with the advertising phase. @@ -401,12 +401,12 @@ message ConnectionsLog { // The MCC (Mobile country code) MNC (Mobile network code) of the network // operator. optional string network_operator = 4 - [(datapol.semantic_type) = ST_LOCATION]; + ; // The upper-case ISO 3166-1 alpha-2 country code of the current registered // operator's MCC (Mobile Country Code), or the country code of the default // Locale if not available. - optional string country_code = 5 [(datapol.semantic_type) = ST_LOCATION]; + optional string country_code = 5 ; // The TDLS status used by the wifi lan medium, // TDLS, shortened from Tunneled Direct Link Setup, is "a seamless way to