From 8c87939d5e5c0f788b114798002755c3a88fbff5 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Mon, 4 Sep 2017 21:54:54 +0800 Subject: [PATCH 1/2] Package and shell --- .../bin/collector-service.bat | 20 +++++ .../bin/collector-service.sh | 37 +++++++++ .../apm-collector-boot/bin/startup.bat | 5 ++ .../apm-collector-boot/bin/startup.sh | 7 ++ apm-collector/apm-collector-boot/pom.xml | 76 +++++++++++++++++++ .../src/main/assembly/assembly.xml | 42 ++++++++++ .../src/main/resources/logback.xml | 11 +++ .../collector/core/util/DefinitionLoader.java | 6 +- 8 files changed, 202 insertions(+), 2 deletions(-) create mode 100755 apm-collector/apm-collector-boot/bin/collector-service.bat create mode 100755 apm-collector/apm-collector-boot/bin/collector-service.sh create mode 100755 apm-collector/apm-collector-boot/bin/startup.bat create mode 100755 apm-collector/apm-collector-boot/bin/startup.sh create mode 100644 apm-collector/apm-collector-boot/src/main/assembly/assembly.xml diff --git a/apm-collector/apm-collector-boot/bin/collector-service.bat b/apm-collector/apm-collector-boot/bin/collector-service.bat new file mode 100755 index 000000000..d42686a9d --- /dev/null +++ b/apm-collector/apm-collector-boot/bin/collector-service.bat @@ -0,0 +1,20 @@ +@echo off + +setlocal +set COLLECOTR_PROCESS_TITLE=Skywalking-Collector +set COLLECTOR_BASE_PATH=%~dp0%.. +set COLLECTOR_RUNTIME_OPTIONS="-Xms256M -Xmx512M" + +set CLASSPATH=%COLLECTOR_BASE_PATH%\config; +SET CLASSPATH=%COLLECTOR_BASE_PATH%\libs\*;%CLASSPATH% + +if ""%JAVA_HOME%"" == """" ( + set _EXECJAVA=java +) else ( + set _EXECJAVA="%JAVA_HOME%"/bin/java +) + +start /MIN "%COLLECOTR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_RUNTIME_OPTIONS%" -cp "%CLASSPATH%" org.skywalking.apm.collector.boot.CollectorBootStartUp & +echo Collector started successfully! + +endlocal \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/bin/collector-service.sh b/apm-collector/apm-collector-boot/bin/collector-service.sh new file mode 100755 index 000000000..624126659 --- /dev/null +++ b/apm-collector/apm-collector-boot/bin/collector-service.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +PRG="$0" +PRGDIR=`dirname "$PRG"` +[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` + +COLLECTOR_LOGS_DIR="${COLLECTOR_HOME}/logs" +JAVA_OPTS=" -Xms256M -Xmx512M" + +if [ ! -d "${COLLECTOR_HOME}/logs" ]; then + mkdir -p "${COLLECTOR_LOGS_DIR}" +fi + +_RUNJAVA=${JAVA_HOME}/bin/java +[ -z "$JAVA_HOME" ] && _RUNJAVA=`java` + +CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH" +for i in "$COLLECTOR_HOME"/libs/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done + +echo "Starting collector...." +eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -classpath $CLASSPATH org.skywalking.apm.collector.boot.CollectorBootStartUp \ + 2>${COLLECTOR_LOGS_DIR}/collector.log 1> /dev/null &" + +retval=$? +pid=$! +FAIL_MSG="Collector started failure!" +SUCCESS_MSG="Collector started successfully!" +[ ${retval} -eq 0 ] || (echo ${FAIL_MSG}; exit ${retval}) +sleep 1 +if ! ps -p ${pid} > /dev/null ; then + echo ${FAIL_MSG} + exit 1 +fi +echo ${SUCCESS_MSG} \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/bin/startup.bat b/apm-collector/apm-collector-boot/bin/startup.bat new file mode 100755 index 000000000..22023060d --- /dev/null +++ b/apm-collector/apm-collector-boot/bin/startup.bat @@ -0,0 +1,5 @@ +@echo off + +setlocal +call "%~dp0"\collector-service.bat start +endlocal \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/bin/startup.sh b/apm-collector/apm-collector-boot/bin/startup.sh new file mode 100755 index 000000000..7f9c0d3ab --- /dev/null +++ b/apm-collector/apm-collector-boot/bin/startup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +PRG="$0" +PRGDIR=`dirname "$PRG"` +EXECUTABLE=collector-service.sh + +exec "$PRGDIR"/"$EXECUTABLE" start \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml index 8f089d54a..164119033 100644 --- a/apm-collector/apm-collector-boot/pom.xml +++ b/apm-collector/apm-collector-boot/pom.xml @@ -12,6 +12,13 @@ apm-collector-boot jar + + org.skywalking.apm.collector.boot.CollectorBootStartUp + UTF-8 + skywalking/${artifactId} + ${version} + + org.skywalking @@ -54,4 +61,73 @@ ${project.version} + + + skywalking-collector + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + *.xml + *.config + *.yml + + + + ${main.class} + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assembly + package + + single + + + + src/main/assembly/assembly.xml + + + + + + + com.spotify + docker-maven-plugin + ${docker.plugin.version} + + false + ${docker.image.name} + + ${docker.image.version} + + ${project.basedir}/docker + + + / + ${project.build.directory} + ${build.finalName}.tar.gz + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml new file mode 100644 index 000000000..e01550907 --- /dev/null +++ b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml @@ -0,0 +1,42 @@ + + + + tar.gz + zip + + + + /libs + runtime + + + + + ${project.basedir}/bin + /bin + + *.sh + *.bat + + 0755 + + + src/main/resources + + application.yml + logback.xml + + /config + + + ${project.build.directory} + /libs + + ${build.finalName}.jar + + + + \ No newline at end of file diff --git a/apm-collector/apm-collector-boot/src/main/resources/logback.xml b/apm-collector/apm-collector-boot/src/main/resources/logback.xml index a0ca18fb1..19158044a 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/logback.xml +++ b/apm-collector/apm-collector-boot/src/main/resources/logback.xml @@ -1,10 +1,20 @@ + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + ${LOG_PATH}/skywalking-server-log4j2.log + true + true + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + @@ -12,5 +22,6 @@ + \ No newline at end of file diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java index d728dcbc1..9030b1c2d 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java +++ b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/util/DefinitionLoader.java @@ -1,7 +1,8 @@ package org.skywalking.apm.collector.core.util; -import java.io.FileReader; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; import java.util.Enumeration; import java.util.Iterator; @@ -41,7 +42,8 @@ public class DefinitionLoader implements Iterable { while (urlEnumeration.hasMoreElements()) { URL definitionFileURL = urlEnumeration.nextElement(); logger.info("definition file url: {}", definitionFileURL.getPath()); - properties.load(new FileReader(definitionFileURL.getPath())); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(definitionFileURL.openStream())); + properties.load(bufferedReader); Enumeration defineItem = properties.propertyNames(); while (defineItem.hasMoreElements()) { From 9bd79b9273c3ff81f7152d060fd79f85ec8569d8 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Sat, 9 Sep 2017 21:31:45 +0800 Subject: [PATCH 2/2] Change ui jetty server discovery port change to 10800 --- .../jetty/AgentServerJettyModuleDefine.java | 2 + .../jetty/handler/UIJettyServerHandler.java | 2 +- .../src/main/resources/application.yml | 43 +++++++++++-------- .../ui/jetty/UIJettyModuleDefine.java | 2 - 4 files changed, 28 insertions(+), 21 deletions(-) rename apm-collector/{apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui => apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver}/jetty/handler/UIJettyServerHandler.java (95%) diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java index 43314323c..4540b468a 100644 --- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java @@ -6,6 +6,7 @@ import org.skywalking.apm.collector.agentserver.AgentServerModuleDefine; import org.skywalking.apm.collector.agentserver.AgentServerModuleGroupDefine; import org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamGRPCServerHandler; import org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamJettyServerHandler; +import org.skywalking.apm.collector.agentserver.jetty.handler.UIJettyServerHandler; import org.skywalking.apm.collector.core.cluster.ClusterDataListener; import org.skywalking.apm.collector.core.framework.Handler; import org.skywalking.apm.collector.core.module.ModuleConfigParser; @@ -52,6 +53,7 @@ public class AgentServerJettyModuleDefine extends AgentServerModuleDefine { List handlers = new LinkedList<>(); handlers.add(new AgentStreamGRPCServerHandler()); handlers.add(new AgentStreamJettyServerHandler()); + handlers.add(new UIJettyServerHandler()); return handlers; } } diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/UIJettyServerHandler.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java similarity index 95% rename from apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/UIJettyServerHandler.java rename to apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java index 78b49cd42..d38868f38 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/UIJettyServerHandler.java +++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java @@ -1,4 +1,4 @@ -package org.skywalking.apm.collector.ui.jetty.handler; +package org.skywalking.apm.collector.agentserver.jetty.handler; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml index 6288846fc..2477d79ec 100644 --- a/apm-collector/apm-collector-boot/src/main/resources/application.yml +++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml @@ -2,25 +2,32 @@ cluster: zookeeper: hostPort: localhost:2181 sessionTimeout: 100000 -# redis: +#agent_server: +# jetty: # host: localhost -# port: 6379 -agentstream: - grpc: - host: localhost - port: 1000 - jetty: - host: localhost - port: 2000 - context_path: / -discovery: - grpc: localhost - port: 1000 -ui: - jetty: - host: localhost - port: 12800 - context_path: / +# port: 10800 +# context_path: / +#agent_register: +# grpc: +# host: localhost +# port: 11800 +# jetty: +# host: localhost +# port: 12800 +# context_path: / +#agent_stream: +# grpc: +# host: localhost +# port: 11800 +# jetty: +# host: localhost +# port: 12800 +# context_path: / +#ui: +# jetty: +# host: localhost +# port: 12800 +# context_path: / storage: elasticsearch: cluster_name: CollectorDBCluster diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java index 5e2392171..90ae41b5a 100644 --- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java +++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java @@ -14,7 +14,6 @@ import org.skywalking.apm.collector.ui.jetty.handler.SegmentTopGetHandler; import org.skywalking.apm.collector.ui.jetty.handler.SpanGetHandler; import org.skywalking.apm.collector.ui.jetty.handler.TraceDagGetHandler; import org.skywalking.apm.collector.ui.jetty.handler.TraceStackGetHandler; -import org.skywalking.apm.collector.ui.jetty.handler.UIJettyServerHandler; import org.skywalking.apm.collector.ui.jetty.handler.application.ApplicationsGetHandler; import org.skywalking.apm.collector.ui.jetty.handler.instancehealth.InstanceHealthGetHandler; import org.skywalking.apm.collector.ui.jetty.handler.instancemetric.InstanceMetricGetOneTimeBucketHandler; @@ -59,7 +58,6 @@ public class UIJettyModuleDefine extends UIModuleDefine { @Override public List handlerList() { List handlers = new LinkedList<>(); - handlers.add(new UIJettyServerHandler()); handlers.add(new TraceDagGetHandler()); handlers.add(new SegmentTopGetHandler()); handlers.add(new TraceStackGetHandler());