Merge remote-tracking branch 'origin/master'
# Conflicts: # samples/skywalking-example/example-dubbox-rest/target/classes/consumer/dubbox-rest-consumer.xml # samples/skywalking-example/example-dubbox-rest/target/classes/provider/dubbox-rest-provider.xml
This commit is contained in:
ascrutae
commit
a514850ba4
61
BUILD_DOC.md
61
BUILD_DOC.md
|
|
@ -1,54 +1,23 @@
|
|||
### 编译安装SkyWalking Server / Build SkyWalking Server
|
||||
### 编译SkyWalking Protocol / Build SkyWalking Protocol
|
||||
- 编译工程
|
||||
- build
|
||||
```shell
|
||||
$cd github/sky-walking/skywalking-server
|
||||
$mvn package -Dmaven.test.skip=true
|
||||
$cd github/sky-walking/skywalking-server/target/installer
|
||||
$cd github/sky-walking/skywalking-protocol
|
||||
$mvn clean install -Dmaven.test.skip=true
|
||||
```
|
||||
- 拷贝installer到服务器
|
||||
- upload installer to server
|
||||
|
||||
|
||||
### 编译安装SkyWalking Alarm / Build SkyWalking Alarm
|
||||
- 编译工程
|
||||
- build
|
||||
### 编译SkyWalking主工程 / Build SkyWalking
|
||||
```shell
|
||||
$cd github/sky-walking/skywalking-alarm
|
||||
$mvn package -Dmaven.test.skip=true
|
||||
$cd github/sky-walking/skywalking-alarm/target/installer
|
||||
```
|
||||
- 拷贝installer到服务器
|
||||
- upload installer to server
|
||||
|
||||
|
||||
### 编译安装SkyWalking WebUI / Build SkyWalking WebUI
|
||||
|
||||
- 编译工程
|
||||
- build
|
||||
```shell
|
||||
$cd github/sky-walking/skywalking-webui
|
||||
$mvn package
|
||||
$cd github/sky-walking
|
||||
$mvn clean install -Dmaven.test.skip=true
|
||||
```
|
||||
|
||||
- 上传war包到服务器，启动Tomcat服务器
|
||||
- startup tomcat of webui
|
||||
|
||||
### 编译安装SkyWalking Analysis / Build SkyWalking Analysis
|
||||
- 编译工程
|
||||
- build
|
||||
```shell
|
||||
$cd github/sky-walking/skywalking-analysis
|
||||
$mvn package -Dmaven.test.skip=true
|
||||
```
|
||||
|
||||
- 上传skywalking-analysis-1.0-Final.jar. Upload the skywalking-analysis-1.0-Final.jar
|
||||
- 上传start-analysis.sh. Upload the start-analysis.sh
|
||||
|
||||
|
||||
## 使用maven发布各插件工程 / build and deploy plugins
|
||||
- build and deploy skywalking-sdk-plugin(dubbo-plugin，spring-plugin，web-plugin，jdbc-plugin，httpclient-4.2.x-plugin，httpclient-4.3.x-plugin, etc.)
|
||||
- 请跳过maven.test环节，避免打包失败
|
||||
```properties
|
||||
-Dmaven.test.skip=true
|
||||
```
|
||||
- 从各工程目录中获取安装包
|
||||
- SkyWalking Agent: github/sky-walking/skywalking-collector/skywalking-agent/target/skywalking-agent-1.0-Final.jar
|
||||
- SkyWalking Server: github/sky-walking/skywalking-server/target/installer
|
||||
- SkyWalking Alarm: github/sky-walking/skywalking-alarm/target/installer
|
||||
- SkyWalking WebUI: github/sky-walking/skywalking-webui/skywalking.war
|
||||
- SkyWalking Analysis: github/sky-walking/skywalking-analysis/skywalking-analysis-1.0-Final.jar
|
||||
- 上传skywalking-analysis-1.0-Final.jar. Upload the skywalking-analysis-1.0-Final.jar
|
||||
- 上传start-analysis.sh到同一目录. Upload the start-analysis.sh to the same directory
|
||||
- 为start-analysis.sh创建crontable定时任务，30分钟执行一次。create crontable for shell, set cycle=30min.
|
||||
|
|
|
|||
20
README.md
20
README.md
|
|
@ -86,8 +86,6 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, 是一个对
|
|||
|
||||
|
||||
# Quick Start
|
||||
- master用于迭代开发，需要稳定版本请参见[Releases](releases)。1.0b的完整代码，请参见 [1.0-beta-tag](https://github.com/wu-sheng/sky-walking/tree/1.0-beta)
|
||||
- Developing of version 1.0-Final on branch Master. The source code of version [1.0-beta-tag](https://github.com/wu-sheng/sky-walking/tree/1.0-beta)
|
||||
|
||||
## 部署第三方软件 / Required of third party softwares
|
||||
- JDK 1.7
|
||||
|
|
@ -116,17 +114,11 @@ SkyWalking: Large-Scale Distributed Systems Tracing Infrastructure, 是一个对
|
|||
- use public repository [https://jcenter.bintray.com/](https://jcenter.bintray.com/) to download sdk
|
||||
|
||||
|
||||
## 使用-javaagent 启动应用程序 / start application with -javaagent
|
||||
- 为应用程序添加启动参数
|
||||
```shell
|
||||
java -jar ... -javaagent:/..ospath../skywalking-agent-x.x-Final.jar
|
||||
```
|
||||
|
||||
## 下载并设置授权文件 / Download auth file
|
||||
- 注册并登陆过skywalking-webui，创建应用。（一个用户代表一个逻辑集群，一个应用代表一个服务集群。如前后端应用应该设置两个应用，但归属一个用户）
|
||||
- Sign up and login in skywalking-webui. Create application as needed.
|
||||
- 下载授权文件，并在运行时环境中，将授权文件加入到CLASSPATH或LIB中
|
||||
- download auth file(*.jar), and add the jar file to the CLASSPATH or lib.
|
||||
- 下载授权文件，放在在agent jar所在目录中
|
||||
- download auth file(*.auth), and copy the auth file to directory of the agent jar
|
||||
|
||||
## 在运行时环境中设置环境变量 / set environment variables
|
||||
```
|
||||
|
|
@ -135,6 +127,14 @@ export SKYWALKING_RUN=true
|
|||
- 设置完成后，SkyWalking将随应用启动运行
|
||||
- After set env, SkyWalking will be working, when application startup.
|
||||
|
||||
|
||||
## 使用-javaagent 并启动应用程序 / start application with -javaagent
|
||||
- 为应用程序添加启动参数
|
||||
```shell
|
||||
java -jar ... -javaagent:/..ospath../skywalking-agent-x.x-Final.jar
|
||||
```
|
||||
- Tomcat可以使用修改启动文件，配置-javaagent参数
|
||||
|
||||
# 在应用程序中显示traceid / How to find tid
|
||||
- [Find TID](HOW_TO_FIND_TID.md)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
|
||||
|
||||
<dubbo:application name="skywalking-consumer"/>
|
||||
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
|
||||
<dubbo:reference id="dubboxRestInterA"
|
||||
interface="com.a.eye.skywalking.sample.dubboxrest.interfaces.IDubboxRestInterA"
|
||||
url="rest://127.0.0.1:20880"/>
|
||||
|
||||
</beans>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
CREATE TABLE PUBLIC.sampletable1
|
||||
(
|
||||
key1 VARCHAR2(36) PRIMARY KEY,
|
||||
value1 VARCHAR2(36) NOT NULL
|
||||
);
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#\u53ca\u65e5\u5fd7\u8f93\u51fa\u7ea7\u522b\uff0c\u5927\u4e8e\u7b49\u4e8e\u8be5\u7ea7\u522b\u7684\u65e5\u5fd7\u5c06\u88ab\u8f93\u51fa\uff08 DEBUG < INFO < WARN < ERROR < FATAL \uff09 \u8bbe\u4e3aOFF\u53ef\u4ee5\u5173\u95ed\u65e5\u5fd7
|
||||
log4j.rootLogger=info, stdout
|
||||
|
||||
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
|
||||
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p %l %m%n
|
||||
|
||||
log4j.logger.com.hshbic.cloud.openapi.develop2=INFO
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration status="error">
|
||||
<Appenders>
|
||||
<Console name="Console" target="SYSTEM_OUT">
|
||||
<PatternLayout pattern="%d [%t](%F:%L) %-5level %logger{36} - %msg%n" />
|
||||
</Console>
|
||||
<Console name="Console2" target="SYSTEM_OUT">
|
||||
<PatternLayout pattern="%d [%t](%F:%L) %-5level %logger{36} - %msg%n" />
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<Root level="debug">
|
||||
<AppenderRef ref="Console" />
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
|
||||
|
||||
<dubbo:application name="skywalking-dubbo-rest-provider"/>
|
||||
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
|
||||
<dubbo:protocol name="rest" port="20880" server="tomcat"/>
|
||||
<bean id="dubboxRestInterA" class="com.a.eye.skywalking.sample.dubboxrest.impl.DubboxRestInterAImpl"/>
|
||||
<dubbo:service interface="com.a.eye.skywalking.sample.dubboxrest.interfaces.IDubboxRestInterA"
|
||||
ref="dubboxRestInterA"/>
|
||||
|
||||
</beans>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:context="http://www.springframework.org/schema/context" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
||||
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
|
||||
http://www.springframework.org/schema/context
|
||||
http://www.springframework.org/schema/context/spring-context-3.1.xsd http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
|
||||
<!-- 自动扫描 -->
|
||||
<context:component-scan base-package="com.ai.cloud.skywalking.sample"/>
|
||||
|
||||
<jdbc:embedded-database id="dataSource" type="H2">
|
||||
<jdbc:script location="classpath:db/sql/create-db.sql" />
|
||||
</jdbc:embedded-database>
|
||||
|
||||
<import resource="classpath*:provider/dubbox-rest-provider.xml"/>
|
||||
</beans>
|
||||
Loading…
Reference in New Issue