Merge branch 'develop' of https://github.com/lytscu/skywalking into d…

…evelop y
apache · Jan 5, 2018 · 722f8a9 · 722f8a9
2 parents ee0d505 + 478fe46
commit 722f8a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/application-layer.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/application-layer.graphqls
@@ -19,6 +19,9 @@ type ApplicationNode implements Node {
     numOfServerAlarm: Int!
     # The number of services alerting
     numOfServiceAlarm: Int!
+    # Incoming request node, means User or outside system access the cluster from this.
+    # Recommend the UI generate a User node for each incoming node
+    isIncomingNode: Boolean
 }
 
 # The conjectural node generated by exit span

diff --git a/...ain/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/...ain/java/org/apache/skywalking/apm/plugin/httpClient/v4/HttpClientExecuteInterceptor.java
@@ -18,7 +18,6 @@
 
 package org.apache.skywalking.apm.plugin.httpClient.v4;
 
-import io.netty.handler.codec.http.HttpScheme;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -50,7 +49,7 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc
         AbstractSpan span = null;
 
         String remotePeer = httpHost.getHostName() + ":" + (httpHost.getPort() > 0 ? httpHost.getPort() :
-            HttpScheme.HTTPS.name().equals(httpHost.getSchemeName().toLowerCase()) ? 443 : 80);
+            "https".equals(httpHost.getSchemeName().toLowerCase()) ? 443 : 80);
 
         try {
             URL url = new URL(httpRequest.getRequestLine().getUri());