Rollback cl/601489921, in windows, discovery phase won't be recorded …

…due to pointer is reset to null. PiperOrigin-RevId: 722461978
google · Feb 3, 2025 · a938727 · a938727
1 parent 17c6dd8
commit a938727
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/connections/implementation/client_proxy.cc b/connections/implementation/client_proxy.cc
@@ -1083,7 +1083,9 @@ void ClientProxy::RemoveAllEndpoints() {
 
 void ClientProxy::OnSessionComplete() {
   MutexLock lock(&mutex_);
-  if (connections_.empty() && !IsAdvertising()) {
+  // TODO(b/391339677): Revert back to the original logic first. Need to further
+  // check how to log session when discovery is on.
+  if (connections_.empty() && !IsAdvertising() && !IsDiscovering()) {
     local_endpoint_id_.clear();
 
     analytics_recorder_->LogSession();

diff --git a/connections/implementation/client_proxy_test.cc b/connections/implementation/client_proxy_test.cc
@@ -1360,9 +1360,7 @@ TEST_F(ClientProxyTest,
   // After
   OnDiscoveryConnectionDisconnected(client2(), advertising_endpoint);
   client2()->GetAnalyticsRecorder().Sync();
-  // Since we are no longer checking IsDiscovering(), we complete sessions now
-  // solely based on advertising.
-  EXPECT_EQ(event_logger2_.GetCompleteClientSessionCount(), 1);
+  EXPECT_EQ(event_logger2_.GetCompleteClientSessionCount(), 0);
 }
 
 TEST_F(ClientProxyTest, LogSessionForResetClientProxy) {