20.x backports for v6 Release

Makefile

@@ -1645,7 +1645,7 @@ test-agents-prereqs:
 	env npm_config_nodedir=$(PWD) $(NODE) ./deps/npm install zeromq@5 base85 --prefix test/common/nsolid-zmq-agent --no-save --no-package-lock
 	env npm_config_nodedir=$(PWD) $(NODE) ./deps/npm run build:libzmq --prefix test/common/nsolid-zmq-agent/node_modules/zeromq
 	env npm_config_nodedir=$(PWD) $(NODE) ./deps/npm install @opentelemetry/otlp-proto-exporter-base @grpc/grpc-js @grpc/proto-loader --prefix test/common/nsolid-otlp-agent --no-save --no-package-lock
-	env npm_config_nodedir=$(PWD) $(NODE) ./deps/npm install @grpc/grpc-js @grpc/proto-loader --prefix test/common/nsolid-grpc-agent --no-save --no-package-lock
+	env npm_config_nodedir=$(PWD) $(NODE) ./deps/npm install @grpc/grpc-js @grpc/proto-loader@0.7 --prefix test/common/nsolid-grpc-agent --no-save --no-package-lock
 
 .PHONY: test-agents-prereqs-clean
 test-agents-prereqs-clean:

agents/grpc/proto/asset.proto

@@ -11,5 +11,7 @@ message Asset {
   google.protobuf.Struct metadata = 3;
   string data = 4;
   bool complete = 5;
-  uint64 duration = 6;
+  uint64 duration = 6;  // Duration of the profile in milliseconds
+  double start_ts = 7;  // Timestamp when the profile was taken in milliseconds from epoch
+  double end_ts = 8;    // Timestamp when the profile was completed in milliseconds from epoch
 }

agents/grpc/proto/info.proto

@@ -20,6 +20,7 @@ message InfoBody {
   repeated string tags = 13;
   uint64 totalMem = 14;
   map<string, string> versions = 15;
+  uint32 kernelVersion = 16;
 }
 
 message InfoEvent {

agents/grpc/proto/nsolid_service.proto

@@ -16,6 +16,7 @@ package grpcagent;
 service NSolidService {
   rpc Command (stream CommandResponse) returns (stream CommandRequest) {}
   rpc ExportAsset (stream Asset) returns (EventResponse) {}
+  rpc ExportContinuousProfile (stream Asset) returns (EventResponse) {}
   rpc ExportExit (ExitEvent) returns (EventResponse) {}
   rpc ExportInfo (InfoEvent) returns (EventResponse) {}
   rpc ExportMetrics (MetricsEvent) returns (EventResponse) {}

agents/grpc/proto/reconfigure.proto

@@ -16,6 +16,7 @@ message ReconfigureBody {
   repeated string tags = 9;
   optional bool tracingEnabled = 10;
   optional uint32 tracingModulesBlacklist = 11;
+  optional bool contCpuProfile = 12;
 }
 
 message ReconfigureEvent {

agents/grpc/src/asset_stream.cc

@@ -20,14 +20,22 @@ AssetStream::AssetStream(
     AssetStor&& stor,
     std::weak_ptr<AssetStreamObserver> observer,
     const std::string& agent_id,
-    const std::string& saas): observer_(observer),
-                              stor_(std::move(stor)) {
+    const std::string& saas,
+    AssetStreamRpcType rpc_type): observer_(observer),
+                                  stor_(std::move(stor)) {
   ASSERT_EQ(0, lock_.init(true));
   context_.AddMetadata("nsolid-agent-id", agent_id);
   if (!saas.empty()) {
     context_.AddMetadata("nsolid-saas-token", saas);
   }
-  stub->async()->ExportAsset(&context_, &event_response_, this);
+
+  // Call the appropriate RPC method based on the rpc_type parameter
+  if (rpc_type == EXPORT_CONTINUOUS_PROFILE) {
+    stub->async()->ExportContinuousProfile(&context_, &event_response_, this);
+  } else {
+    stub->async()->ExportAsset(&context_, &event_response_, this);
+  }
+
   AddHold();
   StartCall();
 }
@@ -86,6 +94,7 @@ void AssetStream::Write(grpcagent::Asset&& asset) {
 
 void AssetStream::WritesDone(bool) {
   nsuv::ns_mutex::scoped_lock lock(lock_);
+  ASSERT(write_state_.write_done_called == false);
   write_state_.write_done_called = true;
   NextWrite();
 }

agents/grpc/src/asset_stream.h

@@ -15,6 +15,12 @@ namespace grpc {
 // Predeclarations
 class AssetStream;
 
+// RPC type enum for specifying which RPC method to use
+enum AssetStreamRpcType {
+  EXPORT_ASSET,
+  EXPORT_CONTINUOUS_PROFILE
+};
+
 struct AssetStor {
   ProfileType type;
   uint64_t thread_id;
@@ -41,7 +47,8 @@ class AssetStream: public ::grpc::ClientWriteReactor<grpcagent::Asset> {
                        AssetStor&& stor,
                        std::weak_ptr<AssetStreamObserver> observer,
                        const std::string& agent_id,
-                       const std::string& saas);
+                       const std::string& saas,
+                       AssetStreamRpcType rpc_type = EXPORT_ASSET);
 
   ~AssetStream();