Addressed the review comments

shripad621git · Feb 12, 2024 · 454d699 · 454d699
1 parent b6735e7
commit 454d699
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/src/tracing/backend.h b/src/tracing/backend.h
@@ -64,7 +64,7 @@ class Backend : public ::chip::IntrusiveListNodeBase<>
     virtual void TraceInstant(const char * label, const char * group) {}
 
     virtual void TraceCounter(const char * label) {}
-    virtual void TraceMetric(const char * label, int value) {}
+    virtual void TraceMetric(const char * label, int32_t value) {}
     virtual void LogMessageSend(MessageSendInfo &) { TraceInstant("MessageSent", "Messaging"); }
     virtual void LogMessageReceived(MessageReceivedInfo &) { TraceInstant("MessageReceived", "Messaging"); }
 

diff --git a/src/tracing/esp32_trace/esp32_tracing.cpp b/src/tracing/esp32_trace/esp32_tracing.cpp
@@ -154,15 +154,15 @@ void ESP32Backend::TraceCounter(const char * label)
     ::Insights::ESPInsightsCounter::GetInstance(label)->ReportMetrics();
 }
 
-void ESP32Backend::TraceMetric(const char * label, int value)
+void ESP32Backend::TraceMetric(const char * label, int32_t value)
 {
     if (!mRegistered)
     {
         esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, label /* Unique key 8 */, label /* label displayed on dashboard */,
                                   "insights.mtr" /* hierarchical path */, ESP_DIAG_DATA_TYPE_INT /* data_type */);
         mRegistered = true;
     }
-    ESP_LOGI("mtr", "The value of %s is %d ", label, value);
+    ESP_LOGI("mtr", "The value of %s is %ld ", label, value);
     esp_diag_metrics_add_int(label, value);
 }
 

diff --git a/src/tracing/esp32_trace/esp32_tracing.h b/src/tracing/esp32_trace/esp32_tracing.h
@@ -29,7 +29,7 @@ class ESP32Backend : public ::chip::Tracing::Backend
     void TraceInstant(const char * label, const char * group) override;
 
     void TraceCounter(const char * label) override;
-    void TraceMetric(const char * label, int value) override;
+    void TraceMetric(const char * label, int32_t value) override;
 
     void LogMessageSend(MessageSendInfo &) override;
     void LogMessageReceived(MessageReceivedInfo &) override;

diff --git a/src/tracing/json/json_tracing.cpp b/src/tracing/json/json_tracing.cpp
@@ -295,13 +295,11 @@ void JsonBackend::TraceCounter(const char * label)
     OutputValue(value);
 }
 
-void JsonBackend::TraceMetric(const char * label, int val)
+void JsonBackend::TraceMetric(const char * label, int32_t val)
 {
     ::Json::Value value;
-    value["label"]       = label;
-    value["label_value"] = val;
-
-    // Output the metric
+    value["label"] = label;
+    value["value"] = val;
 
     OutputValue(value);
 }

diff --git a/src/tracing/json/json_tracing.h b/src/tracing/json/json_tracing.h
@@ -52,7 +52,7 @@ class JsonBackend : public ::chip::Tracing::Backend
     void TraceEnd(const char * label, const char * group) override;
     void TraceInstant(const char * label, const char * group) override;
     void TraceCounter(const char * label) override;
-    void TraceMetric(const char * label, int val) override;
+    void TraceMetric(const char * label, int32_t val) override;
     void LogMessageSend(MessageSendInfo &) override;
     void LogMessageReceived(MessageReceivedInfo &) override;
     void LogNodeLookup(NodeLookupInfo &) override;

diff --git a/src/tracing/registry.cpp b/src/tracing/registry.cpp
@@ -84,7 +84,7 @@ void Counter(const char * label)
     }
 }
 
-void Metric(const char * label, int value)
+void Metric(const char * label, int32_t value)
 {
     for (auto & backend : gTracingBackends)
     {

diff --git a/src/tracing/registry.h b/src/tracing/registry.h
@@ -77,7 +77,7 @@ void Begin(const char * label, const char * group);
 void End(const char * label, const char * group);
 void Instant(const char * label, const char * group);
 void Counter(const char * label);
-void Metric(const char * label, int value);
+void Metric(const char * label, int32_t value);
 
 void LogMessageSend(::chip::Tracing::MessageSendInfo & info);
 void LogMessageReceived(::chip::Tracing::MessageReceivedInfo & info);