mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
analytics: 3p NC: Implement Payload.
PiperOrigin-RevId: 394695112
This commit is contained in:
edwinwu
committed by
Copybara-Service
Copybara-Service
parent
8d8d435548
commit
24539d170f
@@ -31,6 +31,7 @@ namespace analytics {
|
||||
using ::location::nearby::analytics::proto::ConnectionsLog;
|
||||
using ::location::nearby::proto::connections::ACCEPTED;
|
||||
using ::location::nearby::proto::connections::ADVERTISER;
|
||||
using ::location::nearby::proto::connections::BYTES;
|
||||
using ::location::nearby::proto::connections::CLIENT_SESSION;
|
||||
using ::location::nearby::proto::connections::CONNECTION_CLOSED;
|
||||
using ::location::nearby::proto::connections::ConnectionAttemptResult;
|
||||
@@ -40,6 +41,7 @@ using ::location::nearby::proto::connections::ConnectionsStrategy;
|
||||
using ::location::nearby::proto::connections::DisconnectionReason;
|
||||
using ::location::nearby::proto::connections::DISCOVERER;
|
||||
using ::location::nearby::proto::connections::EventType;
|
||||
using ::location::nearby::proto::connections::FILE;
|
||||
using ::location::nearby::proto::connections::IGNORED;
|
||||
using ::location::nearby::proto::connections::INCOMING;
|
||||
using ::location::nearby::proto::connections::INITIAL;
|
||||
@@ -59,8 +61,10 @@ using ::location::nearby::proto::connections::START_CLIENT_SESSION;
|
||||
using ::location::nearby::proto::connections::START_STRATEGY_SESSION;
|
||||
using ::location::nearby::proto::connections::STOP_CLIENT_SESSION;
|
||||
using ::location::nearby::proto::connections::STOP_STRATEGY_SESSION;
|
||||
using ::location::nearby::proto::connections::STREAM;
|
||||
using ::location::nearby::proto::connections::UNFINISHED;
|
||||
using ::location::nearby::proto::connections::UNKNOWN_MEDIUM;
|
||||
using ::location::nearby::proto::connections::UNKNOWN_PAYLOAD_TYPE;
|
||||
using ::location::nearby::proto::connections::UNKNOWN_STRATEGY;
|
||||
using ::location::nearby::proto::connections::UPGRADED;
|
||||
|
||||
@@ -333,6 +337,99 @@ void AnalyticsRecorder::OnConnectionClosed(const std::string &endpoint_id,
|
||||
current_strategy_session_->mutable_established_connection()));
|
||||
}
|
||||
}
|
||||
void AnalyticsRecorder::OnIncomingPayloadStarted(
|
||||
const std::string &endpoint_id, std::int64_t payload_id,
|
||||
connections::Payload::Type type, std::int64_t total_size_bytes) {
|
||||
MutexLock lock(&mutex_);
|
||||
if (!CanRecordAnalyticsLocked("OnIncomingPayloadStarted")) {
|
||||
return;
|
||||
}
|
||||
auto it = active_connections_.find(endpoint_id);
|
||||
if (it == active_connections_.end()) {
|
||||
return;
|
||||
}
|
||||
std::unique_ptr<LogicalConnection> &logical_connection = it->second;
|
||||
logical_connection->IncomingPayloadStarted(
|
||||
payload_id, PayloadTypeToProtoPayloadType(type), total_size_bytes);
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::OnPayloadChunkReceived(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
std::int64_t chunk_size_bytes) {
|
||||
MutexLock lock(&mutex_);
|
||||
if (!CanRecordAnalyticsLocked("OnPayloadChunkReceived")) {
|
||||
return;
|
||||
}
|
||||
auto it = active_connections_.find(endpoint_id);
|
||||
if (it == active_connections_.end()) {
|
||||
return;
|
||||
}
|
||||
std::unique_ptr<LogicalConnection> &logical_connection = it->second;
|
||||
logical_connection->ChunkReceived(payload_id, chunk_size_bytes);
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::OnIncomingPayloadDone(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
PayloadStatus status) {
|
||||
MutexLock lock(&mutex_);
|
||||
if (!CanRecordAnalyticsLocked("OnIncomingPayloadDone")) {
|
||||
return;
|
||||
}
|
||||
auto it = active_connections_.find(endpoint_id);
|
||||
if (it == active_connections_.end()) {
|
||||
return;
|
||||
}
|
||||
std::unique_ptr<LogicalConnection> &logical_connection = it->second;
|
||||
logical_connection->IncomingPayloadDone(payload_id, status);
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::OnOutgoingPayloadStarted(
|
||||
const std::vector<std::string> &endpoint_ids, std::int64_t payload_id,
|
||||
connections::Payload::Type type, std::int64_t total_size_bytes) {
|
||||
MutexLock lock(&mutex_);
|
||||
if (!CanRecordAnalyticsLocked("OnOutgoingPayloadStarted")) {
|
||||
return;
|
||||
}
|
||||
for (const auto &endpoint_id : endpoint_ids) {
|
||||
auto it = active_connections_.find(endpoint_id);
|
||||
if (it == active_connections_.end()) {
|
||||
continue;
|
||||
}
|
||||
std::unique_ptr<LogicalConnection> &logical_connection = it->second;
|
||||
logical_connection->OutgoingPayloadStarted(
|
||||
payload_id, PayloadTypeToProtoPayloadType(type), total_size_bytes);
|
||||
}
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::OnPayloadChunkSent(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
std::int64_t chunk_size_bytes) {
|
||||
MutexLock lock(&mutex_);
|
||||
if (!CanRecordAnalyticsLocked("OnPayloadChunkSent")) {
|
||||
return;
|
||||
}
|
||||
auto it = active_connections_.find(endpoint_id);
|
||||
if (it == active_connections_.end()) {
|
||||
return;
|
||||
}
|
||||
std::unique_ptr<LogicalConnection> &logical_connection = it->second;
|
||||
logical_connection->ChunkSent(payload_id, chunk_size_bytes);
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::OnOutgoingPayloadDone(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
PayloadStatus status) {
|
||||
MutexLock lock(&mutex_);
|
||||
if (!CanRecordAnalyticsLocked("OnOutgoingPayloadDone")) {
|
||||
return;
|
||||
}
|
||||
auto it = active_connections_.find(endpoint_id);
|
||||
if (it == active_connections_.end()) {
|
||||
return;
|
||||
}
|
||||
std::unique_ptr<LogicalConnection> &logical_connection = it->second;
|
||||
logical_connection->OutgoingPayloadDone(payload_id, status);
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::LogSession() {
|
||||
MutexLock lock(&mutex_);
|
||||
@@ -368,17 +465,19 @@ bool AnalyticsRecorder::CanRecordAnalyticsLocked(
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::LogClientSession() {
|
||||
serial_executor_.Execute("analytics-recorder", [this]() {
|
||||
ConnectionsLog connections_log;
|
||||
connections_log.set_event_type(CLIENT_SESSION);
|
||||
connections_log.set_allocated_client_session(client_session_.release());
|
||||
connections_log.set_version(kVersion);
|
||||
serial_executor_.Execute(
|
||||
"analytics-recorder", [this]() {
|
||||
ConnectionsLog connections_log;
|
||||
connections_log.set_event_type(CLIENT_SESSION);
|
||||
connections_log.set_allocated_client_session(client_session_.release());
|
||||
connections_log.set_version(kVersion);
|
||||
|
||||
NEARBY_LOGS(INFO) << "AnalyticsRecorder LogClientSession connections_log="
|
||||
<< connections_log.DebugString();
|
||||
NEARBY_LOGS(VERBOSE)
|
||||
<< "AnalyticsRecorder LogClientSession connections_log="
|
||||
<< connections_log.DebugString();
|
||||
|
||||
event_logger_->Log(connections_log);
|
||||
});
|
||||
event_logger_->Log(connections_log);
|
||||
});
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::LogEvent(EventType event_type) {
|
||||
@@ -615,6 +714,20 @@ ConnectionsStrategy AnalyticsRecorder::StrategyToConnectionStrategy(
|
||||
return UNKNOWN_STRATEGY;
|
||||
}
|
||||
|
||||
PayloadType AnalyticsRecorder::PayloadTypeToProtoPayloadType(
|
||||
connections::Payload::Type type) {
|
||||
switch (type) {
|
||||
case connections::Payload::Type::kBytes:
|
||||
return BYTES;
|
||||
case connections::Payload::Type::kFile:
|
||||
return FILE;
|
||||
case connections::Payload::Type::kStream:
|
||||
return STREAM;
|
||||
default:
|
||||
return UNKNOWN_PAYLOAD_TYPE;
|
||||
}
|
||||
}
|
||||
|
||||
void AnalyticsRecorder::PendingPayload::AddChunk(
|
||||
std::int64_t chunk_size_bytes) {
|
||||
num_bytes_transferred_ += chunk_size_bytes;
|
||||
|
||||
@@ -94,6 +94,34 @@ class AnalyticsRecorder {
|
||||
location::nearby::proto::connections ::DisconnectionReason reason)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
|
||||
// Payload
|
||||
void OnIncomingPayloadStarted(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
connections::Payload::Type type,
|
||||
std::int64_t total_size_bytes)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
void OnPayloadChunkReceived(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
std::int64_t chunk_size_bytes)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
void OnIncomingPayloadDone(
|
||||
const std::string &endpoint_id, std::int64_t payload_id,
|
||||
::location::nearby::proto::connections::PayloadStatus status)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
void OnOutgoingPayloadStarted(const std::vector<std::string> &endpoint_ids,
|
||||
std::int64_t payload_id,
|
||||
connections::Payload::Type type,
|
||||
std::int64_t total_size_bytes)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
void OnPayloadChunkSent(const std::string &endpoint_id,
|
||||
std::int64_t payload_id,
|
||||
std::int64_t chunk_size_bytes)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
void OnOutgoingPayloadDone(
|
||||
const std::string &endpoint_id, std::int64_t payload_id,
|
||||
::location::nearby::proto::connections::PayloadStatus status)
|
||||
ABSL_LOCKS_EXCLUDED(mutex_);
|
||||
|
||||
// Invokes event_logger_.Log() at the end of life of client. Log action is
|
||||
// called in a separate thread to allow synchronous potentially lengthy
|
||||
// execution.
|
||||
@@ -240,6 +268,8 @@ class AnalyticsRecorder {
|
||||
|
||||
location::nearby::proto::connections::ConnectionsStrategy
|
||||
StrategyToConnectionStrategy(connections::Strategy strategy);
|
||||
::location::nearby::proto::connections::PayloadType
|
||||
PayloadTypeToProtoPayloadType(connections::Payload::Type type);
|
||||
|
||||
// Not owned by AnalyticsRecorder. Pointer must refer to a valid object
|
||||
// that outlives the one constructed.
|
||||
|
||||
@@ -36,12 +36,14 @@ using ::location::nearby::proto::connections::BLUETOOTH;
|
||||
using ::location::nearby::proto::connections::CLIENT_SESSION;
|
||||
using ::location::nearby::proto::connections::EventType;
|
||||
using ::location::nearby::proto::connections::INITIAL;
|
||||
using ::location::nearby::proto::connections::LOCAL_DISCONNECTION;
|
||||
using ::location::nearby::proto::connections::Medium;
|
||||
using ::location::nearby::proto::connections::RESULT_ERROR;
|
||||
using ::location::nearby::proto::connections::RESULT_SUCCESS;
|
||||
using ::location::nearby::proto::connections::START_STRATEGY_SESSION;
|
||||
using ::location::nearby::proto::connections::STOP_CLIENT_SESSION;
|
||||
using ::location::nearby::proto::connections::STOP_STRATEGY_SESSION;
|
||||
using ::location::nearby::proto::connections::SUCCESS;
|
||||
using ::location::nearby::proto::connections::UPGRADED;
|
||||
using ::location::nearby::proto::connections::WIFI_LAN;
|
||||
using ::testing::Contains;
|
||||
@@ -531,6 +533,69 @@ TEST(AnalyticsRecorderTest, UnfinishedEstablishedConnectionsAddedAsUnfinished) {
|
||||
>)pb")));
|
||||
}
|
||||
|
||||
TEST(AnalyticsRecorderTest, OutgoingPayloadUpgraded) {
|
||||
connections::Strategy strategy = connections::Strategy::kP2pStar;
|
||||
std::vector<Medium> mediums = {BLE, BLUETOOTH};
|
||||
std::string endpoint_id("endpoint_id");
|
||||
std::int64_t payload_id(123456789);
|
||||
std::string connection_token("connection_token");
|
||||
|
||||
CountDownLatch client_session_done_latch(1);
|
||||
FakeEventLogger event_logger(client_session_done_latch);
|
||||
AnalyticsRecorder analytics_recorder(&event_logger);
|
||||
|
||||
analytics_recorder.OnStartAdvertising(strategy, mediums);
|
||||
analytics_recorder.OnConnectionEstablished(endpoint_id, BLUETOOTH,
|
||||
connection_token);
|
||||
analytics_recorder.OnOutgoingPayloadStarted(
|
||||
{endpoint_id}, payload_id, connections::Payload::Type::kFile, 50);
|
||||
analytics_recorder.OnPayloadChunkSent(endpoint_id, payload_id, 10);
|
||||
analytics_recorder.OnPayloadChunkSent(endpoint_id, payload_id, 10);
|
||||
analytics_recorder.OnConnectionClosed(endpoint_id, BLUETOOTH, UPGRADED);
|
||||
analytics_recorder.OnConnectionEstablished(endpoint_id, WIFI_LAN,
|
||||
connection_token);
|
||||
analytics_recorder.OnPayloadChunkSent(endpoint_id, payload_id, 10);
|
||||
analytics_recorder.OnPayloadChunkSent(endpoint_id, payload_id, 10);
|
||||
analytics_recorder.OnPayloadChunkSent(endpoint_id, payload_id, 10);
|
||||
analytics_recorder.OnOutgoingPayloadDone(endpoint_id, payload_id, SUCCESS);
|
||||
analytics_recorder.OnConnectionClosed(endpoint_id, WIFI_LAN,
|
||||
LOCAL_DISCONNECTION);
|
||||
|
||||
analytics_recorder.LogSession();
|
||||
ASSERT_TRUE(client_session_done_latch.Await(kDefaultTimeout).result());
|
||||
|
||||
EXPECT_THAT(event_logger.GetLoggedClientSession(), Partially(EqualsProto(R"pb(
|
||||
strategy_session <
|
||||
strategy: P2P_STAR
|
||||
role: ADVERTISER
|
||||
advertising_phase < medium: BLE medium: BLUETOOTH >
|
||||
established_connection <
|
||||
medium: BLUETOOTH
|
||||
sent_payload <
|
||||
type: FILE
|
||||
total_size_bytes: 50
|
||||
num_bytes_transferred: 20
|
||||
num_chunks: 2
|
||||
status: MOVED_TO_NEW_MEDIUM
|
||||
>
|
||||
disconnection_reason: UPGRADED
|
||||
connection_token: "connection_token"
|
||||
>
|
||||
established_connection <
|
||||
medium: WIFI_LAN
|
||||
sent_payload <
|
||||
type: FILE
|
||||
total_size_bytes: 50
|
||||
num_bytes_transferred: 30
|
||||
num_chunks: 3
|
||||
status: SUCCESS
|
||||
>
|
||||
disconnection_reason: LOCAL_DISCONNECTION
|
||||
connection_token: "connection_token"
|
||||
>
|
||||
>)pb")));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace analytics
|
||||
} // namespace nearby
|
||||
|
||||
Reference in New Issue
Block a user