Skip to content

Commit

Permalink
cleanup(libsinsp): tweak container cache metrics
Browse files Browse the repository at this point in the history
Signed-off-by: Melissa Kilby <[email protected]>
  • Loading branch information
incertum committed Oct 24, 2023
1 parent a224442 commit 3b2dc0b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
9 changes: 6 additions & 3 deletions userspace/libsinsp/container.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,13 @@ bool sinsp_container_manager::remove_inactive_containers()
for(auto it = containers->begin(); it != containers->end();)
{
sinsp_container_info::ptr_t container = it->second;
auto container_info = container.get();
if (m_inspector != nullptr && container_info && container_info->m_image.empty())
if (m_inspector != nullptr)
{
m_inspector->m_sinsp_stats_v2.m_n_missing_container_images++;
auto container_info = container.get();
if (!container_info || (container_info && container_info->m_image.empty()))
{
m_inspector->m_sinsp_stats_v2.m_n_missing_container_images++;
}
}
if(containers_in_use.find(it->first) == containers_in_use.end())
{
Expand Down
4 changes: 2 additions & 2 deletions userspace/libsinsp/stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ typedef struct sinsp_stats_v2
uint64_t m_n_failed_thread_lookups;
uint64_t m_n_added_threads;
uint64_t m_n_removed_threads;
uint64_t m_n_missing_container_images;
uint64_t m_n_containers;
uint32_t m_n_missing_container_images;
uint32_t m_n_containers;
}sinsp_stats_v2;

typedef enum sinsp_stats_v2_resource_utilization {
Expand Down
2 changes: 1 addition & 1 deletion userspace/libsinsp/test/sinsp_stats.ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ limitations under the License.
TEST_F(sinsp_with_test_input, sinsp_stats_v2_resource_utilization)
{

open_inspector(SCAP_MODE_LIVE);
open_inspector();
// Adopted from test: TEST_F(sinsp_with_test_input, PROC_FILTER_nthreads)
DEFAULT_TREE
/* we call a random event to obtain an event associated with this thread info */
Expand Down

0 comments on commit 3b2dc0b

Please sign in to comment.