Format all code in project

        Formated all code in appMain, components, plugins to correct coding-style
	Used clang-format-3.6

        Used 2 commands :
                find src/appMain/ -name "*.h" -o  -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
                find src/components/ -name "*.h" -o  -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file
		find src/plugins/ -name "*.h" -o  -name "*.cc" -o -name "*.hpp" -o -name "*.cpp" | xargs clang-format-3.6 -i -style=file

22 files changed, 222 insertions, 180 deletions

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 df568e7ebd..d35de52e3b 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
@@ -38,17 +38,15 @@
 #include "telemetry_monitor/metric_wrapper.h"
 #include "telemetry_monitor/application_manager_observer.h"
 
-
 namespace telemetry_monitor {
 
 class ApplicationManagerObserver;
 
-class ApplicationManagerMetricWrapper: public MetricWrapper {
-
-  public:
-    utils::SharedPtr<application_manager::AMTelemetryObserver::MessageMetric> message_metric;
-    virtual Json::Value GetJsonMetric();
+class ApplicationManagerMetricWrapper : public MetricWrapper {
+ public:
+  utils::SharedPtr<application_manager::AMTelemetryObserver::MessageMetric>
+      message_metric;
+  virtual Json::Value GetJsonMetric();
 };
-
 }
 #endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_APPLICATION_MANAGER_MECTRIC_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 4f509075b4..ecb9c8002a 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
@@ -37,19 +37,18 @@
 #include "application_manager/telemetry_observer.h"
 #include "telemetry_monitor/application_manager_metric_wrapper.h"
 
-
 namespace telemetry_monitor {
 
 class TelemetryMonitor;
 
-class ApplicationManagerObserver: public application_manager::AMTelemetryObserver {
-   public:
-    explicit ApplicationManagerObserver(TelemetryMonitor* telemetry_monitor);
-   virtual void OnMessage(utils::SharedPtr<MessageMetric> metric);
+class ApplicationManagerObserver
+    : public application_manager::AMTelemetryObserver {
+ public:
+  explicit ApplicationManagerObserver(TelemetryMonitor* telemetry_monitor);
+  virtual void OnMessage(utils::SharedPtr<MessageMetric> metric);
 
-  private:
-    TelemetryMonitor* telemetry_monitor_;
+ private:
+  TelemetryMonitor* 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 f5aba07721..899c76b2e8 100644
--- a/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/json_keys.h
@@ -35,18 +35,18 @@
 #define SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_JSON_KEYS_H_
 
 namespace telemetry_monitor {
-  namespace strings {
-    const char logger[] = "logger";
-    const char begin[] = "begin";
-    const char end[] = "end";
-    const char data_size[] = "data_size";
-    const char message_id[] = "message_id";
-    const char session_id[] = "session_id";
-    const char correlation_id[] = "correlation_id";
-    const char connection_key[] = "connection_key";
-    const char stime[] = "stime";
-    const char utime[] = "utime";
-    const char memory[] = "RAM";
-  }
+namespace strings {
+const char logger[] = "logger";
+const char begin[] = "begin";
+const char end[] = "end";
+const char data_size[] = "data_size";
+const char message_id[] = "message_id";
+const char session_id[] = "session_id";
+const char correlation_id[] = "correlation_id";
+const char connection_key[] = "connection_key";
+const char stime[] = "stime";
+const char utime[] = "utime";
+const char memory[] = "RAM";
+}
 }
 #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 994065e0e3..b4d7ed12cb 100644
--- a/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/metric_wrapper.h
@@ -41,19 +41,20 @@ namespace telemetry_monitor {
 
 class MetricWrapper {
   utils::ResourseUsage* resources;
-  public:
-    MetricWrapper();
-    /*
-     * @brief get current cpu and memory info and store it as member
-     */
-    bool grabResources();
-    virtual std::string GetStyledString();
-    virtual Json::Value GetJsonMetric();
-    virtual ~MetricWrapper();
-  protected:
-    void Clear();
-};
 
+ public:
+  MetricWrapper();
+  /*
+   * @brief get current cpu and memory info and store it as member
+   */
+  bool grabResources();
+  virtual std::string GetStyledString();
+  virtual Json::Value GetJsonMetric();
+  virtual ~MetricWrapper();
+
+ protected:
+  void Clear();
+};
 
 }  // namespace telemetry_monitor
 #endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_MECTRIC_WRAPPER_H_
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 b3485e6942..bc4e4c8e53 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
@@ -40,11 +40,11 @@
 
 namespace telemetry_monitor {
 
-class ProtocolHandlerMecticWrapper: public MetricWrapper {
-
-  public:
-    utils::SharedPtr<protocol_handler::PHTelemetryObserver::MessageMetric> message_metric;
-    virtual Json::Value GetJsonMetric();
+class ProtocolHandlerMecticWrapper : public MetricWrapper {
+ public:
+  utils::SharedPtr<protocol_handler::PHTelemetryObserver::MessageMetric>
+      message_metric;
+  virtual Json::Value GetJsonMetric();
 };
 }  // namespace telemetry_monitor
 #endif  // SRC_COMPONENTS_TELEMETRY_MONITOR_INCLUDE_TELEMETRY_MONITOR_PROTOCOL_HANDLER_MECTRIC_WRAPPER_H_
diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_observer.h b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_observer.h
index c9f6a7f07f..69e5658382 100644
--- a/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_observer.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/protocol_handler_observer.h
@@ -40,11 +40,12 @@ namespace telemetry_monitor {
 
 class TelemetryMonitor;
 
-class ProtocolHandlerObserver: public protocol_handler::PHTelemetryObserver {
+class ProtocolHandlerObserver : public protocol_handler::PHTelemetryObserver {
  public:
   explicit ProtocolHandlerObserver(TelemetryMonitor* telemetry_monitor);
 
-  virtual void StartMessageProcess(uint32_t message_id, const TimevalStruct& start_time);
+  virtual void StartMessageProcess(uint32_t message_id,
+                                   const TimevalStruct& start_time);
 
   virtual void EndMessageProcess(utils::SharedPtr<MessageMetric> m);
 
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 316f687b46..49895de8d3 100644
--- a/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/telemetry_monitor.h
@@ -60,11 +60,12 @@ class Streamer : public threads::ThreadDelegate {
 
   virtual void PushMessage(utils::SharedPtr<MetricWrapper> metric);
   volatile bool is_client_connected_;
+
  private:
   void Start();
   void Stop();
   bool IsReady() const;
-  bool Send(const std::string &msg);
+  bool Send(const std::string& msg);
   void ShutDownAndCloseSocket(int32_t socket_fd);
   TelemetryMonitor* const kserver_;
   int32_t server_socket_fd_;
@@ -78,10 +79,12 @@ 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(utils::SharedPtr<MetricWrapper> metric);
diff --git a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric_wrapper.h b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric_wrapper.h
index 8057402f11..9cb158fa98 100644
--- a/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric_wrapper.h
+++ b/src/components/telemetry_monitor/include/telemetry_monitor/transport_manager_metric_wrapper.h
@@ -39,9 +39,10 @@
 
 namespace telemetry_monitor {
 
-class TransportManagerMecticWrapper: public MetricWrapper {
+class TransportManagerMecticWrapper : public MetricWrapper {
  public:
-  utils::SharedPtr<transport_manager::TMTelemetryObserver::MessageMetric> message_metric;
+  utils::SharedPtr<transport_manager::TMTelemetryObserver::MessageMetric>
+      message_metric;
   virtual Json::Value GetJsonMetric();
 };
 }  // namespace telemetry_monitor
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 9390ecd209..bff5834586 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
@@ -41,11 +41,12 @@ namespace telemetry_monitor {
 
 class TelemetryMonitor;
 
-class TransportManagerObserver: public transport_manager::TMTelemetryObserver {
+class TransportManagerObserver : public transport_manager::TMTelemetryObserver {
  public:
   explicit TransportManagerObserver(TelemetryMonitor* telemetry_monitor);
   virtual void StartRawMsg(const protocol_handler::RawMessage* ptr);
   virtual void StopRawMsg(const protocol_handler::RawMessage* ptr);
+
  private:
   TelemetryMonitor* telemetry_monitor_;
   std::map<const protocol_handler::RawMessage*, TimevalStruct> time_starts;
diff --git a/src/components/telemetry_monitor/src/application_manager_observer.cc b/src/components/telemetry_monitor/src/application_manager_observer.cc
index e3de439b96..cb390eddeb 100644
--- a/src/components/telemetry_monitor/src/application_manager_observer.cc
+++ b/src/components/telemetry_monitor/src/application_manager_observer.cc
@@ -36,11 +36,12 @@
 
 namespace telemetry_monitor {
 
-ApplicationManagerObserver::ApplicationManagerObserver(TelemetryMonitor* telemetry_monitor):
-  telemetry_monitor_(telemetry_monitor) {
-}
+ApplicationManagerObserver::ApplicationManagerObserver(
+    TelemetryMonitor* telemetry_monitor)
+    : telemetry_monitor_(telemetry_monitor) {}
 
-void ApplicationManagerObserver::OnMessage(utils::SharedPtr<MessageMetric> metric) {
+void ApplicationManagerObserver::OnMessage(
+    utils::SharedPtr<MessageMetric> metric) {
   ApplicationManagerMetricWrapper* m = new ApplicationManagerMetricWrapper();
   m->message_metric = metric;
   m->grabResources();
diff --git a/src/components/telemetry_monitor/src/metric_wrapper.cc b/src/components/telemetry_monitor/src/metric_wrapper.cc
index 2803921501..937a705ef7 100644
--- a/src/components/telemetry_monitor/src/metric_wrapper.cc
+++ b/src/components/telemetry_monitor/src/metric_wrapper.cc
@@ -35,9 +35,7 @@
 
 namespace telemetry_monitor {
 
-  MetricWrapper::MetricWrapper():
-    resources(NULL) {
-  }
+MetricWrapper::MetricWrapper() : resources(NULL) {}
 
 bool MetricWrapper::grabResources() {
   Clear();
@@ -74,5 +72,4 @@ void MetricWrapper::Clear() {
 MetricWrapper::~MetricWrapper() {
   Clear();
 }
-
 }
diff --git a/src/components/telemetry_monitor/src/protocol_handler_observer.cc b/src/components/telemetry_monitor/src/protocol_handler_observer.cc
index 69f4564fc1..2244cb2259 100644
--- a/src/components/telemetry_monitor/src/protocol_handler_observer.cc
+++ b/src/components/telemetry_monitor/src/protocol_handler_observer.cc
@@ -39,26 +39,29 @@ namespace telemetry_monitor {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "TelemetryMonitor")
 
-ProtocolHandlerObserver::ProtocolHandlerObserver(TelemetryMonitor *telemetry_monitor):
-  telemetry_monitor_(telemetry_monitor) {
-}
+ProtocolHandlerObserver::ProtocolHandlerObserver(
+    TelemetryMonitor* telemetry_monitor)
+    : telemetry_monitor_(telemetry_monitor) {}
 
-void ProtocolHandlerObserver::StartMessageProcess(uint32_t message_id,
-                                                  const TimevalStruct &start_time) {
+void ProtocolHandlerObserver::StartMessageProcess(
+    uint32_t message_id, const TimevalStruct& start_time) {
   if (message_id == 0) {
     return;
   }
   if (time_starts.find(message_id) != time_starts.end()) {
-    LOG4CXX_DEBUG(logger_, "Already waiting for stop processing for Message ID: "
-                  << message_id);
+    LOG4CXX_DEBUG(
+        logger_,
+        "Already waiting for stop processing for Message ID: " << message_id);
     return;
   }
   time_starts[message_id] = start_time;
 }
 
-void ProtocolHandlerObserver::EndMessageProcess(utils::SharedPtr<MessageMetric> m) {
+void ProtocolHandlerObserver::EndMessageProcess(
+    utils::SharedPtr<MessageMetric> m) {
   uint32_t message_id = m->message_id;
-  std::map<uint32_t, TimevalStruct>::const_iterator it = time_starts.find(message_id);
+  std::map<uint32_t, TimevalStruct>::const_iterator it =
+      time_starts.find(message_id);
   if (it == time_starts.end()) {
     LOG4CXX_WARN(logger_, "Cant find start time for message" << message_id);
     return;
diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc
index 7a697cb309..759b843961 100644
--- a/src/components/telemetry_monitor/src/telemetry_monitor.cc
+++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc
@@ -49,20 +49,18 @@ namespace telemetry_monitor {
 CREATE_LOGGERPTR_GLOBAL(logger_, "TelemetryMonitor")
 
 TelemetryMonitor::TelemetryMonitor(const std::string& server_address,
-                                   uint16_t port):
-  server_address_(server_address),
-  port_(port),
-  thread_(NULL),
-  streamer_(NULL),
-  app_observer(this),
-  tm_observer(this),
-  ph_observer(this) {
-
-}
+                                   uint16_t port)
+    : server_address_(server_address)
+    , port_(port)
+    , thread_(NULL)
+    , streamer_(NULL)
+    , app_observer(this)
+    , tm_observer(this)
+    , ph_observer(this) {}
 
 void TelemetryMonitor::Start() {
   streamer_ = new Streamer(this);
-  thread_ = threads::CreateThread("TelemetryMonitor", streamer_ );
+  thread_ = threads::CreateThread("TelemetryMonitor", streamer_);
 }
 
 void TelemetryMonitor::set_streamer(Streamer* streamer) {
@@ -78,7 +76,7 @@ void TelemetryMonitor::set_streamer(Streamer* streamer) {
   }
 }
 
-const std::string& TelemetryMonitor::ip() const  {
+const std::string& TelemetryMonitor::ip() const {
   return server_address_;
 }
 
@@ -93,8 +91,7 @@ TelemetryMonitor::~TelemetryMonitor() {
 void TelemetryMonitor::Init(
     TelemetryObservable<protocol_handler::PHTelemetryObserver>*
         protocol_handler,
-    TelemetryObservable<application_manager::AMTelemetryObserver>*
-        app_manager,
+    TelemetryObservable<application_manager::AMTelemetryObserver>* app_manager,
     TelemetryObservable<transport_manager::TMTelemetryObserver>*
         transport_manager) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -119,18 +116,17 @@ void TelemetryMonitor::Stop() {
 }
 
 void TelemetryMonitor::SendMetric(utils::SharedPtr<MetricWrapper> metric) {
-  if ((NULL != streamer_ )&& streamer_->is_client_connected_) {
+  if ((NULL != streamer_) && streamer_->is_client_connected_) {
     streamer_->PushMessage(metric);
   }
 }
 
 Streamer::Streamer(TelemetryMonitor* const server)
-  : is_client_connected_(false),
-    kserver_(server),
-    server_socket_fd_(0),
-    client_socket_fd_(0),
-    stop_flag_(false) {
-}
+    : is_client_connected_(false)
+    , kserver_(server)
+    , server_socket_fd_(0)
+    , client_socket_fd_(0)
+    , stop_flag_(false) {}
 
 Streamer::~Streamer() {
   Stop();
@@ -188,13 +184,16 @@ void Streamer::Start() {
   }
 
   int32_t optval = 1;
-  if (-1 == setsockopt(server_socket_fd_, SOL_SOCKET, SO_REUSEADDR,
-                       &optval, sizeof optval)) {
+  if (-1 == setsockopt(server_socket_fd_,
+                       SOL_SOCKET,
+                       SO_REUSEADDR,
+                       &optval,
+                       sizeof optval)) {
     LOG4CXX_ERROR(logger_, "Unable to set sockopt");
     return;
   }
 
-  sockaddr_in serv_addr_ = { 0 };
+  sockaddr_in serv_addr_ = {0};
   serv_addr_.sin_addr.s_addr = inet_addr(kserver_->ip().c_str());
   serv_addr_.sin_family = AF_INET;
   serv_addr_.sin_port = htons(kserver_->port());
@@ -202,19 +201,20 @@ void Streamer::Start() {
   if (-1 == bind(server_socket_fd_,
                  reinterpret_cast<struct sockaddr*>(&serv_addr_),
                  sizeof(serv_addr_))) {
-    LOG4CXX_ERROR(logger_, "Unable to bind server "
-                  << kserver_->ip().c_str() << ':' << kserver_->port());
+    LOG4CXX_ERROR(logger_,
+                  "Unable to bind server " << kserver_->ip().c_str() << ':'
+                                           << kserver_->port());
     return;
   }
   if (-1 == listen(server_socket_fd_, 1)) {
-    LOG4CXX_ERROR(logger_, "Streamer listen error " << strerror(errno) );
+    LOG4CXX_ERROR(logger_, "Streamer listen error " << strerror(errno));
     return;
   }
 }
 
 void Streamer::ShutDownAndCloseSocket(int32_t socket_fd) {
   LOG4CXX_AUTO_TRACE(logger_);
-  if (0 < socket_fd){
+  if (0 < socket_fd) {
     LOG4CXX_INFO(logger_, "Shutdown socket");
     if (-1 == ::shutdown(socket_fd, SHUT_RDWR)) {
       LOG4CXX_ERROR(logger_, "Unable to shutdown socket");
@@ -251,7 +251,7 @@ bool Streamer::IsReady() const {
   FD_ZERO(&fds);
   FD_SET(client_socket_fd_, &fds);
   TimevalStruct tv = {0, 0};
-  tv.tv_sec = 5;                       // set a 5 second timeout
+  tv.tv_sec = 5;  // set a 5 second timeout
   tv.tv_usec = 0;
 
   const int retval = select(client_socket_fd_ + 1, 0, &fds, 0, &tv);
@@ -274,8 +274,7 @@ bool Streamer::Send(const std::string& msg) {
     return false;
   }
 
-  if (-1 == ::send(client_socket_fd_, msg.c_str(),
-                   msg.size(), MSG_NOSIGNAL)) {
+  if (-1 == ::send(client_socket_fd_, msg.c_str(), msg.size(), MSG_NOSIGNAL)) {
     LOG4CXX_ERROR(logger_, " Unable to send");
     return false;
   }
diff --git a/src/components/telemetry_monitor/src/transport_manager_observer.cc b/src/components/telemetry_monitor/src/transport_manager_observer.cc
index 36f0e3c75a..b3e57ac22a 100644
--- a/src/components/telemetry_monitor/src/transport_manager_observer.cc
+++ b/src/components/telemetry_monitor/src/transport_manager_observer.cc
@@ -38,26 +38,30 @@
 
 namespace telemetry_monitor {
 
-TransportManagerObserver::TransportManagerObserver(TelemetryMonitor* telemetry_monitor):
-  telemetry_monitor_ (telemetry_monitor) {
-}
+TransportManagerObserver::TransportManagerObserver(
+    TelemetryMonitor* telemetry_monitor)
+    : telemetry_monitor_(telemetry_monitor) {}
 
-void TransportManagerObserver::StartRawMsg(const protocol_handler::RawMessage* ptr) {
+void TransportManagerObserver::StartRawMsg(
+    const protocol_handler::RawMessage* ptr) {
   time_starts[ptr] = date_time::DateTime::getCurrentTime();
 }
 
-void TransportManagerObserver::StopRawMsg(const protocol_handler::RawMessage* ptr) {
-    std::map<const protocol_handler::RawMessage*, TimevalStruct>::const_iterator it;
-    it = time_starts.find(ptr);
-    if (it != time_starts.end()) {
-      TransportManagerMecticWrapper* m = new TransportManagerMecticWrapper();
-      m->message_metric = new transport_manager::TMTelemetryObserver::MessageMetric();
-      m->message_metric->begin = it->second;
-      m->message_metric->end = date_time::DateTime::getCurrentTime();
-      m->message_metric->data_size = ptr->data_size();
-      m->grabResources();
-      telemetry_monitor_->SendMetric(m);
-    }
+void TransportManagerObserver::StopRawMsg(
+    const protocol_handler::RawMessage* ptr) {
+  std::map<const protocol_handler::RawMessage*, TimevalStruct>::const_iterator
+      it;
+  it = time_starts.find(ptr);
+  if (it != time_starts.end()) {
+    TransportManagerMecticWrapper* m = new TransportManagerMecticWrapper();
+    m->message_metric =
+        new transport_manager::TMTelemetryObserver::MessageMetric();
+    m->message_metric->begin = it->second;
+    m->message_metric->end = date_time::DateTime::getCurrentTime();
+    m->message_metric->data_size = ptr->data_size();
+    m->grabResources();
+    telemetry_monitor_->SendMetric(m);
+  }
 }
 
-} //namespace telemetry_monitor
+}  // 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 08cac32c65..5d97ac3528 100644
--- a/src/components/telemetry_monitor/test/application_manager_metric_test.cc
+++ b/src/components/telemetry_monitor/test/application_manager_metric_test.cc
@@ -57,23 +57,32 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new application_manager::AMTelemetryObserver::MessageMetric();
+  metric_test.message_metric =
+      new application_manager::AMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   NsSmartDeviceLink::NsSmartObjects::SmartObject obj;
   obj["params"][application_manager::strings::correlation_id] = 11;
   obj["params"][application_manager::strings::connection_key] = 12;
-  metric_test.message_metric->message = new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
+  metric_test.message_metric->message =
+      new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
   Json::Value jvalue = metric_test.GetJsonMetric();
 
-  EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::stime].toStyledString());
-  EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::utime].toStyledString());
-  EXPECT_EQ("null\n", jvalue[telemetry_monitor::strings::memory].toStyledString());
-
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[telemetry_monitor::strings::correlation_id].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[telemetry_monitor::strings::connection_key].asInt());
+  EXPECT_EQ("null\n",
+            jvalue[telemetry_monitor::strings::stime].toStyledString());
+  EXPECT_EQ("null\n",
+            jvalue[telemetry_monitor::strings::utime].toStyledString());
+  EXPECT_EQ("null\n",
+            jvalue[telemetry_monitor::strings::memory].toStyledString());
+
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[telemetry_monitor::strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[telemetry_monitor::strings::end].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(),
+            jvalue[telemetry_monitor::strings::correlation_id].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(),
+            jvalue[telemetry_monitor::strings::connection_key].asInt());
 }
 
 TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) {
@@ -89,26 +98,37 @@ TEST(ApplicationManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
 
-  metric_test.message_metric = new application_manager::AMTelemetryObserver::MessageMetric();
+  metric_test.message_metric =
+      new application_manager::AMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   NsSmartDeviceLink::NsSmartObjects::SmartObject obj;
   obj["params"][application_manager::strings::correlation_id] = 11;
   obj["params"][application_manager::strings::connection_key] = 12;
-  metric_test.message_metric->message = new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
+  metric_test.message_metric->message =
+      new NsSmartDeviceLink::NsSmartObjects::SmartObject(obj);
   Json::Value jvalue = metric_test.GetJsonMetric();
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(), jvalue[telemetry_monitor::strings::correlation_id].asInt64());
-  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(), jvalue[telemetry_monitor::strings::connection_key].asInt());
-
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[telemetry_monitor::strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[telemetry_monitor::strings::end].asInt64());
-
-  EXPECT_NEAR(resources->stime, jvalue[telemetry_monitor::strings::stime].asInt(),1);
-  EXPECT_NEAR(resources->utime, jvalue[telemetry_monitor::strings::utime].asInt(),1);
-  EXPECT_EQ(resources->memory, jvalue[telemetry_monitor::strings::memory].asInt());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[telemetry_monitor::strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[telemetry_monitor::strings::end].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::correlation_id].asInt(),
+            jvalue[telemetry_monitor::strings::correlation_id].asInt64());
+  EXPECT_EQ(obj["params"][application_manager::strings::connection_key].asInt(),
+            jvalue[telemetry_monitor::strings::connection_key].asInt());
+
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[telemetry_monitor::strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[telemetry_monitor::strings::end].asInt64());
+
+  EXPECT_NEAR(
+      resources->stime, jvalue[telemetry_monitor::strings::stime].asInt(), 1);
+  EXPECT_NEAR(
+      resources->utime, jvalue[telemetry_monitor::strings::utime].asInt(), 1);
+  EXPECT_EQ(resources->memory,
+            jvalue[telemetry_monitor::strings::memory].asInt());
 
   delete resources;
 }
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 4925544d09..09ef04a2d8 100644
--- a/src/components/telemetry_monitor/test/application_manager_observer_test.cc
+++ b/src/components/telemetry_monitor/test/application_manager_observer_test.cc
@@ -49,7 +49,8 @@ TEST(ApplicationManagerObserver, CallOnMessage) {
   MockTelemetryMonitor mock_telemetry_monitor;
   ApplicationManagerObserver app_observer(&mock_telemetry_monitor);
   typedef application_manager::AMTelemetryObserver::MessageMetric AMMetric;
-  utils::SharedPtr<AMMetric> ptr = application_manager::AMTelemetryObserver::MessageMetricSharedPtr();
+  utils::SharedPtr<AMMetric> ptr =
+      application_manager::AMTelemetryObserver::MessageMetricSharedPtr();
   EXPECT_CALL(mock_telemetry_monitor, SendMetric(_));
   app_observer.OnMessage(ptr);
 }
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 2d849a634c..0ef5a530fd 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
@@ -43,9 +43,9 @@ namespace test {
 namespace components {
 namespace telemetry_monitor_test {
 
-class MockTelemetryMonitor: public telemetry_monitor::TelemetryMonitor {
+class MockTelemetryMonitor : public telemetry_monitor::TelemetryMonitor {
  public:
-  MockTelemetryMonitor():telemetry_monitor::TelemetryMonitor("",0u){}
+  MockTelemetryMonitor() : telemetry_monitor::TelemetryMonitor("", 0u) {}
   MOCK_METHOD1(Init, void(protocol_handler::ProtocolHandlerImpl* ph));
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD0(Start, void());
diff --git a/src/components/telemetry_monitor/test/metric_wrapper_test.cc b/src/components/telemetry_monitor/test/metric_wrapper_test.cc
index 08b9747742..91361f3df2 100644
--- a/src/components/telemetry_monitor/test/metric_wrapper_test.cc
+++ b/src/components/telemetry_monitor/test/metric_wrapper_test.cc
@@ -70,8 +70,8 @@ TEST(MetricWrapper, GetJsonMetricWithGrabResources) {
   EXPECT_NE("null/n", jvalue[strings::utime].toStyledString());
   EXPECT_NE("null/n", jvalue[strings::memory].toStyledString());
 
-  EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(),1);
-  EXPECT_NEAR(resources->utime, jvalue[strings::utime].asInt(),1);
+  EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(), 1);
+  EXPECT_NEAR(resources->utime, jvalue[strings::utime].asInt(), 1);
   EXPECT_EQ(resources->memory, jvalue[strings::memory].asInt());
 
   delete resources;
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 b8114f5511..e41aeb6edd 100644
--- a/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc
+++ b/src/components/telemetry_monitor/test/protocol_handler_metric_test.cc
@@ -58,7 +58,8 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new protocol_handler::PHTelemetryObserver::MessageMetric();
+  metric_test.message_metric =
+      new protocol_handler::PHTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   metric_test.message_metric->message_id = 5;
@@ -70,8 +71,10 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetric) {
   EXPECT_EQ("null\n", jvalue[strings::utime].toStyledString());
   EXPECT_EQ("null\n", jvalue[strings::memory].toStyledString());
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[strings::end].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[strings::end].asInt64());
   EXPECT_EQ(5, jvalue[strings::message_id].asInt64());
   EXPECT_EQ(2, jvalue[strings::connection_key].asInt());
 }
@@ -89,7 +92,8 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetricWithGrabResources) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new protocol_handler::PHTelemetryObserver::MessageMetric();
+  metric_test.message_metric =
+      new protocol_handler::PHTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   metric_test.message_metric->message_id = 5;
@@ -103,13 +107,15 @@ TEST(ProtocolHandlerMetricTest, GetJsonMetricWithGrabResources) {
   EXPECT_NE("null/n", jvalue[strings::utime].toStyledString());
   EXPECT_NE("null/n", jvalue[strings::memory].toStyledString());
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[strings::end].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[strings::end].asInt64());
   EXPECT_EQ(5, jvalue[strings::message_id].asInt64());
   EXPECT_EQ(2, jvalue[strings::connection_key].asInt());
 
-  EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(),1);
-  EXPECT_NEAR(resources->utime, jvalue[strings::utime].asInt(),1);
+  EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(), 1);
+  EXPECT_NEAR(resources->utime, jvalue[strings::utime].asInt(), 1);
   EXPECT_EQ(resources->memory, jvalue[strings::memory].asInt());
   delete resources;
 }
diff --git a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc
index 8c95f75f0c..8c48a51304 100644
--- a/src/components/telemetry_monitor/test/telemetry_monitor_test.cc
+++ b/src/components/telemetry_monitor/test/telemetry_monitor_test.cc
@@ -41,7 +41,6 @@
 #include "transport_manager/mock_transport_manager.h"
 #include "telemetry_monitor/mock_telemetry_observable.h"
 
-
 using testing::Return;
 using testing::_;
 
@@ -53,11 +52,10 @@ using namespace telemetry_monitor;
 
 class StreamerMock : public Streamer {
  public:
-  StreamerMock(TelemetryMonitor* const server)
-      : Streamer(server) {
+  StreamerMock(TelemetryMonitor* const server) : Streamer(server) {
     is_client_connected_ = true;
   }
-  MOCK_METHOD1(PushMessage,void(utils::SharedPtr<MetricWrapper> metric));
+  MOCK_METHOD1(PushMessage, void(utils::SharedPtr<MetricWrapper> metric));
 };
 
 TEST(TelemetryMonitorTest, MessageProcess) {
@@ -65,14 +63,14 @@ TEST(TelemetryMonitorTest, MessageProcess) {
   const uint16_t port = 12345;
   MockTelemetryObservable am_observeble;
 
-   transport_manager_test::MockTransportManager transport_manager_mock;
-   testing::NiceMock<connection_handler_test::MockConnectionHandler>
-       connection_handler_mock;
+  transport_manager_test::MockTransportManager transport_manager_mock;
+  testing::NiceMock<connection_handler_test::MockConnectionHandler>
+      connection_handler_mock;
   testing::NiceMock<
       ::test::components::protocol_handler_test::MockProtocolHandlerSettings>
-       protocol_handler_settings_mock;
-   ::test::components::protocol_handler_test::MockSessionObserver
-       session_observer_mock;
+      protocol_handler_settings_mock;
+  ::test::components::protocol_handler_test::MockSessionObserver
+      session_observer_mock;
 
   const size_t init_value = 1000u;
   ON_CALL(protocol_handler_settings_mock, maximum_payload_size())
@@ -83,9 +81,11 @@ TEST(TelemetryMonitorTest, MessageProcess) {
       .WillByDefault(Return(init_value));
   ON_CALL(protocol_handler_settings_mock, multiframe_waiting_timeout())
       .WillByDefault(Return(init_value));
-   protocol_handler::ProtocolHandlerImpl protocol_handler_mock(
-      protocol_handler_settings_mock, session_observer_mock,
-      connection_handler_mock, transport_manager_mock);
+  protocol_handler::ProtocolHandlerImpl protocol_handler_mock(
+      protocol_handler_settings_mock,
+      session_observer_mock,
+      connection_handler_mock,
+      transport_manager_mock);
 
   EXPECT_CALL(am_observeble, SetTelemetryObserver(_));
   EXPECT_CALL(transport_manager_mock, SetTelemetryObserver(_));
@@ -94,8 +94,8 @@ TEST(TelemetryMonitorTest, MessageProcess) {
   telemetry_monitor.Start();
 
   telemetry_monitor.set_streamer(&streamer_mock);
-  telemetry_monitor.Init(&protocol_handler_mock, &am_observeble,
-                           &transport_manager_mock);
+  telemetry_monitor.Init(
+      &protocol_handler_mock, &am_observeble, &transport_manager_mock);
   utils::SharedPtr<telemetry_monitor::MetricWrapper> test_metric;
   EXPECT_CALL(streamer_mock, PushMessage(test_metric));
   telemetry_monitor.SendMetric(test_metric);
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 1219a9b1ab..9e485ce4f1 100644
--- a/src/components/telemetry_monitor/test/transport_manager_metric_test.cc
+++ b/src/components/telemetry_monitor/test/transport_manager_metric_test.cc
@@ -58,7 +58,8 @@ TEST(TransportManagerMetricWrapper, GetJsonMetric) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new transport_manager::TMTelemetryObserver::MessageMetric();
+  metric_test.message_metric =
+      new transport_manager::TMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
   metric_test.message_metric->data_size = 1000;
@@ -68,8 +69,10 @@ TEST(TransportManagerMetricWrapper, GetJsonMetric) {
   EXPECT_EQ("null\n", jvalue[strings::utime].toStyledString());
   EXPECT_EQ("null\n", jvalue[strings::memory].toStyledString());
 
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[strings::end].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[strings::end].asInt64());
   EXPECT_EQ(1000, jvalue[strings::data_size].asInt());
 }
 
@@ -86,7 +89,8 @@ TEST(TransportManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   TimevalStruct end_time;
   end_time.tv_sec = 10;
   end_time.tv_usec = 0;
-  metric_test.message_metric = new transport_manager::TMTelemetryObserver::MessageMetric();
+  metric_test.message_metric =
+      new transport_manager::TMTelemetryObserver::MessageMetric();
   metric_test.message_metric->begin = start_time;
   metric_test.message_metric->end = end_time;
 
@@ -94,12 +98,14 @@ TEST(TransportManagerMetricWrapper, GetJsonMetricWithGrabResources) {
   Json::Value jvalue = metric_test.GetJsonMetric();
 
   EXPECT_EQ("\"TransportManager\"\n", jvalue[strings::logger].toStyledString());
-  EXPECT_EQ(date_time::DateTime::getuSecs(start_time), jvalue[strings::begin].asInt64());
-  EXPECT_EQ(date_time::DateTime::getuSecs(end_time), jvalue[strings::end].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(start_time),
+            jvalue[strings::begin].asInt64());
+  EXPECT_EQ(date_time::DateTime::getuSecs(end_time),
+            jvalue[strings::end].asInt64());
   EXPECT_EQ(1000, jvalue[strings::data_size].asInt());
 
-  EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(),1);
-  EXPECT_NEAR(resources->utime, jvalue[strings::utime].asInt(),1);
+  EXPECT_NEAR(resources->stime, jvalue[strings::stime].asInt(), 1);
+  EXPECT_NEAR(resources->utime, jvalue[strings::utime].asInt(), 1);
   EXPECT_EQ(resources->memory, jvalue[strings::memory].asInt());
 
   delete resources;
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 71de55e47a..866ff25863 100644
--- a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
+++ b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
@@ -46,7 +46,8 @@ using ::testing::_;
 TEST(TransportManagerObserverTest, MessageProcess) {
   MockTelemetryMonitor mock_telemetry_monitor;
   TransportManagerObserver tr_observer(&mock_telemetry_monitor);
-  protocol_handler::RawMessage* ptr = new ::protocol_handler::RawMessage(0, 0, NULL, 0);
+  protocol_handler::RawMessage* ptr =
+      new ::protocol_handler::RawMessage(0, 0, NULL, 0);
   tr_observer.StartRawMsg(ptr);
   EXPECT_CALL(mock_telemetry_monitor, SendMetric(_));
   tr_observer.StopRawMsg(ptr);