diff --git a/userspace/libsinsp/k8s_api_handler.cpp b/userspace/libsinsp/k8s_api_handler.cpp index 377127c53c..045c906e34 100644 --- a/userspace/libsinsp/k8s_api_handler.cpp +++ b/userspace/libsinsp/k8s_api_handler.cpp @@ -25,9 +25,9 @@ k8s_api_handler::k8s_api_handler(collector_ptr_t collector, k8s_handler("k8s_api_handler", false, #ifdef HAS_CAPTURE url, path, filter, ".", collector, http_version, 1000L, ssl, bt, - false, true, std::make_shared(), blocking_socket, ~0, + false, true, std::make_shared(), blocking_socket, #endif // HAS_CAPTURE - nullptr) + ~0, nullptr) { } diff --git a/userspace/libsinsp/k8s_daemonset_handler.cpp b/userspace/libsinsp/k8s_daemonset_handler.cpp index 7ed93e8af1..16cda62eb8 100644 --- a/userspace/libsinsp/k8s_daemonset_handler.cpp +++ b/userspace/libsinsp/k8s_daemonset_handler.cpp @@ -70,8 +70,8 @@ k8s_daemonset_handler::k8s_daemonset_handler(k8s_state_t& state STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, connect, dependency_handler, blocking_socket, - 100, // max msgs #endif // HAS_CAPTURE + 100, // max msgs &state) { } diff --git a/userspace/libsinsp/k8s_deployment_handler.cpp b/userspace/libsinsp/k8s_deployment_handler.cpp index 67a676528a..804cf73e47 100644 --- a/userspace/libsinsp/k8s_deployment_handler.cpp +++ b/userspace/libsinsp/k8s_deployment_handler.cpp @@ -69,8 +69,8 @@ k8s_deployment_handler::k8s_deployment_handler(k8s_state_t& state STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, connect, dependency_handler, blocking_socket, - 100, // max msgs #endif // HAS_CAPTURE + 100, // max msgs &state) { } diff --git a/userspace/libsinsp/k8s_event_handler.cpp b/userspace/libsinsp/k8s_event_handler.cpp index c49f12a44d..c1f1529b45 100644 --- a/userspace/libsinsp/k8s_event_handler.cpp +++ b/userspace/libsinsp/k8s_event_handler.cpp @@ -68,9 +68,9 @@ k8s_event_handler::k8s_event_handler(k8s_state_t& state url, "/api/v1/events", STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, - connect, dependency_handler, blocking_socket, ~0, + connect, dependency_handler, blocking_socket, #endif // HAS_CAPTURE - &state), + ~0, &state), m_event_filter(event_filter) { } diff --git a/userspace/libsinsp/k8s_handler.cpp b/userspace/libsinsp/k8s_handler.cpp index 43c774aa08..1f88ad2fb4 100644 --- a/userspace/libsinsp/k8s_handler.cpp +++ b/userspace/libsinsp/k8s_handler.cpp @@ -43,8 +43,8 @@ k8s_handler::k8s_handler(const std::string& id, bool connect, ptr_t dependency_handler, bool blocking_socket, - unsigned max_messages, #endif // HAS_CAPTURE + unsigned max_messages, k8s_state_t* state): m_state(state), m_id(id + "_state"), #ifdef HAS_CAPTURE @@ -62,8 +62,8 @@ k8s_handler::k8s_handler(const std::string& id, m_connect(connect), m_dependency_handler(dependency_handler), m_blocking_socket(blocking_socket), - m_max_messages(max_messages), #endif // HAS_CAPTURE + m_max_messages(max_messages), m_is_captured(is_captured) { #ifdef HAS_CAPTURE diff --git a/userspace/libsinsp/k8s_handler.h b/userspace/libsinsp/k8s_handler.h index b0d87c4b53..3538ea07a5 100644 --- a/userspace/libsinsp/k8s_handler.h +++ b/userspace/libsinsp/k8s_handler.h @@ -50,8 +50,8 @@ class k8s_handler bool connect = true, ptr_t dependency_handler = nullptr, bool blocking_socket = false, - unsigned max_messages = ~0, #endif // HAS_CAPTURE + unsigned max_messages = ~0, k8s_state_t* state = nullptr); virtual ~k8s_handler(); @@ -169,10 +169,11 @@ class k8s_handler bool m_blocking_socket = false; +#endif // HAS_CAPTURE + // limits the number of messages handled in single cycle unsigned m_max_messages = ~0; bool m_state_processing_started = false; -#endif // HAS_CAPTURE event_list_t m_events; @@ -196,7 +197,6 @@ class k8s_handler bool m_connect_logged = false; }; -#ifdef HAS_CAPTURE inline unsigned k8s_handler::get_max_messages() const { return m_max_messages; @@ -207,6 +207,7 @@ inline void k8s_handler::set_max_messages(unsigned max_msgs) m_max_messages = max_msgs; } +#ifdef HAS_CAPTURE inline k8s_handler::handler_ptr_t k8s_handler::handler() { return m_handler; @@ -280,9 +281,9 @@ class k8s_dummy_handler : public k8s_handler #ifdef HAS_CAPTURE "", "", "", "", nullptr, "", 0, nullptr, nullptr, - false, false, nullptr, false, ~0, + false, false, nullptr, false, #endif // HAS_CAPTURE - nullptr) + ~0, nullptr) { m_state_built = true; } diff --git a/userspace/libsinsp/k8s_namespace_handler.cpp b/userspace/libsinsp/k8s_namespace_handler.cpp index ff5e14d3cd..498538dbd4 100644 --- a/userspace/libsinsp/k8s_namespace_handler.cpp +++ b/userspace/libsinsp/k8s_namespace_handler.cpp @@ -59,9 +59,9 @@ k8s_namespace_handler::k8s_namespace_handler(k8s_state_t& state url, "/api/v1/namespaces", STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, - connect, dependency_handler, blocking_socket, ~0, + connect, dependency_handler, blocking_socket, #endif // HAS_CAPTURE - &state) + ~0, &state) { } diff --git a/userspace/libsinsp/k8s_node_handler.cpp b/userspace/libsinsp/k8s_node_handler.cpp index b2f49784ba..262ea23e9b 100644 --- a/userspace/libsinsp/k8s_node_handler.cpp +++ b/userspace/libsinsp/k8s_node_handler.cpp @@ -62,9 +62,9 @@ k8s_node_handler::k8s_node_handler(k8s_state_t& state url, "/api/v1/nodes", STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, - connect, dependency_handler, blocking_socket, ~0, + connect, dependency_handler, blocking_socket, #endif // HAS_CAPTURE - &state) + ~0, &state) { } diff --git a/userspace/libsinsp/k8s_pod_handler.cpp b/userspace/libsinsp/k8s_pod_handler.cpp index 88a3977bc2..74f145423d 100644 --- a/userspace/libsinsp/k8s_pod_handler.cpp +++ b/userspace/libsinsp/k8s_pod_handler.cpp @@ -74,9 +74,9 @@ k8s_pod_handler::k8s_pod_handler(k8s_state_t& state url, "/api/v1/pods?fieldSelector=status.phase%3DRunning", STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, - connect, dependency_handler, blocking_socket, ~0, + connect, dependency_handler, blocking_socket, #endif // HAS_CAPTURE - &state) + ~0, &state) { } diff --git a/userspace/libsinsp/k8s_replicaset_handler.cpp b/userspace/libsinsp/k8s_replicaset_handler.cpp index 2d4cd41751..a9388d92d0 100644 --- a/userspace/libsinsp/k8s_replicaset_handler.cpp +++ b/userspace/libsinsp/k8s_replicaset_handler.cpp @@ -69,8 +69,8 @@ k8s_replicaset_handler::k8s_replicaset_handler(k8s_state_t& state STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, connect, dependency_handler, blocking_socket, - 100, // max msgs, #endif // HAS_CAPTURE + 100, // max msgs &state) { } diff --git a/userspace/libsinsp/k8s_replicationcontroller_handler.cpp b/userspace/libsinsp/k8s_replicationcontroller_handler.cpp index e522481979..2d2f6b588b 100644 --- a/userspace/libsinsp/k8s_replicationcontroller_handler.cpp +++ b/userspace/libsinsp/k8s_replicationcontroller_handler.cpp @@ -69,8 +69,8 @@ k8s_replicationcontroller_handler::k8s_replicationcontroller_handler(k8s_state_t STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, connect, dependency_handler, blocking_socket, - 100, // max msgs, #endif // HAS_CAPTURE + 100, // max msgs &state) { } diff --git a/userspace/libsinsp/k8s_service_handler.cpp b/userspace/libsinsp/k8s_service_handler.cpp index 4846538402..19f8f1eeb1 100644 --- a/userspace/libsinsp/k8s_service_handler.cpp +++ b/userspace/libsinsp/k8s_service_handler.cpp @@ -69,8 +69,8 @@ k8s_service_handler::k8s_service_handler(k8s_state_t& state STATE_FILTER, EVENT_FILTER, collector, http_version, 1000L, ssl, bt, true, connect, dependency_handler, blocking_socket, - 100, // max msgs, #endif // HAS_CAPTURE + 100, // max msgs &state) { }