nodejs
diff --git a/‎src/node_platform.cc‎
Lines changed: 1 addition & 0 deletions b/‎src/node_platform.cc‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/node_watchdog.cc‎
Lines changed: 2 additions & 1 deletion b/‎src/node_watchdog.cc‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/tracing/agent.cc‎
Lines changed: 9 additions & 4 deletions b/‎src/tracing/agent.cc‎
Lines changed: 9 additions & 4 deletions
@@ -101,6 +101,7 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
 
   std::unique_ptr<uv_thread_t> Start() {
     auto start_thread = [](void* data) {
+      uv_thread_setname("DelayedTaskSchedulerWorker");
       static_cast<DelayedTaskScheduler*>(data)->Run();
     };
     std::unique_ptr<uv_thread_t> t { new uv_thread_t() };
 
@@ -80,6 +80,7 @@ Watchdog::~Watchdog() {
 
 
 void Watchdog::Run(void* arg) {
+  uv_thread_setname("Watchdog");
   Watchdog* wd = static_cast<Watchdog*>(arg);
 
   // UV_RUN_DEFAULT the loop will be stopped either by the async or the
@@ -229,9 +230,9 @@ void TraceSigintWatchdog::HandleInterrupt() {
 
 #ifdef __POSIX__
 void* SigintWatchdogHelper::RunSigintWatchdog(void* arg) {
+  uv_thread_setname("SigintWatchdog");
   // Inside the helper thread.
   bool is_stopping;
-
   do {
     uv_sem_wait(&instance.sem_);
     is_stopping = InformWatchdogsAboutSignal();
 
@@ -94,10 +94,15 @@ void Agent::Start() {
   // This thread should be created *after* async handles are created
   // (within NodeTraceWriter and NodeTraceBuffer constructors).
   // Otherwise the thread could shut down prematurely.
-  CHECK_EQ(0, uv_thread_create(&thread_, [](void* arg) {
-    Agent* agent = static_cast<Agent*>(arg);
-    uv_run(&agent->tracing_loop_, UV_RUN_DEFAULT);
-  }, this));
+  CHECK_EQ(0,
+           uv_thread_create(
+               &thread_,
+               [](void* arg) {
+                 uv_thread_setname("TraceEventWorker");
+                 Agent* agent = static_cast<Agent*>(arg);
+                 uv_run(&agent->tracing_loop_, UV_RUN_DEFAULT);
+               },
+               this));
   started_ = true;
 }