temperature_measurement_app: Review changes

Author: pimpalemahesh

config/esp32/components/chip/Kconfig

@@ -1001,12 +1001,10 @@ menu "CHIP Device Layer"
 
         config ENABLE_ESP_DIAGNOSTICS_TRACE
             bool "Enable ESP Platform Diagnostics for Matter"
-            depends on ESP_DIAGNOSTICS_ENABLED
-            default y
+            default n
             help
                 Enables the ESP Diagnostics platform to collect, store, and retrieve diagnostic data for the Matter protocol.
                 This feature helps monitor system health and performance by providing insights through diagnostics logs.
-                Requires ESP_DIAGNOSTICS_ENABLED to be activated.
 
        config ENABLE_ESP_INSIGHTS_TRACE
            bool "Enable Matter ESP Insights"
@@ -1027,7 +1025,7 @@ menu "CHIP Device Layer"
         config MAX_PERMIT_LIST_SIZE
             int "Set permit list size for Insights traces"
             range 5 30
-            depends on ESP_INSIGHTS_ENABLED || ESP_DIAGNOSTICS_ENABLED
+            depends on ESP_INSIGHTS_ENABLED || ENABLE_ESP_DIAGNOSTICS_TRACE
             default 20
             help
                 Set the maximum number of group entries that can be included in the permit list for reporting

examples/temperature-measurement-app/esp32/main/Kconfig.projbuild

@@ -85,13 +85,10 @@ depends on ENABLE_PW_RPC
 endmenu
 
 menu "Platform Diagnostics"
-    config ESP_DIAGNOSTICS_ENABLED
-        bool "Enable ESP Diagnostics"
-        default n
 
     config END_USER_BUFFER_SIZE
         int "Set buffer size for end user diagnostic data"
-        depends on ESP_DIAGNOSTICS_ENABLED
+        depends on ENABLE_ESP_DIAGNOSTICS_TRACE
         default 4096
         help
             Defines the buffer size (in bytes) for storing diagnostic data related to end user activity.

examples/temperature-measurement-app/esp32/main/diagnostic-logs-provider-delegate-impl.cpp

@@ -29,6 +29,10 @@ using namespace chip::app::Clusters::DiagnosticLogs;
 LogProvider LogProvider::sInstance;
 LogProvider::CrashLogContext LogProvider::sCrashLogContext;
 
+#if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
+static uint32_t sIntentSize = CONFIG_END_USER_BUFFER_SIZE;
+#endif
+
 namespace {
 bool IsValidIntent(IntentEnum intent)
 {
@@ -77,7 +81,7 @@ size_t LogProvider::GetSizeForIntent(IntentEnum intent)
     {
     case IntentEnum::kEndUserSupport: {
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-        return DIAGNOSTIC_BUFFER_SIZE;
+        return sIntentSize;
 #else
         return static_cast<size_t>(endUserSupportLogEnd - endUserSupportLogStart);
 #endif
@@ -116,7 +120,7 @@ CHIP_ERROR LogProvider::PrepareLogContextForIntent(LogContext * context, IntentE
     case IntentEnum::kEndUserSupport: {
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
         DiagnosticStorageImpl & diagnosticStorage = DiagnosticStorageImpl::GetInstance();
-        MutableByteSpan endUserSupportSpan(endUserBuffer, DIAGNOSTIC_BUFFER_SIZE);
+        MutableByteSpan endUserSupportSpan(endUserBuffer, CONFIG_END_USER_BUFFER_SIZE);
 
         if (diagnosticStorage.IsEmptyBuffer())
         {
@@ -130,6 +134,7 @@ CHIP_ERROR LogProvider::PrepareLogContextForIntent(LogContext * context, IntentE
             ChipLogError(DeviceLayer, "Failed to retrieve data: %s", chip::ErrorStr(err));
             return err;
         }
+        sIntentSize = endUserSupportSpan.size();
         // Now, assign the span to the EndUserSupport object or whatever is required
         context->EndUserSupport.span = endUserSupportSpan;
 #else

examples/temperature-measurement-app/esp32/main/include/diagnostic-logs-provider-delegate-impl.h

@@ -21,7 +21,7 @@
 #include <app/clusters/diagnostic-logs-server/DiagnosticLogsProviderDelegate.h>
 
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-#include <src/tracing/esp32_diagnostic_trace/DiagnosticStorageManager.h>
+#include <tracing/esp32_diagnostic_trace/DiagnosticStorageManager.h>
 #endif
 
 #include <map>
@@ -31,9 +31,7 @@
 #endif // defined(CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH) && defined(CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF)
 
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-#define DIAGNOSTIC_BUFFER_SIZE CONFIG_END_USER_BUFFER_SIZE
-static uint8_t endUserBuffer[DIAGNOSTIC_BUFFER_SIZE];
-
+static uint8_t endUserBuffer[CONFIG_END_USER_BUFFER_SIZE];
 using namespace chip::Tracing::Diagnostics;
 #endif
 

examples/temperature-measurement-app/esp32/main/main.cpp

@@ -88,7 +88,7 @@ extern "C" void app_main()
 #endif
 
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-    static ESP32Diagnostics diagnosticBackend(endUserBuffer, DIAGNOSTIC_BUFFER_SIZE);
+    static ESP32Diagnostics diagnosticBackend(endUserBuffer, CONFIG_END_USER_BUFFER_SIZE);
     Tracing::Register(diagnosticBackend);
 #endif