Skip to content

Commit

Permalink
Added the support to report the chip system statistics to the esp-ins…
Browse files Browse the repository at this point in the history
…ights.

- The system stats from src/system/SystemStats.h are reported on enabling a config option to esp-insights.
  • Loading branch information
shripad621git committed Oct 6, 2023
1 parent f4c2094 commit 776bec0
Show file tree
Hide file tree
Showing 5 changed files with 247 additions and 0 deletions.
4 changes: 4 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,10 @@ if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
chip_gn_arg_append("matter_trace_config" "\"${CHIP_ROOT}/src/tracing/esp32_trace:esp32_trace_tracing\"")
endif()

if (CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS)
chip_gn_arg_append("matter_enable_esp_insights_system_stats" "true")
endif()

if (CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
chip_gn_arg_append("chip_use_esp32_ecdsa_peripheral" "true")
endif()
Expand Down
6 changes: 6 additions & 0 deletions config/esp32/components/chip/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,12 @@ menu "CHIP Device Layer"
Enabling the above option will enable the esp32 specific tracing functionality and report the
diagnostic information to the insights cloud.

config ENABLE_ESP_INSIGHTS_SYSTEM_STATS
bool "Enable System Stats for insights"
depends on ESP_INSIGHTS_ENABLED
default n
help
This option enables the system statistics to be sent to the insights cloud.
endmenu


Expand Down
9 changes: 9 additions & 0 deletions examples/lighting-app/esp32/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
#include <credentials/examples/DeviceAttestationCredsExample.h>
#include <platform/ESP32/ESP32Utils.h>

#if CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS
#include <matter/tracing/insights_sys_stats.h>
#endif

#if CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
#include <platform/ESP32/ESP32FactoryDataProvider.h>
#endif // CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
Expand Down Expand Up @@ -114,6 +118,7 @@ static void InitServer(intptr_t context)

DeviceCallbacksDelegate::Instance().SetAppDelegate(&sAppDeviceCallbacksDelegate);
Esp32AppServer::Init(); // Init ZCL Data Model and CHIP App Server AND Initialize device attestation config

#if CONFIG_ENABLE_ESP_INSIGHTS_TRACE
esp_insights_config_t config = {
.log_type = ESP_DIAG_LOG_TYPE_ERROR | ESP_DIAG_LOG_TYPE_WARNING | ESP_DIAG_LOG_TYPE_EVENT,
Expand All @@ -129,6 +134,10 @@ static void InitServer(intptr_t context)

static Tracing::Insights::ESP32Backend backend;
Tracing::Register(backend);
// Setting the sampling time to 60 seconds i.e 60,000 ms
#if CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS
chip::System::Stats::InsightsSystemMetrics::GetInstance().RegisterAndEnable(chip::System::Clock::Timeout(60000));
#endif
#endif
}

Expand Down
159 changes: 159 additions & 0 deletions src/tracing/esp32_trace/include/matter/tracing/insights_sys_stats.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
/*
* Copyright (c) 2023 Project CHIP Authors
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "insights_sys_stats.h"
#include <esp_diagnostics_metrics.h>
#include <esp_err.h>
#include <esp_log.h>
#include <platform/CHIPDeviceLayer.h>
#include <string.h>
#include <system/SystemStats.h>

namespace chip {
namespace System {
namespace Stats {

InsightsSystemMetrics & InsightsSystemMetrics::GetInstance()
{
static InsightsSystemMetrics instance;
return instance;
}

void InsightsSystemMetrics::SamplingIntervalHandler(Layer * systemLayer, void * context)
{
auto instance = static_cast<InsightsSystemMetrics *>(context);
count_t * highwatermarks = GetHighWatermarks();
for (int i = 0; i < System::Stats::kNumEntries; i++)
{
esp_err_t err = esp_diag_metrics_add_uint(instance->mLabels[i], static_cast<int>(highwatermarks[i]));
if (err != ESP_OK)
{
ESP_LOGE(kTag, "Failed to add the metric:%s, err:%d", instance->mLabels[i], err);
}
}
DeviceLayer::SystemLayer().StartTimer(instance->GetSamplingInterval(), SamplingIntervalHandler, instance);
}

CHIP_ERROR InsightsSystemMetrics::Unregister()
{
if (!mRegistered)
{
return CHIP_ERROR_INCORRECT_STATE;
}
for (int i = 0; i < System::Stats::kNumEntries; i++)
{
if (mLabels[i] != nullptr)
{
esp_err_t err = esp_diag_metrics_unregister(mLabels[i]);
if (err != ESP_OK)
{
ESP_LOGE(kTag, "Failed to unregister metric:%s, err:%d", mLabels[i], err);
}
free(mLabels[i]);
mLabels[i] = nullptr;
}
}
return CHIP_NO_ERROR;
}

void InsightsSystemMetrics::CancelSamplingInterval(intptr_t arg)
{
auto instance = static_cast<InsightsSystemMetrics *>(reinterpret_cast<void *>(arg));
DeviceLayer::SystemLayer().CancelTimer(SamplingIntervalHandler, instance);
}

CHIP_ERROR InsightsSystemMetrics::SetSamplingInterval(chip::System::Clock::Timeout aTimeout)
{
if (!mRegistered)
{
return CHIP_ERROR_INCORRECT_STATE;
}

if (aTimeout == System::Clock::kZero)
{
DeviceLayer::PlatformMgr().ScheduleWork(CancelSamplingInterval, reinterpret_cast<intptr_t>(this));
}
else if (aTimeout != mTimeout)
{
DeviceLayer::PlatformMgr().ScheduleWork(CancelSamplingInterval, reinterpret_cast<intptr_t>(this));
mTimeout = aTimeout;
CHIP_ERROR err = DeviceLayer::SystemLayer().StartTimer(mTimeout, SamplingIntervalHandler, this);
if (err != CHIP_NO_ERROR)
{
ESP_LOGE(kTag, "Failed to start the new timer %" CHIP_ERROR_FORMAT, err.Format());
return err;
}
}

return CHIP_NO_ERROR;
}

CHIP_ERROR InsightsSystemMetrics::RegisterAndEnable(chip::System::Clock::Timeout aTimeout)
{
if (mRegistered)
{
return CHIP_NO_ERROR;
}

if (aTimeout == System::Clock::kZero)
{
return CHIP_ERROR_INVALID_ARGUMENT;
}

const Label * labels = GetStrings();
for (int i = 0; i < System::Stats::kNumEntries; i++)
{
size_t labelLength = strlen(labels[i]);
if (labelLength >= kMaxStringLength)
{
labelLength = kMaxStringLength;
mLabels[i] = strndup(labels[i], labelLength - 1);
}
else
{
mLabels[i] = strndup(labels[i], labelLength);
}

if (mLabels[i] == NULL)
{
Unregister();
return CHIP_ERROR_NO_MEMORY;
}

esp_err_t err = esp_diag_metrics_register(kTag, mLabels[i], labels[i], kPath, ESP_DIAG_DATA_TYPE_UINT);
if (err != ESP_OK)
{
ESP_LOGE(kTag, "Failed to register metric:%s, err:%d", mLabels[i], err);
return CHIP_ERROR_INCORRECT_STATE;
}
}

mTimeout = System::Clock::Milliseconds32(aTimeout);

CHIP_ERROR err = DeviceLayer::SystemLayer().StartTimer(GetSamplingInterval(), SamplingIntervalHandler, this);
if (err != CHIP_NO_ERROR)
{
ESP_LOGE(kTag, "Failed to start the timer, err:%" CHIP_ERROR_FORMAT, err.Format());
return err;
}
mRegistered = true;
return CHIP_NO_ERROR;
}

} // namespace Stats
} // namespace System
} // namespace chip
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* Copyright (c) 2023 Project CHIP Authors
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <lib/core/CHIPError.h>
#include <platform/CHIPDeviceLayer.h>
#include <system/SystemClock.h>
#include <system/SystemStats.h>
namespace chip {
namespace System {
namespace Stats {

class InsightsSystemMetrics
{
public:
static InsightsSystemMetrics & GetInstance();

/*
* This api registers the system metrics to the insights and starts the
* timer to enable system stats periodically to the insights.
*/
CHIP_ERROR RegisterAndEnable(chip::System::Clock::Timeout aTimeout);

/*
* This api unregisters the system stats which are registered
* as metrics to the esp-insights.
*/
CHIP_ERROR Unregister();

/*
* This api cancels the timeout providing the user the flexibility
* to increase or decrease the frequency of sampling the System
* Stats. It cancels the timer if new timeout value is zero.
* If the value of timeout differs from existing value, then
* it cancels the previous timer and starts a new timer.
*/
CHIP_ERROR SetSamplingInterval(chip::System::Clock::Timeout aTimeout);

System::Clock::Timeout GetSamplingInterval() { return mTimeout; }

private:
InsightsSystemMetrics() {}
static constexpr int kMaxStringLength = 16;
bool mRegistered = false;
static constexpr char kPath[] = "sys.mtr";
static constexpr char kTag[] = "MTR";
System::Clock::Timeout mTimeout;
char * mLabels[chip::System::Stats::kNumEntries];

static void SamplingIntervalHandler(System::Layer * systemLayer, void * context);
static void CancelSamplingInterval(intptr_t arg);
};

} // namespace Stats
} // namespace System
} // namespace chip

0 comments on commit 776bec0

Please sign in to comment.