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

lytscu · lytscu · commit 8c2758ba6982 · 2017-11-20T17:22:03.000+08:00
y
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java
@@ -76,7 +76,7 @@ public static class Collector {
         /**
          * Collector service discovery REST service name
          */
-        public static String DISCOVERY_SERVICE_NAME = "/agentstream/grpc";
+        public static String DISCOVERY_SERVICE_NAME = "/agent/gRPC";
     }
 
     public static class Jvm {
diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config
@@ -17,7 +17,7 @@ agent.application_code=Your_ApplicationName
 # Examples：
 # Single collector：SERVERS="127.0.0.1:8080"
 # Collector cluster：SERVERS="10.2.45.126:8080,10.2.45.127:7600"
-collector.servers=127.0.0.1:10800
+collector.servers=127.0.0.1:12800
 
 # Logging level
 logging.level=DEBUG

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static class Collector {`
`76`	`76`	`/**`
`77`	`77`	`* Collector service discovery REST service name`
`78`	`78`	`*/`
`79`		`- public static String DISCOVERY_SERVICE_NAME = "/agentstream/grpc";`
	`79`	`+ public static String DISCOVERY_SERVICE_NAME = "/agent/gRPC";`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public static class Jvm {`