diff options
Diffstat (limited to 'src/components/telemetry_monitor')
24 files changed, 60 insertions, 58 deletions
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt index bb33857ecd..093413ef3b 100644 --- a/src/components/telemetry_monitor/CMakeLists.txt +++ b/src/components/telemetry_monitor/CMakeLists.txt @@ -50,6 +50,7 @@ include_directories ( ${JSONCPP_INCLUDE_DIRECTORY} ${CMAKE_BINARY_DIR}/src/components/ ${LOG4CXX_INCLUDE_DIRECTORY} + ${BOOST_INCLUDE_DIR} ) set(PATHS diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h index eabaf0a5e4..7ee5729c9b 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_metric_wrapper.h @@ -35,8 +35,8 @@ #include <string> -#include "telemetry_monitor/metric_wrapper.h" #include "telemetry_monitor/application_manager_observer.h" +#include "telemetry_monitor/metric_wrapper.h" namespace telemetry_monitor { @@ -48,5 +48,5 @@ class ApplicationManagerMetricWrapper : public MetricWrapper { message_metric; virtual Json::Value GetJsonMetric(); }; -} +} // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_METRIC_WRAPPER_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h index 31a3ceea12..826bc66c7f 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/application_manager_observer.h @@ -33,9 +33,9 @@ #ifndef SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_ -#include "utils/message_queue.h" #include "application_manager/telemetry_observer.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" +#include "utils/message_queue.h" namespace telemetry_monitor { @@ -50,5 +50,5 @@ class ApplicationManagerObserver private: TelemetryMonitor* telemetry_monitor_; }; -} +} // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_OBSERVER_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h index 899c76b2e8..94911bcaef 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h @@ -47,6 +47,6 @@ const char connection_key[] = "connection_key"; const char stime[] = "stime"; const char utime[] = "utime"; const char memory[] = "RAM"; -} -} +} // namespace strings +} // namespace telemetry_monitor #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_JSON_KEYS_H_ diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h index 431e255c7b..f69efada82 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_METRIC_WRAPPER_H_ #include <string> -#include "utils/resource_usage.h" #include "json/json.h" +#include "utils/resource_usage.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h index dfe7f4b964..a3af8e7048 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_metric_wrapper.h @@ -35,8 +35,8 @@ #include <string> -#include "telemetry_monitor/metric_wrapper.h" #include "protocol_handler_observer.h" +#include "telemetry_monitor/metric_wrapper.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h index ff7b9da9d6..b7d8f6da2b 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h @@ -35,16 +35,16 @@ #include <string> -#include "utils/message_queue.h" -#include "utils/threads/thread.h" -#include "utils/threads/thread_delegate.h" -#include "telemetry_monitor/metric_wrapper.h" +#include "application_manager/application_manager.h" +#include "protocol_handler/protocol_handler_impl.h" +#include "protocol_handler_observer.h" #include "telemetry_monitor/application_manager_observer.h" -#include "application_manager/application_manager_impl.h" +#include "telemetry_monitor/metric_wrapper.h" #include "telemetry_monitor/transport_manager_observer.h" #include "transport_manager/transport_manager_impl.h" -#include "protocol_handler_observer.h" -#include "protocol_handler/protocol_handler_impl.h" +#include "utils/message_queue.h" +#include "utils/threads/thread.h" +#include "utils/threads/thread_delegate.h" namespace telemetry_monitor { @@ -78,12 +78,13 @@ class TelemetryMonitor { public: TelemetryMonitor(const std::string& server_address, uint16_t port); virtual ~TelemetryMonitor(); - virtual void Init(TelemetryObservable<protocol_handler::PHTelemetryObserver>* - protocol_handler, - TelemetryObservable< - application_manager::AMTelemetryObserver>* app_manager, - TelemetryObservable<transport_manager::TMTelemetryObserver>* - transport_manager); + virtual void Init( + TelemetryObservable<protocol_handler::PHTelemetryObserver>* + protocol_handler, + TelemetryObservable<application_manager::AMTelemetryObserver>* + app_manager, + TelemetryObservable<transport_manager::TMTelemetryObserver>* + transport_manager); virtual void Stop(); virtual void Start(); virtual void SendMetric(std::shared_ptr<MetricWrapper> metric); diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h index d0bf4ba5bb..f79e27d2a0 100644 --- a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h +++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_observer.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_TRANSPORT_MANAGER_OBSERVER_H_ #include "transport_manager/telemetry_observer.h" -#include "utils/message_queue.h" #include "utils/date_time.h" +#include "utils/message_queue.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc index 006aac196f..90c5ffb87e 100644 --- a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc @@ -31,8 +31,8 @@ */ #include "telemetry_monitor/application_manager_metric_wrapper.h" -#include "telemetry_monitor/json_keys.h" #include "application_manager/smart_object_keys.h" +#include "telemetry_monitor/json_keys.h" #include "utils/convert_utils.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/application_manager_observer.cc b/src/components/telemetry_monitor/src/application_manager_observer.cc index 1e621c8a6e..1a18d87ad8 100644 --- a/src/components/telemetry_monitor/src/application_manager_observer.cc +++ b/src/components/telemetry_monitor/src/application_manager_observer.cc @@ -31,8 +31,8 @@ */ #include "telemetry_monitor/application_manager_observer.h" -#include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" +#include "telemetry_monitor/telemetry_monitor.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/metric_wrapper.cc b/src/components/telemetry_monitor/src/metric_wrapper.cc index 10b694c5e6..8b2ba6f220 100644 --- a/src/components/telemetry_monitor/src/metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/metric_wrapper.cc @@ -71,4 +71,4 @@ void MetricWrapper::Clear() { MetricWrapper::~MetricWrapper() { Clear(); } -} +} // namespace telemetry_monitor diff --git a/src/components/telemetry_monitor/src/protocol_handler_observer.cc b/src/components/telemetry_monitor/src/protocol_handler_observer.cc index 19b04da392..e696e58506 100644 --- a/src/components/telemetry_monitor/src/protocol_handler_observer.cc +++ b/src/components/telemetry_monitor/src/protocol_handler_observer.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/date_time.h" #include "telemetry_monitor/protocol_handler_observer.h" #include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "telemetry_monitor/telemetry_monitor.h" +#include "utils/date_time.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc index d62724a479..e2f45b7576 100644 --- a/src/components/telemetry_monitor/src/telemetry_monitor.cc +++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc @@ -32,12 +32,12 @@ #include "telemetry_monitor/telemetry_monitor.h" -#include <sys/socket.h> -#include <sys/types.h> +#include <arpa/inet.h> +#include <netinet/in.h> #include <sys/select.h> +#include <sys/socket.h> #include <sys/time.h> -#include <netinet/in.h> -#include <arpa/inet.h> +#include <sys/types.h> #include <unistd.h> #include "transport_manager/transport_manager_default.h" diff --git a/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc index 789da92eaf..3a89c9245a 100644 --- a/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc +++ b/src/components/telemetry_monitor/src/transport_manager_metric_wrapper.cc @@ -31,9 +31,9 @@ */ #include "telemetry_monitor/transport_manager_metric_wrapper.h" +#include "application_manager/smart_object_keys.h" #include "json/json.h" #include "telemetry_monitor/json_keys.h" -#include "application_manager/smart_object_keys.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc index 25817d6c73..15338eddff 100644 --- a/src/components/telemetry_monitor/src/transport_manager_observer.cc +++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc @@ -33,8 +33,8 @@ #include <time.h> -#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "telemetry_monitor/telemetry_monitor.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" namespace telemetry_monitor { diff --git a/src/components/telemetry_monitor/test/application_manager_metric_test.cc b/src/components/telemetry_monitor/test/application_manager_metric_test.cc index 2e6eaad9d8..4af5ba82b5 100644 --- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "application_manager/smart_object_keys.h" #include "gtest/gtest.h" +#include "telemetry_monitor/application_manager_metric_wrapper.h" #include "telemetry_monitor/json_keys.h" #include "utils/resource_usage.h" -#include "application_manager/smart_object_keys.h" -#include "telemetry_monitor/application_manager_metric_wrapper.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/application_manager_observer_test.cc b/src/components/telemetry_monitor/test/application_manager_observer_test.cc index deecfa57b7..daf3890485 100644 --- a/src/components/telemetry_monitor/test/application_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/application_manager_observer_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" -#include "telemetry_monitor/mock_telemetry_monitor.h" +#include "telemetry_monitor/application_manager_observer.h" #include "application_manager/telemetry_observer.h" +#include "gtest/gtest.h" #include "telemetry_monitor/application_manager_metric_wrapper.h" -#include "telemetry_monitor/application_manager_observer.h" +#include "telemetry_monitor/mock_telemetry_monitor.h" #include "telemetry_monitor/telemetry_monitor.h" diff --git a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h index c2aebe72b3..9b41d5a9ac 100644 --- a/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h +++ b/src/components/telemetry_monitor/test/include/telemetry_monitor/mock_telemetry_monitor.h @@ -35,8 +35,8 @@ #include <string> #include "gmock/gmock.h" -#include "telemetry_monitor/telemetry_monitor.h" #include "telemetry_monitor/metric_wrapper.h" +#include "telemetry_monitor/telemetry_monitor.h" namespace test { namespace components { @@ -51,7 +51,7 @@ class MockTelemetryMonitor : public telemetry_monitor::TelemetryMonitor { MOCK_METHOD1(SendMetric, void(std::shared_ptr<telemetry_monitor::MetricWrapper> metric)); }; -} // namespace transport_manager_test +} // namespace telemetry_monitor_test } // namespace components } // namespace test #endif // SRC_COMPONENTS_TELEMETRY_MONITOR_TEST_INCLUDE_TELEMETRY_MONITOR_MOCK_TELEMETRY_MONITOR_H_ diff --git a/src/components/telemetry_monitor/test/metric_wrapper_test.cc b/src/components/telemetry_monitor/test/metric_wrapper_test.cc index f1e3c77db4..5501877ec8 100644 --- a/src/components/telemetry_monitor/test/metric_wrapper_test.cc +++ b/src/components/telemetry_monitor/test/metric_wrapper_test.cc @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "telemetry_monitor/metric_wrapper.h" -#include "telemetry_monitor/json_keys.h" +#include "gtest/gtest.h" #include "json/json.h" +#include "telemetry_monitor/json_keys.h" #include "utils/resource_usage.h" namespace test { diff --git a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc index c9130411e7..8662321be3 100644 --- a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc +++ b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc @@ -31,11 +31,11 @@ */ #include "gtest/gtest.h" -#include "telemetry_monitor/json_keys.h" #include "json/json.h" -#include "utils/resource_usage.h" -#include "telemetry_monitor/protocol_handler_metric_wrapper.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/json_keys.h" +#include "telemetry_monitor/protocol_handler_metric_wrapper.h" +#include "utils/resource_usage.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc b/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc index 587bf21ce6..b74434da3c 100644 --- a/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc +++ b/src/components/telemetry_monitor/test/protocol_handler_observer_test.cc @@ -31,9 +31,9 @@ */ #include "gtest/gtest.h" -#include "telemetry_monitor/telemetry_monitor.h" -#include "telemetry_monitor/mock_telemetry_monitor.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/mock_telemetry_monitor.h" +#include "telemetry_monitor/telemetry_monitor.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc index b8d3f9063f..f7b74ac278 100644 --- a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc +++ b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc @@ -30,19 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "gtest/gtest.h" #include "telemetry_monitor/telemetry_monitor.h" -#include "protocol_handler/telemetry_observer.h" -#include "protocol_handler/protocol_handler.h" +#include "connection_handler/mock_connection_handler.h" +#include "gtest/gtest.h" #include "protocol_handler//mock_protocol_handler.h" -#include "protocol_handler/mock_session_observer.h" #include "protocol_handler/mock_protocol_handler_settings.h" -#include "connection_handler/mock_connection_handler.h" -#include "transport_manager/mock_transport_manager.h" +#include "protocol_handler/mock_session_observer.h" +#include "protocol_handler/protocol_handler.h" +#include "protocol_handler/telemetry_observer.h" #include "telemetry_monitor/mock_telemetry_observable.h" +#include "transport_manager/mock_transport_manager.h" -using testing::Return; using testing::_; +using testing::Return; namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc index 40caa6e0d6..3b3ac07577 100644 --- a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc @@ -31,11 +31,11 @@ */ #include "gtest/gtest.h" -#include "telemetry_monitor/json_keys.h" #include "json/json.h" -#include "utils/resource_usage.h" -#include "telemetry_monitor/transport_manager_metric_wrapper.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/json_keys.h" +#include "telemetry_monitor/transport_manager_metric_wrapper.h" +#include "utils/resource_usage.h" namespace test { namespace components { diff --git a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc index adc857d6cc..57834339d6 100644 --- a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc +++ b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc @@ -30,11 +30,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "telemetry_monitor/transport_manager_observer.h" #include "gtest/gtest.h" -#include "telemetry_monitor/mock_telemetry_monitor.h" #include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/mock_telemetry_monitor.h" #include "telemetry_monitor/transport_manager_metric_wrapper.h" -#include "telemetry_monitor/transport_manager_observer.h" namespace test { namespace components { |