From fe8c8d2ebc6a02e564ff6e2ff7fd653a0a89ab0c Mon Sep 17 00:00:00 2001
From: hengyunabc <hengyunabc@gmail.com>
Date: Fri, 30 Aug 2019 02:25:55 +0800
Subject: [PATCH] session command support print agent id/tunnel server. #835

---
 .../arthas/core/command/basic1000/SessionCommand.java | 11 +++++++++++
 .../taobao/arthas/core/server/ArthasBootstrap.java    |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/core/src/main/java/com/taobao/arthas/core/command/basic1000/SessionCommand.java b/core/src/main/java/com/taobao/arthas/core/command/basic1000/SessionCommand.java
index 8ed0612b4..9e0c2f23f 100644
--- a/core/src/main/java/com/taobao/arthas/core/command/basic1000/SessionCommand.java
+++ b/core/src/main/java/com/taobao/arthas/core/command/basic1000/SessionCommand.java
@@ -1,5 +1,6 @@
 package com.taobao.arthas.core.command.basic1000;
 
+import com.taobao.arthas.core.server.ArthasBootstrap;
 import com.taobao.arthas.core.shell.command.AnnotatedCommand;
 import com.taobao.arthas.core.shell.command.CommandProcess;
 import com.taobao.arthas.core.shell.session.Session;
@@ -12,6 +13,8 @@ import com.taobao.text.util.RenderUtil;
 
 import static com.taobao.text.ui.Element.label;
 
+import com.alibaba.arthas.tunnel.client.TunnelClient;
+
 /**
  * 查看会话状态命令
  *
@@ -32,6 +35,14 @@ public class SessionCommand extends AnnotatedCommand {
         TableElement table = new TableElement().leftCellPadding(1).rightCellPadding(1);
         table.row(true, label("Name").style(Decoration.bold.bold()), label("Value").style(Decoration.bold.bold()));
         table.row("JAVA_PID", "" + session.getPid()).row("SESSION_ID", "" + session.getSessionId());
+        TunnelClient tunnelClient = ArthasBootstrap.getInstance().getTunnelClient();
+        if (tunnelClient != null) {
+            String id = tunnelClient.getId();
+            if (id != null) {
+                table.row("AGENT_ID", "" + id);
+            }
+            table.row("TUNNEL_SERVER", "" + tunnelClient.getTunnelServerUrl());
+        }
         return table;
     }
 }
diff --git a/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java b/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
index 3c6270755..99036c7f1 100644
--- a/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
+++ b/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
@@ -232,4 +232,8 @@ public class ArthasBootstrap {
             logger.error(null, "Spy destroy failed: ", e);
         }
     }
+
+    public TunnelClient getTunnelClient() {
+        return tunnelClient;
+    }
 }