esp32_diagnostic_trace: Review changes

Author: pimpalemahesh

src/tracing/esp32_diagnostic_trace/DiagnosticStorageManager.cpp

@@ -21,6 +21,8 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <tracing/esp32_diagnostic_trace/DiagnosticStorageManager.h>
 
+#define TLV_CLOSING_BYTES 4
+
 namespace chip {
 namespace Tracing {
 using namespace chip::TLV;
@@ -105,7 +107,7 @@ CHIP_ERROR DiagnosticStorageImpl::Retrieve(MutableByteSpan & payload)
                 (reader.GetTag() == ContextTag(DIAGNOSTICS_TAG::METRIC) || reader.GetTag() == ContextTag(DIAGNOSTICS_TAG::TRACE) ||
                  reader.GetTag() == ContextTag(DIAGNOSTICS_TAG::COUNTER)))
             {
-                if ((reader.GetLengthRead() - writer.GetLengthWritten()) < writer.GetRemainingFreeLength())
+                if ((reader.GetLengthRead() - writer.GetLengthWritten()) < (writer.GetRemainingFreeLength() + TLV_CLOSING_BYTES))
                 {
                     err = writer.CopyElement(reader);
                     if (err == CHIP_ERROR_BUFFER_TOO_SMALL)

src/tracing/esp32_diagnostic_trace/DiagnosticStorageManager.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Diagnostics.h"
+#include <tracing/esp32_diagnostic_trace/Diagnostics.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPMem.h>
 

src/tracing/esp32_diagnostic_trace/DiagnosticTracing.h

@@ -21,7 +21,7 @@
 #include <esp_log.h>
 #include <lib/core/CHIPError.h>
 #include <tracing/backend.h>
-#include <tracing/esp32_diagnostic_trace/DiagnosticStorageManager.h>
+#include <tracing/esp32_diagnostic_trace/Diagnostics.h>
 #include <tracing/metric_event.h>
 
 #include <memory>

src/tracing/esp32_diagnostic_trace/Diagnostics.h

@@ -17,7 +17,6 @@
  */
 
 #pragma once
-
 #include <lib/core/CHIPError.h>
 #include <lib/core/TLVCircularBuffer.h>
 #include <lib/support/Span.h>
@@ -188,6 +187,7 @@ class Counter : public DiagnosticEntry
     uint32_t timestamp_;
 };
 
+
 /**
  * @brief Interface for storing and retrieving diagnostic data.
  */