From 5c1a8e679c65ce9b225e5608f1e2ad612c22478e Mon Sep 17 00:00:00 2001
From: Ahmed Khan <ahmedk@meta.com>
Date: Fri, 7 Nov 2025 15:00:52 -0800
Subject: [PATCH] CollTrace Scuba Logging for Dashboard (#8)

Summary:

D82675147 got reverted because of conflict with NCCLX OSS. In this new version, we fix this by not importing RCCLX code into the common folder.

Differential Revision: D85305175
---
 comms/utils/logger/ScubaLogger.cc | 7 +++++++
 comms/utils/logger/ScubaLogger.h  | 5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/comms/utils/logger/ScubaLogger.cc b/comms/utils/logger/ScubaLogger.cc
index 5dedc3da..ff23bbe4 100644
--- a/comms/utils/logger/ScubaLogger.cc
+++ b/comms/utils/logger/ScubaLogger.cc
@@ -67,6 +67,13 @@ void NcclScubaEvent::record() {
   ncclLogToScuba(type_, copySample);
 }
 
+void NcclScubaEvent::record(const std::string& stage) {
+  if (!stage.empty()) {
+    sample_.addNormal("stage", stage);
+  }
+  record();
+}
+
 void NcclScubaEvent::setLogMetatData(const CommLogData* logMetaData) {
   sample_.setCommunicatorMetadata(logMetaData);
 }
diff --git a/comms/utils/logger/ScubaLogger.h b/comms/utils/logger/ScubaLogger.h
index 45af254c..3bcf5f27 100644
--- a/comms/utils/logger/ScubaLogger.h
+++ b/comms/utils/logger/ScubaLogger.h
@@ -12,12 +12,12 @@
 #include "comms/utils/logger/EventMgr.h"
 #include "comms/utils/logger/NcclScubaSample.h"
 
-class NcclScubaEvent {
- public:
+struct NcclScubaEvent {
   void startAndRecord();
   void stopAndRecord();
   void lapAndRecord(const std::string& stage = "");
   void record();
+  void record(const std::string& stage);
   void setLogMetatData(const CommLogData* logMetaData);
 
   explicit NcclScubaEvent(const std::string& stage);
@@ -26,7 +26,6 @@ class NcclScubaEvent {
 
   NcclScubaEvent(const std::string& stage, const CommLogData* logMetaData);
 
- private:
   NcclScubaSample sample_;
   folly::stop_watch<std::chrono::microseconds> timer_;
   std::string stage_{};