diff --git a/xplat/Sonar/SonarClient.cpp b/xplat/Sonar/SonarClient.cpp
index 2040f9ab9..9ac2fe9ca 100644
--- a/xplat/Sonar/SonarClient.cpp
+++ b/xplat/Sonar/SonarClient.cpp
@@ -47,14 +47,16 @@ void SonarClient::setStateListener(
 
 void SonarClient::addPlugin(std::shared_ptr<SonarPlugin> plugin) {
   SONAR_LOG(("SonarClient::addPlugin " + plugin->identifier()).c_str());
+  auto step = sonarState_->start("Add plugin " + plugin->identifier());
 
   std::lock_guard<std::mutex> lock(mutex_);
-  performAndReportError([this, plugin]() {
+  performAndReportError([this, plugin, step]() {
     if (plugins_.find(plugin->identifier()) != plugins_.end()) {
       throw std::out_of_range(
           "plugin " + plugin->identifier() + " already added.");
     }
     plugins_[plugin->identifier()] = plugin;
+    step->complete();
     if (connected_) {
       refreshPlugins();
     }
@@ -107,19 +109,22 @@ void SonarClient::refreshPlugins() {
 void SonarClient::onConnected() {
   SONAR_LOG("SonarClient::onConnected");
 
+  auto step = sonarState_->start("Connect");
   std::lock_guard<std::mutex> lock(mutex_);
   connected_ = true;
+  step->complete();
 }
 
 void SonarClient::onDisconnected() {
   SONAR_LOG("SonarClient::onDisconnected");
-
+  auto step = sonarState_->start("onDisconnected callbacks");
   std::lock_guard<std::mutex> lock(mutex_);
   connected_ = false;
-  performAndReportError([this]() {
+  performAndReportError([this, step]() {
     for (const auto& iter : plugins_) {
       disconnect(iter.second);
     }
+    step->complete();
   });
 }
 
diff --git a/xplat/Sonar/SonarClient.h b/xplat/Sonar/SonarClient.h
index d569ab3ff..49f90b688 100644
--- a/xplat/Sonar/SonarClient.h
+++ b/xplat/Sonar/SonarClient.h
@@ -42,15 +42,21 @@ class SonarClient : public SonarWebSocket::Callbacks {
   SonarClient(std::unique_ptr<SonarWebSocket> socket)
       : socket_(std::move(socket)) {
     sonarState_ = std::make_unique<SonarState>();
+    auto step = sonarState_->start("Create client");
     socket_->setCallbacks(this);
+    step->complete();
   }
 
   void start() {
+    auto step = sonarState_->start("Start client");
     socket_->start();
+    step->complete();
   }
 
   void stop() {
+    auto step = sonarState_->start("Stop client");
     socket_->stop();
+    step->complete();
   }
 
   void onConnected() override;