diff --git a/QA/SERVER_RUNNING_STAUTS.md b/QA/SERVER_RUNNING_STAUTS.md new file mode 100644 index 000000000..7b6d41961 --- /dev/null +++ b/QA/SERVER_RUNNING_STAUTS.md @@ -0,0 +1,95 @@ +### 通过服务器日志的Server Health Collector Report分析运行情况 +- Health Report会在服务器定时出现，报告在两次报告时间段内的运行情况 + +1. ServerReceiver反映服务端接收数据的情况 +1. DataBufferThread反映接收到的数据，异步写入log文件的情况 +1. PersistenceThread反映log文件中的内容读取情况 +1. PersistenceThread extra:hbase反映log文件中的内容，持久化到hbase的情况 +1. RedisInspectorThread反映和redis的连接池检测情况 + +- Health Report示例如下 +``` +---------Server Health Collector Report--------- +id +[INFO]DataBuffer flush data to local file:1460445849010-a4ea1e20927b40d290ebd4f5f3e08705(t:1460598787106) + +id +[INFO]DataBuffer flush data to local file:1460445849012-0ec5a44474bc4969a9194fa1b1cadf73(t:1460598848608) + +id +[INFO]DataBuffer flush data to local file:1460445849012-4182e3d0205e48968b59fe9fbb0923b4(t:1460598668464) + +id +[INFO]DataBuffer flush data to local file:1460445849013-54216553363343fe8b39221a0691cf40(t:1460598788488) + +id +[INFO]DataBuffer flush data to local file:1460445849013-531a955690764a56ac0490db531bec10(t:1460598727104) + +id +[INFO]DataBuffer flush data to local file:1460445849014-e0163d8c8b8446d6812a11e89cd48b0e(t:1460598787722) + +id +[INFO]DataBuffer flush data to local file:1460445849014-340435a1dd9e49f088af039c2e9e85af(t:1460598787510) + +id +[INFO]DataBuffer flush data to local file:1460445849015-5dacc5f6fb38442eb484b50a240568df(t:1460598727508) + +id +[INFO]read 224 chars from local file:1460445849014-340435a1dd9e49f088af039c2e9e85af(t:1460598787534) + +id +[INFO]save 1 BuriedPointEntries.(t:1460598787549) + +id +[INFO]read 268 chars from local file:1460445849013-531a955690764a56ac0490db531bec10(t:1460598727121) + +id +[INFO]save 1 BuriedPointEntries.(t:1460598727129) + +id +[INFO]read 238 chars from local file:1460445849013-54216553363343fe8b39221a0691cf40(t:1460598788522) + +id +[INFO]save 1 BuriedPointEntries.(t:1460598788532) + +id +[INFO]read 526 chars from local file:1460445849014-e0163d8c8b8446d6812a11e89cd48b0e(t:1460598787770) + +id +[INFO]save 1 BuriedPointEntries.(t:1460598787775) + +id +[INFO]read 238 chars from local file:1460445849010-a4ea1e20927b40d290ebd4f5f3e08705(t:1460598787126) + +id +[INFO]save 1 BuriedPointEntries.(t:1460598787135) + +id +[INFO]read 583 chars from local file:1460445849012-4182e3d0205e48968b59fe9fbb0923b4(t:1460598668466) + +id +[INFO]save 1 BuriedPointEntries.(t:1460598668473) + +id +[INFO]read 819 chars from local file:1460445849015-5dacc5f6fb38442eb484b50a240568df(t:1460598727531) + +id +[INFO]save 2 BuriedPointEntries.(t:1460598727542) + +id +[INFO]read 462 chars from local file:1460445849012-0ec5a44474bc4969a9194fa1b1cadf73(t:1460598848648) + +id +[INFO]save 3 BuriedPointEntries.(t:1460598848757) + +id +[INFO]alarm redis connectted.(t:1460598845054) + +id +[INFO]flush memory register to file.(t:1460598848748) + +id +[INFO]DataBuffer reveiving data.(t:1460598845300) + +------------------------------------------------ +``` \ No newline at end of file diff --git a/README.md b/README.md index ccbaf31f2..c212de19d 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,7 @@ export SKYWALKING_RUN=true # QA - [SkyWalking SDK是否已经工作？ Is SkyWalking SDK Running?](QA/IS_RUNNING.md) - [tid在web-ui上无法查询. tid can't be search on web-ui](QA/TID_CANNOT_BE_SEARCH.md) +- [SkyWalking Server的运行情况. The status of SkyWalking Server](QA/SERVER_RUNNING_STAUTS.md) # 源代码说明 * [追踪日志明细存储结构说明. the storage structure of tracking logs](skywalking-server/doc/hbase_table_desc.md) diff --git a/skywalking-sdk-plugin/spring-plugin/pom.xml b/skywalking-sdk-plugin/spring-plugin/pom.xml index ad5900add..c94b52120 100644 --- a/skywalking-sdk-plugin/spring-plugin/pom.xml +++ b/skywalking-sdk-plugin/spring-plugin/pom.xml @@ -1,81 +1,87 @@ - - skywalking-sdk-plugin - com.ai.cloud - 1.0-SNAPSHOT - - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + skywalking-sdk-plugin + com.ai.cloud + 1.0-SNAPSHOT + + 4.0.0 - skywalking-spring-plugin - jar + skywalking-spring-plugin + jar - spring-plugin - http://maven.apache.org + spring-plugin + http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - org.aspectj - aspectjweaver - 1.8.7 - compile - - - com.ai.cloud - skywalking-api - ${project.version} - - - junit - junit - 3.8.1 - test - - - org.springframework - spring-context - 3.2.0.RELEASE - compile - - - com.ai.cloud - skywalking-auth - ${project.version} - test - - - org.springframework - spring-tx - 3.2.0.RELEASE - test - - - org.springframework - spring-jdbc - 3.2.9.RELEASE - test - - - org.apache.commons - commons-dbcp2 - 2.1.1 - test - + + + org.aspectj + aspectjweaver + 1.8.7 + compile + + + com.ai.cloud + skywalking-api + ${project.version} + + + junit + junit + 3.8.1 + test + + + org.apache.logging.log4j + log4j-core + 2.4.1 + test + + + org.springframework + spring-context + 3.2.0.RELEASE + compile + + + com.ai.cloud + skywalking-auth + ${project.version} + test + + + org.springframework + spring-tx + 3.2.0.RELEASE + test + + + org.springframework + spring-jdbc + 3.2.9.RELEASE + test + + + org.apache.commons + commons-dbcp2 + 2.1.1 + test + - - mysql - mysql-connector-java - 5.1.38 - test - - - - - + + mysql + mysql-connector-java + 5.1.38 + test + + + + + maven-compiler-plugin @@ -93,24 +99,24 @@ ${project.build.sourceEncoding} - - org.apache.maven.plugins - maven-deploy-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - - jar - - - - + + org.apache.maven.plugins + maven-deploy-plugin + + + + org.apache.maven.plugins + maven-source-plugin + + + + attach-sources + + jar + + + + diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java index f03af1193..358800148 100644 --- a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java +++ b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingAspect.java @@ -9,19 +9,7 @@ public class TracingAspect { public Object doTracing(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { LocalBuriedPointSender _sender = new LocalBuriedPointSender(); try { - StringBuilder viewPoint = new StringBuilder(); - viewPoint.append(proceedingJoinPoint.getTarget().getClass().getName() + "." + proceedingJoinPoint.getSignature().getName() + "("); - boolean first = true; - for (Object arg : proceedingJoinPoint.getArgs()) { - if (!first) { - viewPoint.append(","); - } else { - first = false; - } - viewPoint.append(arg.getClass().getName()); - } - viewPoint.append(")"); - _sender.beforeSend(Identification.newBuilder().viewPoint(viewPoint.toString()).spanType(SpringBuriedPointType.instance()).build()); + _sender.beforeSend(Identification.newBuilder().viewPoint(proceedingJoinPoint.getSignature().toString()).spanType(SpringBuriedPointType.instance()).build()); return proceedingJoinPoint.proceed(); } catch (Throwable e) { _sender.handleException(e); diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java b/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java index d728a6e77..20a0464fb 100644 --- a/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java +++ b/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @Service -@Transactional +//@Transactional public class TestBean/* implements TestInterface*/ { private String value; diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml b/skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml new file mode 100644 index 000000000..852698762 --- /dev/null +++ b/skywalking-sdk-plugin/spring-plugin/src/test/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth b/skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth new file mode 100644 index 000000000..c794ea37c --- /dev/null +++ b/skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth @@ -0,0 +1,47 @@ +#skyWalking用户ID +skywalking.user_id=123 +#skyWalking应用编码 +skywalking.application_code=test +#skywalking auth的环境变量名字 +skywalking.auth_system_env_name=SKYWALKING_RUN +#skywalking数据编码 +skywalking.charset=UTF-8 + +#是否打印数据 +buriedpoint.printf=true +#埋点异常的最大长度 +buriedpoint.max_exception_stack_length=4000 +#业务字段的最大长度 +buriedpoint.businesskey_max_length=300 +#过滤异常 +buriedpoint.exclusive_exceptions=java.lang.RuntimeException + +#最大发送者的连接数阀比例 +sender.connect_percent=100 +#发送服务端配置 +sender.servers_addr=127.0.0.1:34000 +#最大发送的副本数量 +sender.max_copy_num=2 +#发送的最大长度 +sender.max_send_length=20000 +#当没有Sender时,尝试获取sender的等待周期 +sender.retry_get_sender_wait_interval=2000 +#是否开启发送消息 +sender.is_off=false + + +#最大消费线程数 +consumer.max_consumer=2 +#消费者最大等待时间 +consumer.max_wait_time=5 +#发送失败等待时间 +consumer.consumer_fail_retry_wait_interval=50 + +#每个Buffer的最大个数 +buffer.buffer_max_size=18000 +#Buffer池的最大长度 +buffer.pool_size=5 + +#发送检查线程检查周期 +senderchecker.check_polling_time=200 +