Unverified Commit 1b2c8f75 authored by liyuntao's avatar liyuntao Committed by GitHub
Browse files

Merge branch 'master' into develop

parents 626ef11f 33755f7a

apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class Config { 
        /**

         * 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 {

apm-sniffer/config/agent.config

+1 −1
Original line number Diff line number Diff line
@@ -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