diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py
index 6943c26ecb3081..58272820fba664 100644
--- a/scripts/tools/check_includes_config.py
+++ b/scripts/tools/check_includes_config.py
@@ -160,6 +160,9 @@
     'src/tracing/json/json_tracing.cpp': {'string', 'sstream'},
     'src/tracing/json/json_tracing.h': {'fstream', 'unordered_map'},
 
+    # esp32 tracing
+    'src/tracing/esp32_trace/esp32_tracing.h': {'unordered_map'},
+
     # Not intended for embedded clients
     'src/app/PendingResponseTrackerImpl.h': {'unordered_set'},
 
diff --git a/src/tracing/esp32_trace/esp32_tracing.cpp b/src/tracing/esp32_trace/esp32_tracing.cpp
index 718bc53029fb84..c2cdf1e3edb912 100644
--- a/src/tracing/esp32_trace/esp32_tracing.cpp
+++ b/src/tracing/esp32_trace/esp32_tracing.cpp
@@ -152,26 +152,23 @@ void ESP32Backend::TraceCounter(const char * label)
     ::Insights::ESPInsightsCounter::GetInstance(label)->ReportMetrics();
 }
 
-void ESP32Backend::RegisterMetric(const char* key, ValueType type)
+void ESP32Backend::RegisterMetric(const char * key, ValueType type)
 {
     switch (type)
     {
     case ValueType::kUInt32:
-        esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, key /* Unique key 8 */,
-                                    key /* label displayed on dashboard */, "insights.mtr" /* hierarchical path */,
-                                    ESP_DIAG_DATA_TYPE_UINT /* data_type */);
+        esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, key /* Unique key 8 */, key /* label displayed on dashboard */,
+                                  "insights.mtr" /* hierarchical path */, ESP_DIAG_DATA_TYPE_UINT /* data_type */);
         break;
 
     case ValueType::kInt32:
-        esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, key /* Unique key 8 */,
-                                    key /* label displayed on dashboard */, "insights.mtr" /* hierarchical path */,
-                                    ESP_DIAG_DATA_TYPE_INT /* data_type */);
+        esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, key /* Unique key 8 */, key /* label displayed on dashboard */,
+                                  "insights.mtr" /* hierarchical path */, ESP_DIAG_DATA_TYPE_INT /* data_type */);
         break;
 
     case ValueType::kChipErrorCode:
-        esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, key /* Unique key 8 */,
-                                    key /* label displayed on dashboard */, "insights.mtr" /* hierarchical path */,
-                                    ESP_DIAG_DATA_TYPE_UINT /* data_type */);
+        esp_diag_metrics_register("SYS_MTR" /*Tag of metrics */, key /* Unique key 8 */, key /* label displayed on dashboard */,
+                                  "insights.mtr" /* hierarchical path */, ESP_DIAG_DATA_TYPE_UINT /* data_type */);
         break;
 
     case ValueType::kUndefined:
@@ -184,8 +181,9 @@ void ESP32Backend::RegisterMetric(const char* key, ValueType type)
 
 void ESP32Backend::LogMetricEvent(const MetricEvent & event)
 {
-    
-    if (mRegisteredMetrics.find(event.key()) == mRegisteredMetrics.end()) {
+
+    if (mRegisteredMetrics.find(event.key()) == mRegisteredMetrics.end())
+    {
         RegisterMetric(event.key(), event.ValueType());
     }
 
diff --git a/src/tracing/esp32_trace/esp32_tracing.h b/src/tracing/esp32_trace/esp32_tracing.h
index 277eb85cbf6d8d..c0903ac72fd8dc 100644
--- a/src/tracing/esp32_trace/esp32_tracing.h
+++ b/src/tracing/esp32_trace/esp32_tracing.h
@@ -1,7 +1,7 @@
 #include <lib/core/CHIPError.h>
 #include <tracing/backend.h>
-#include <unordered_map>
 #include <tracing/metric_event.h>
+#include <unordered_map>
 
 #include <memory>
 namespace chip {
@@ -43,8 +43,7 @@ class ESP32Backend : public ::chip::Tracing::Backend
 private:
     using ValueType = MetricEvent::Value::Type;
     std::unordered_map<const char *, ValueType> mRegisteredMetrics;
-    void RegisterMetric(const char *key, ValueType type);
-
+    void RegisterMetric(const char * key, ValueType type);
 };
 
 } // namespace Insights