src: add scriptId to stack@blocked_loop event

PR-URL: #238 Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
nodesource · Dec 18, 2024 · fcf0865 · fcf0865
1 parent a4dfbf6
commit fcf0865
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 25 deletions.
diff --git a/agents/grpc/proto/blocked_loop.proto b/agents/grpc/proto/blocked_loop.proto
@@ -15,6 +15,7 @@ message Stack {
   string function_name = 3;
   int32 line_number = 4;
   int32 column = 5;
+  int32 script_id = 6;
 }
 
 message BlockedLoopBody {

diff --git a/agents/grpc/src/grpc_agent.cc b/agents/grpc/src/grpc_agent.cc
@@ -170,6 +170,7 @@ void PopulateBlockedLoopEvent(grpcagent::BlockedLoopEvent* blocked_loop_event,
 
     proto_stack->set_line_number(stack["line_number"].get<int32_t>());
     proto_stack->set_column(stack["column"].get<int32_t>());
+    proto_stack->set_script_id(stack["scriptId"].get<int32_t>());
   }
 }
 

diff --git a/agents/grpc/src/proto/blocked_loop.pb.cc b/agents/grpc/src/proto/blocked_loop.pb.cc
diff --git a/agents/grpc/src/proto/blocked_loop.pb.h b/agents/grpc/src/proto/blocked_loop.pb.h
diff --git a/src/nsolid/nsolid_api.cc b/src/nsolid/nsolid_api.cc
@@ -388,6 +388,8 @@ std::string EnvInst::GetOnBlockedBody() {
     frame += std::to_string(stack_frame->GetLineNumber());
     frame += ",\"column\":";
     frame += std::to_string(stack_frame->GetColumn());
+    frame += ",\"scriptId\":";
+    frame += std::to_string(stack_frame->GetScriptId());
 
     frame += "},";
     body_string += frame;

diff --git a/test/agents/test-grpc-blocked-loop.mjs b/test/agents/test-grpc-blocked-loop.mjs
@@ -92,6 +92,7 @@ function checkBlockedLoopData(blocked, metadata, agentId, threadId) {
 
     validateInteger(frame.lineNumber, 'lineNumber');
     validateInteger(frame.column, 'column');
+    validateInteger(frame.scriptId, 'scriptId');
   }
 
   assert.strictEqual(blocked.body.threadId, `${threadId}`);

diff --git a/test/agents/test-zmq-blocked-loop.mjs b/test/agents/test-zmq-blocked-loop.mjs
@@ -88,6 +88,7 @@ function checkBlockedLoopData(blocked, agentId, threadId) {
 
     validateInteger(frame.line_number, 'line_number');
     validateInteger(frame.column, 'column');
+    validateInteger(frame.scriptId, 'scriptId');
   }
 
   assert.strictEqual(blocked.body.threadId, threadId);
-Original file line number
+Diff line change
@@ Expand Up @@
         proto_stack->set_line_number(stack["line_number"].get<int32_t>());
         proto_stack->set_column(stack["column"].get<int32_t>());
+        proto_stack->set_script_id(stack["scriptId"].get<int32_t>());
       }
     }
@@ Expand Down @@