Cosmetic changes

anush-apple · Feb 16, 2024 · 6a78523 · 6a78523
1 parent 7198561
commit 6a78523
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -630,8 +630,7 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, co
 CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, RendezvousParameters & params)
 {
     MATTER_TRACE_SCOPE("EstablishPASEConnection", "DeviceCommissioner");
-    MATTER_LOG_METRIC_BEGIN(PASEConnectionEstablished); // Emit start of event (-begin), Emit Signpost
-    MATTER_LOG_METRIC_INSTANT(PASEConnectionEstablished); // Emit event (-event), Emit Signpost
+    MATTER_LOG_METRIC_BEGIN(PASESession);
 
     CHIP_ERROR err                     = CHIP_NO_ERROR;
     CommissioneeDeviceProxy * device   = nullptr;
@@ -765,10 +764,8 @@ CHIP_ERROR DeviceCommissioner::EstablishPASEConnection(NodeId remoteDeviceId, Re
         }
     }
 
-    MATTER_LOG_METRIC_INSTANT(PASEConnectionEstablished, 2); // Emit event (-event)
-    MATTER_LOG_METRIC_INSTANT(PASEConnectionEstablished); // Emit event (-event)
-    MATTER_LOG_METRIC_END(PASEConnectionEstablished, err); // Emit end of event with duration (-duration), Emit event (-end), Emit event error separately (-error), Emit Signpost
-    MATTER_LOG_METRIC_END(PASEConnectionEstablished); // Emit end of event with duration (-duration), Emit event (-end), Emit Signpost
+    MATTER_LOG_METRIC(PASESessionEstState, err); 
+    MATTER_LOG_METRIC_END(PASESession);
     return err;
 }
 

diff --git a/src/tracing/macros.h b/src/tracing/macros.h
@@ -112,7 +112,7 @@
 
 
 // Format for the args the metric macros: MATTER_LOG_METRIC_XYZ(key, [optional value])
-#define MATTER_LOG_METRIC_INSTANT(...) __MATTER_LOG_METRIC(Tag::Instant, __VA_ARGS__)
+#define MATTER_LOG_METRIC(...) __MATTER_LOG_METRIC(Tag::Instant, __VA_ARGS__)
 #define MATTER_LOG_METRIC_BEGIN(...) __MATTER_LOG_METRIC(Tag::Begin, __VA_ARGS__)
 #define MATTER_LOG_METRIC_END(...) __MATTER_LOG_METRIC(Tag::End, __VA_ARGS__)
 

diff --git a/src/tracing/metric_event.h b/src/tracing/metric_event.h
@@ -35,14 +35,14 @@ typedef const char* MetricKey;
 /**
  * List of supported metric keys
  */
-constexpr MetricKey kMetricDiscoveryOverBLE = "discovery-over-ble";
-constexpr MetricKey kMetricDiscoveryOnNetwork = "discovery-on-nw";
-constexpr MetricKey kMetricPASEConnectionEstablished = "pase-conn-est";
-constexpr MetricKey kMetricPASEConnectionFailed = "pase-conn-failed";
+constexpr MetricKey kMetricDiscoveryOverBLE = "disc-over-ble";
+constexpr MetricKey kMetricDiscoveryOnNetwork = "disc-on-nw";
+constexpr MetricKey kMetricPASESession = "pase-session";
+constexpr MetricKey kMetricPASESessionEstState = "pase-conn-est";
 constexpr MetricKey kMetricAttestationResult = "attestation-result";
 constexpr MetricKey kMetricAttestationOverridden = "attestation-overridden";
-constexpr MetricKey kMetricCASEConnectionEstablished = "case-conn-est";
-constexpr MetricKey kMetricCASEConnectionFailed = "case-conn-failed";
+constexpr MetricKey kMetricCASESession = "case-session";
+constexpr MetricKey kMetricCASESessionEstState = "case-conn-est";
 constexpr MetricKey kMetricWiFiRSSI = "wifi-rssi";
 
 /**
@@ -56,8 +56,8 @@ struct MetricEvent
 {
     // Metric tag type
     enum class Tag {
-        Begin,    // Implies a duration
-        End,      // Implies a duration
+        Begin,    // Implies tracking a duration
+        End,      // Implies tracking a duration
         Instant   // No duration
     };