example/temperature-measurement-app

- Resolve buffer issues
- Use single buffer for store and retrieve of diagnostics
- Resolve data loss issue

Author: pimpalemahesh

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

@@ -29,11 +29,6 @@ using namespace chip::app::Clusters::DiagnosticLogs;
 LogProvider LogProvider::sInstance;
 LogProvider::CrashLogContext LogProvider::sCrashLogContext;
 
-#if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-    static uint8_t retrieveBuffer[RETRIEVAL_BUFFER_SIZE];
-    MutableByteSpan endUserSupportSpan(retrieveBuffer, sizeof(retrieveBuffer));
-#endif
-
 namespace {
 bool IsValidIntent(IntentEnum intent)
 {
@@ -83,7 +78,7 @@ size_t LogProvider::GetSizeForIntent(IntentEnum intent)
     case IntentEnum::kEndUserSupport:
         {
             #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-                return RETRIEVAL_BUFFER_SIZE;
+                return DIAGNOSTIC_BUFFER_SIZE;
             #else
                 return static_cast<size_t>(endUserSupportLogEnd - endUserSupportLogStart);
             #endif
@@ -122,10 +117,10 @@ 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);
 
             if (diagnosticStorage.IsEmptyBuffer())
             {
-                printf("Buffer is empty\n");
                 ChipLogError(DeviceLayer, "Empty Diagnostic buffer");
                 return CHIP_ERROR_NOT_FOUND;
             }
@@ -144,6 +139,7 @@ CHIP_ERROR LogProvider::PrepareLogContextForIntent(LogContext * context, IntentE
         #endif
     }
     break;
+
     case IntentEnum::kNetworkDiag: {
         context->NetworkDiag.span =
             ByteSpan(&networkDiagnosticLogStart[0], static_cast<size_t>(networkDiagnosticLogEnd - networkDiagnosticLogStart));

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

@@ -31,7 +31,9 @@
 #endif // defined(CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH) && defined(CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF)
 
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-#define RETRIEVAL_BUFFER_SIZE CONFIG_END_USER_BUFFER_SIZE
+#define DIAGNOSTIC_BUFFER_SIZE CONFIG_END_USER_BUFFER_SIZE
+static uint8_t endUserBuffer[DIAGNOSTIC_BUFFER_SIZE];
+
 using namespace chip::Tracing::Diagnostics;
 #endif
 

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

@@ -76,12 +76,6 @@ extern const char TAG[] = "temperature-measurement-app";
 
 static AppDeviceCallbacks EchoCallbacks;
 
-#if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-using namespace chip::Tracing::Diagnostics;
-static uint8_t endUserBuffer[CONFIG_END_USER_BUFFER_SIZE];
-static size_t buffer_size = CONFIG_END_USER_BUFFER_SIZE;
-#endif
-
 static void InitServer(intptr_t context)
 {
     Esp32AppServer::Init(); // Init ZCL Data Model and CHIP App Server AND Initialize device attestation config
@@ -94,7 +88,7 @@ extern "C" void app_main()
 #endif
 
 #if CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE
-    static ESP32Diagnostics diagnosticBackend(endUserBuffer, buffer_size);
+    static ESP32Diagnostics diagnosticBackend(endUserBuffer, DIAGNOSTIC_BUFFER_SIZE);
     Tracing::Register(diagnosticBackend);
 #endif