Merge remote-tracking branch 'origin/runtime_stats' into integration

esphome/components/runtime_stats/__init__.py

@@ -17,7 +17,7 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(RuntimeStatsCollector),
         cv.Optional(
-            CONF_LOG_INTERVAL, default=60000
+            CONF_LOG_INTERVAL, default="60s"
         ): cv.positive_time_period_milliseconds,
     }
 )

esphome/components/runtime_stats/runtime_stats.h

@@ -23,10 +23,10 @@ class ComponentRuntimeStats {
  public:
   ComponentRuntimeStats()
       : period_count_(0),
-        total_count_(0),
         period_time_ms_(0),
-        total_time_ms_(0),
         period_max_time_ms_(0),
+        total_count_(0),
+        total_time_ms_(0),
         total_max_time_ms_(0) {}
 
   void record_time(uint32_t duration_ms) {

esphome/core/application.cpp

@@ -4,6 +4,9 @@
 #include "esphome/core/hal.h"
 #include <algorithm>
 #include <ranges>
+#ifdef USE_RUNTIME_STATS
+#include "esphome/components/runtime_stats/runtime_stats.h"
+#endif
 
 #ifdef USE_STATUS_LED
 #include "esphome/components/status_led/status_led.h"

esphome/core/application.h

@@ -9,9 +9,6 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
-#ifdef USE_RUNTIME_STATS
-#include "esphome/components/runtime_stats/runtime_stats.h"
-#endif
 #include "esphome/core/scheduler.h"
 
 #ifdef USE_DEVICES

esphome/core/component.cpp

@@ -9,6 +9,9 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#ifdef USE_RUNTIME_STATS
+#include "esphome/components/runtime_stats/runtime_stats.h"
+#endif
 
 namespace esphome {
 

esphome/core/component.h

@@ -6,9 +6,6 @@
 #include <string>
 
 #include "esphome/core/optional.h"
-#ifdef USE_RUNTIME_STATS
-#include "esphome/components/runtime_stats/runtime_stats.h"
-#endif
 
 namespace esphome {
 

tests/components/runtime_stats/common.yaml

@@ -0,0 +1,2 @@
+# Test runtime_stats component with default configuration
+runtime_stats:

tests/components/runtime_stats/test.esp32-ard.yaml

@@ -0,0 +1 @@
+<<: !include common.yaml