Add environment name to UI

trinodb · Mar 1, 2016 · f7ccd58 · f7ccd58
1 parent 6529d91
commit f7ccd58
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java b/presto-client/src/main/java/com/facebook/presto/client/ServerInfo.java
@@ -27,11 +27,15 @@
 public class ServerInfo
 {
     private final NodeVersion nodeVersion;
+    private final String environment;
 
     @JsonCreator
-    public ServerInfo(@JsonProperty("nodeVersion") NodeVersion nodeVersion)
+    public ServerInfo(
+            @JsonProperty("nodeVersion") NodeVersion nodeVersion,
+            @JsonProperty("environment") String environment)
     {
         this.nodeVersion = requireNonNull(nodeVersion, "nodeVersion is null");
+        this.environment = requireNonNull(environment, "environment is null");
     }
 
     @JsonProperty
@@ -40,6 +44,12 @@ public NodeVersion getNodeVersion()
         return nodeVersion;
     }
 
+    @JsonProperty
+    public String getEnvironment()
+    {
+        return environment;
+    }
+
     @Override
     public boolean equals(Object o)
     {
@@ -51,20 +61,22 @@ public boolean equals(Object o)
         }
 
         ServerInfo that = (ServerInfo) o;
-        return Objects.equals(nodeVersion, that.nodeVersion);
+        return Objects.equals(nodeVersion, that.nodeVersion) &&
+                Objects.equals(environment, that.environment);
     }
 
     @Override
     public int hashCode()
     {
-        return Objects.hash(nodeVersion);
+        return Objects.hash(nodeVersion, environment);
     }
 
     @Override
     public String toString()
     {
         return toStringHelper(this)
                 .add("nodeVersion", nodeVersion)
+                .add("environment", environment)
                 .toString();
     }
 }
diff --git a/presto-docs/src/main/sphinx/release/release-0.140.rst b/presto-docs/src/main/sphinx/release/release-0.140.rst
@@ -6,6 +6,7 @@ General Changes
 ---------------
 
 * Optimize predicate expressions to minimize redundancies.
+* Add environment name to UI.
 
 Hive Changes
 ------------

diff --git a/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java b/presto-main/src/main/java/com/facebook/presto/server/ServerMainModule.java
@@ -97,6 +97,7 @@
 import io.airlift.concurrent.BoundedExecutor;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.discovery.client.ServiceDescriptor;
+import io.airlift.node.NodeInfo;
 import io.airlift.slice.Slice;
 import io.airlift.units.Duration;
 
@@ -301,7 +302,6 @@ protected void setup(Binder binder)
                 });
 
         // server info resource
-        binder.bind(ServerInfo.class).toInstance(new ServerInfo(nodeVersion));
         jaxrsBinder(binder).bind(ServerInfoResource.class);
 
         // plugin manager
@@ -334,6 +334,13 @@ protected void setup(Binder binder)
         binder.bind(FinalizerService.class).in(Scopes.SINGLETON);
     }
 
+    @Provides
+    @Singleton
+    public ServerInfo createServerInfo(NodeVersion nodeVersion, NodeInfo nodeInfo)
+    {
+        return new ServerInfo(nodeVersion, nodeInfo.getEnvironment());
+    }
+
     @Provides
     @Singleton
     @ForExchange

diff --git a/presto-main/src/main/resources/webapp/index.html b/presto-main/src/main/resources/webapp/index.html
@@ -78,6 +78,7 @@
             </a>
         </div>
         <div class="col-md-3 text-right" id="version"></div>
+        <div class="col-md-3 text-right" id="environment"></div>
     </div>
 
     <div id="queries"></div>
@@ -86,6 +87,7 @@
 <script type="text/jsx">
 d3.json("/v1/info", function (info) {
     document.getElementById('version').textContent = "Version: " + info.nodeVersion.version;
+    document.getElementById('environment').textContent = info.environment;
 });
 
 var Query = React.createClass({