intercept: use protobuf types from google

Author: rizsotto

source/intercept/proto/intercept.proto

@@ -21,6 +21,8 @@ syntax = "proto3";
 
 package rpc;
 
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/empty.proto";
 import "supervise.proto";
 
 // Represents the remote sink of supervised process events.
@@ -31,7 +33,7 @@ import "supervise.proto";
 service Interceptor {
 
     // Register a process related events.
-    rpc Register (Event) returns (Empty) {}
+    rpc Register (Event) returns (google.protobuf.Empty) {}
 }
 
 // Represent a relevant life cycle event of a process.
@@ -47,7 +49,7 @@ message Event {
 
     // Required.
     // (ISO-8601 date-tie format with microsecond precision in UTC timezone)
-    string timestamp = 2;
+    google.protobuf.Timestamp timestamp = 2;
 
     reserved 3 to 10;
 
@@ -84,5 +86,3 @@ message Event {
         int32 number = 1;
     }
 }
-
-message Empty {}

source/intercept/source/collect/RpcServices.cc

@@ -46,7 +46,7 @@ namespace ic {
             , reporter_(reporter)
     { }
 
-    grpc::Status InterceptorImpl::Register(grpc::ServerContext*, const rpc::Event* request, rpc::Empty*)
+    grpc::Status InterceptorImpl::Register(grpc::ServerContext*, const rpc::Event* request, google::protobuf::Empty*)
     {
         reporter_.report(*request);
         return ::grpc::Status::OK;

source/intercept/source/collect/RpcServices.h

@@ -46,7 +46,7 @@ namespace ic {
         explicit InterceptorImpl(Reporter&);
         ~InterceptorImpl() override = default;
 
-        ::grpc::Status Register(::grpc::ServerContext* context, const rpc::Event* request, rpc::Empty* response) override;
+        ::grpc::Status Register(::grpc::ServerContext* context, const rpc::Event* request, google::protobuf::Empty* response) override;
 
         NON_DEFAULT_CONSTRUCTABLE(InterceptorImpl);
         NON_COPYABLE_NOR_MOVABLE(InterceptorImpl);

source/intercept/source/report/wrapper/EventFactory.cc

@@ -20,13 +20,11 @@
 #include "report/wrapper/EventFactory.h"
 #include "Convert.h"
 
-#include <fmt/chrono.h>
-#include <fmt/format.h>
+#include <google/protobuf/util/time_util.h>
 
-#include <chrono>
 #include <random>
-#include <cstdint>
-#include <string>
+
+using namespace google::protobuf::util;
 
 namespace {
 
@@ -37,15 +35,6 @@ namespace {
 
         return distribution(generator);
     }
-
-    std::string now_as_string() {
-        const auto now = std::chrono::system_clock::now();
-        auto micros = std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch());
-
-        return fmt::format("{:%Y-%m-%dT%H:%M:%S}.{:06d}Z",
-                           fmt::localtime(std::chrono::system_clock::to_time_t(now)),
-                           micros.count() % 1000000);
-    }
 }
 
 namespace wr {
@@ -57,7 +46,7 @@ namespace wr {
     rpc::Event EventFactory::start(ProcessId pid, ProcessId ppid, const Execution &execution) const {
         rpc::Event event;
         event.set_rid(rid_);
-        event.set_timestamp(now_as_string());
+        event.mutable_timestamp()->CopyFrom(TimeUtil::GetCurrentTime());
         {
             rpc::Event_Started &event_started = *event.mutable_started();
             event_started.set_pid(pid);
@@ -68,24 +57,24 @@ namespace wr {
     }
 
     rpc::Event EventFactory::signal(int number) const {
-        rpc::Event result;
-        result.set_rid(rid_);
-        result.set_timestamp(now_as_string());
+        rpc::Event event;
+        event.set_rid(rid_);
+        event.mutable_timestamp()->CopyFrom(TimeUtil::GetCurrentTime());
         {
-            rpc::Event_Signalled &event = *result.mutable_signalled();
-            event.set_number(number);
+            rpc::Event_Signalled &event_signalled = *event.mutable_signalled();
+            event_signalled.set_number(number);
         }
-        return result;
+        return event;
     }
 
     rpc::Event EventFactory::terminate(int code) const {
-        rpc::Event result;
-        result.set_rid(rid_);
-        result.set_timestamp(now_as_string());
+        rpc::Event event;
+        event.set_rid(rid_);
+        event.mutable_timestamp()->CopyFrom(TimeUtil::GetCurrentTime());
         {
-            rpc::Event_Terminated &event = *result.mutable_terminated();
-            event.set_status(code);
+            rpc::Event_Terminated &event_terminated = *event.mutable_terminated();
+            event_terminated.set_status(code);
         }
-        return result;
+        return event;
     }
 }

source/intercept/source/report/wrapper/RpcClients.cc

@@ -63,7 +63,7 @@ namespace wr {
         spdlog::debug("gRPC call requested: supervise::Interceptor::Register");
 
         grpc::ClientContext context;
-        rpc::Empty response;
+        google::protobuf::Empty response;
 
         const grpc::Status status = interceptor_->Register(&context, event, &response);
         spdlog::debug("gRPC call [Register] finished: {}", status.ok());