From 5c51f5af2c2bdb59794cfe01f67eb01518a7f388 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Wed, 30 Dec 2015 14:15:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9Skywalking=E7=9A=84Spring?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=202.=20=E6=B7=BB=E5=8A=A0skywalking?= =?UTF-8?q?.auth=E6=96=87=E4=BB=B6=203.=20=E4=BF=AE=E6=94=B9pom.xml?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account-application/account-impl/pom.xml | 13 +++-- .../src/main/resources/applicationContext.xml | 17 +++--- .../src/main/resources/sky-walking.auth | 54 ++++++------------- .../mail-application/pom.xml | 9 +++- .../src/main/resources/applicationcontext.xml | 2 +- .../src/main/resources/sky-walking.auth | 54 ++++++------------- .../order-application/order-impl/pom.xml | 11 ++-- .../main/resources/context/spring-mybatis.xml | 6 +-- .../src/main/resources/sky-walking.auth | 54 ++++++------------- .../resource-impl/pom.xml | 11 ++-- .../src/main/resources/applicationContext.xml | 19 +++---- .../src/main/resources/sky-walking.auth | 54 ++++++------------- .../web-application/pom.xml | 19 ++++--- .../src/main/resources/applicationcontext.xml | 2 +- .../src/main/resources/sky-walking.auth | 54 ++++++------------- 15 files changed, 148 insertions(+), 231 deletions(-) diff --git a/samples/skywalking-example/account-application/account-impl/pom.xml b/samples/skywalking-example/account-application/account-impl/pom.xml index 5ab81c8e5..035a34078 100644 --- a/samples/skywalking-example/account-application/account-impl/pom.xml +++ b/samples/skywalking-example/account-application/account-impl/pom.xml @@ -136,12 +136,12 @@ com.ai.cloud - spring-plugin + skywalking-spring-plugin 1.0-SNAPSHOT com.ai.cloud - dubbo-plugin + skywalking-dubbo-plugin 1.0-SNAPSHOT @@ -152,16 +152,21 @@ com.ai.cloud - jdbc-plugin + skywalking-jdbc-plugin 1.0-SNAPSHOT com.ai.cloud - httpClient-plugin + skywalking-httpClient-plugin 1.0-SNAPSHOT + + org.aspectj + aspectjweaver + 1.8.7 + diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/applicationContext.xml b/samples/skywalking-example/account-application/account-impl/src/main/resources/applicationContext.xml index dd6c50062..51df427ab 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/applicationContext.xml +++ b/samples/skywalking-example/account-application/account-impl/src/main/resources/applicationContext.xml @@ -1,18 +1,19 @@ - + - - - + + + \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth b/samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth index e638165cf..56af9b7a2 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth +++ b/samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth @@ -1,42 +1,20 @@ -#skyWalking用户ID -skywalking.user_id=2 -#skyWalking应用ID -skywalking.application_code=account-application - -#是否打印数据 -buriedpoint.printf=false -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 +#test +#Mon Dec 28 11:28:47 CST 2015 buriedpoint.businesskey_max_length=300 -buriedpoint.exclusive_exceptions=java.lang.RuntimeException - -#发送的最大长度 -sender.max_send_length=20000 -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#当没有Sender时,尝试获取sender的等待周期 sender.retry_get_sender_wait_interval=2000 -#是否开启发送消息 -sender.is_off=false -#发送服务端配置 -sender.servers_addr=10.1.241.16:34000;10.1.241.16:35000;10.1.241.17:34000;10.1.241.17:35000; -#sender.servers_addr=127.0.0.1:34000; -#最大发送的副本数量 -sender.max_copy_num=2 - -#最大消费线程数 -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 - +sender.is_off=false +sender.max_send_length=20000 +consumer.max_consumer=2 +consumer.max_wait_time=5 +sender.max_copy_num=2 +skywalking.application_code=account-application +consumer.consumer_fail_retry_wait_interval=50 +skywalking.user_id=6 +buriedpoint.printf=false +buriedpoint.exclusive_exceptions= +buriedpoint.max_exception_stack_length=4000 +sender.connect_percent=100 +buffer.buffer_max_size=18000 +sender.servers_addr=127.0.0.1:34000; diff --git a/samples/skywalking-example/mail-application/pom.xml b/samples/skywalking-example/mail-application/pom.xml index da2618285..d51b2e221 100644 --- a/samples/skywalking-example/mail-application/pom.xml +++ b/samples/skywalking-example/mail-application/pom.xml @@ -49,7 +49,7 @@ com.ai.cloud - web-plugin + skywalking-web-plugin 1.0-SNAPSHOT @@ -64,7 +64,7 @@ com.ai.cloud - spring-plugin + skywalking-spring-plugin 1.0-SNAPSHOT @@ -72,6 +72,11 @@ log4j-api 2.4.1 + + org.aspectj + aspectjweaver + 1.8.7 + diff --git a/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml b/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml index d9a1e52d3..6efeafc9d 100644 --- a/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml +++ b/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml @@ -32,5 +32,5 @@ - + \ No newline at end of file diff --git a/samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth b/samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth index fa49855e6..67fc3f012 100644 --- a/samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth +++ b/samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth @@ -1,42 +1,20 @@ -#skyWalking用户ID -skywalking.user_id=2 -#skyWalking应用ID -skywalking.application_code=mail-application - -#是否打印数据 -buriedpoint.printf=false -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 +#test +#Mon Dec 28 11:29:34 CST 2015 buriedpoint.businesskey_max_length=300 -buriedpoint.exclusive_exceptions=java.lang.RuntimeException - -#发送的最大长度 -sender.max_send_length=20000 -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#当没有Sender时,尝试获取sender的等待周期 sender.retry_get_sender_wait_interval=2000 -#是否开启发送消息 -sender.is_off=false -#发送服务端配置 -sender.servers_addr=10.1.241.16:34000;10.1.241.16:35000;10.1.241.17:34000;10.1.241.17:35000; -#sender.servers_addr=127.0.0.1:34000; -#最大发送的副本数量 -sender.max_copy_num=2 - -#最大消费线程数 -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 - +sender.is_off=false +sender.max_send_length=20000 +consumer.max_consumer=2 +consumer.max_wait_time=5 +sender.max_copy_num=2 +skywalking.application_code=mail-application +consumer.consumer_fail_retry_wait_interval=50 +skywalking.user_id=6 +buriedpoint.printf=false +buriedpoint.exclusive_exceptions= +buriedpoint.max_exception_stack_length=4000 +sender.connect_percent=100 +buffer.buffer_max_size=18000 +sender.servers_addr=127.0.0.1:34000; diff --git a/samples/skywalking-example/order-application/order-impl/pom.xml b/samples/skywalking-example/order-application/order-impl/pom.xml index 7345159d4..aa669b6fe 100644 --- a/samples/skywalking-example/order-application/order-impl/pom.xml +++ b/samples/skywalking-example/order-application/order-impl/pom.xml @@ -123,12 +123,12 @@ com.ai.cloud - spring-plugin + skywalking-spring-plugin 1.0-SNAPSHOT com.ai.cloud - dubbo-plugin + skywalking-dubbo-plugin 1.0-SNAPSHOT @@ -143,9 +143,14 @@ com.ai.cloud - jdbc-plugin + skywalking-jdbc-plugin 1.0-SNAPSHOT + + org.aspectj + aspectjweaver + 1.8.7 + diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/context/spring-mybatis.xml b/samples/skywalking-example/order-application/order-impl/src/main/resources/context/spring-mybatis.xml index b6fee95f5..700195e33 100644 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/context/spring-mybatis.xml +++ b/samples/skywalking-example/order-application/order-impl/src/main/resources/context/spring-mybatis.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://cloud.asiainfo.com/schema/skywalking http://cloud.asiainfo.com/schema/skywalking/skywalking.xsd"> - + @@ -56,7 +56,7 @@ - - + + \ No newline at end of file diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth b/samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth index 00d29b60d..0a243cbc3 100644 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth +++ b/samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth @@ -1,42 +1,20 @@ -#skyWalking用户ID -skywalking.user_id=2 -#skyWalking应用ID -skywalking.application_code=order-application - -#是否打印数据 -buriedpoint.printf=false -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 +#test +#Mon Dec 28 11:30:29 CST 2015 buriedpoint.businesskey_max_length=300 -buriedpoint.exclusive_exceptions=java.lang.RuntimeException - -#发送的最大长度 -sender.max_send_length=20000 -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#当没有Sender时,尝试获取sender的等待周期 sender.retry_get_sender_wait_interval=2000 -#是否开启发送消息 -sender.is_off=false -#发送服务端配置 -sender.servers_addr=10.1.241.16:34000;10.1.241.16:35000;10.1.241.17:34000;10.1.241.17:35000; -#sender.servers_addr=127.0.0.1:34000; -#最大发送的副本数量 -sender.max_copy_num=2 - -#最大消费线程数 -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 - +sender.is_off=false +sender.max_send_length=20000 +consumer.max_consumer=2 +consumer.max_wait_time=5 +sender.max_copy_num=2 +skywalking.application_code=order-application +consumer.consumer_fail_retry_wait_interval=50 +skywalking.user_id=6 +buriedpoint.printf=false +buriedpoint.exclusive_exceptions= +buriedpoint.max_exception_stack_length=4000 +sender.connect_percent=100 +buffer.buffer_max_size=18000 +sender.servers_addr=127.0.0.1:34000; diff --git a/samples/skywalking-example/resources-application/resource-impl/pom.xml b/samples/skywalking-example/resources-application/resource-impl/pom.xml index 980f3f933..d96dad3f7 100644 --- a/samples/skywalking-example/resources-application/resource-impl/pom.xml +++ b/samples/skywalking-example/resources-application/resource-impl/pom.xml @@ -89,19 +89,24 @@ com.ai.cloud - spring-plugin + skywalking-spring-plugin 1.0-SNAPSHOT com.ai.cloud - dubbo-plugin + skywalking-dubbo-plugin 1.0-SNAPSHOT com.ai.cloud - jdbc-plugin + skywalking-jdbc-plugin 1.0-SNAPSHOT + + org.aspectj + aspectjweaver + 1.8.7 + diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/applicationContext.xml b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/applicationContext.xml index 0a66e8135..1cba6e657 100644 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/applicationContext.xml +++ b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/applicationContext.xml @@ -1,17 +1,18 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth index 350fee52b..d7a35d2df 100644 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth +++ b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth @@ -1,42 +1,20 @@ -#skyWalking用户ID -skywalking.user_id=2 -#skyWalking应用ID -skywalking.application_code=resource-application - -#是否打印数据 -buriedpoint.printf=false -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 +#test +#Mon Dec 28 11:31:03 CST 2015 buriedpoint.businesskey_max_length=300 -buriedpoint.exclusive_exceptions=java.lang.RuntimeException - -#发送的最大长度 -sender.max_send_length=20000 -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#当没有Sender时,尝试获取sender的等待周期 sender.retry_get_sender_wait_interval=2000 -#是否开启发送消息 -sender.is_off=false -#发送服务端配置 -sender.servers_addr=10.1.241.16:34000;10.1.241.16:35000;10.1.241.17:34000;10.1.241.17:35000; -#sender.servers_addr=127.0.0.1:34000; -#最大发送的副本数量 -sender.max_copy_num=2 - -#最大消费线程数 -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 - +sender.is_off=false +sender.max_send_length=20000 +consumer.max_consumer=2 +consumer.max_wait_time=5 +sender.max_copy_num=2 +skywalking.application_code=resource-application +consumer.consumer_fail_retry_wait_interval=50 +skywalking.user_id=6 +buriedpoint.printf=false +buriedpoint.exclusive_exceptions= +buriedpoint.max_exception_stack_length=4000 +sender.connect_percent=100 +buffer.buffer_max_size=18000 +sender.servers_addr=127.0.0.1:34000; diff --git a/samples/skywalking-example/web-application/pom.xml b/samples/skywalking-example/web-application/pom.xml index 3659934f7..6c0e537ce 100644 --- a/samples/skywalking-example/web-application/pom.xml +++ b/samples/skywalking-example/web-application/pom.xml @@ -81,19 +81,19 @@ com.ai.cloud - web-plugin + skywalking-web-plugin 1.0-SNAPSHOT com.ai.cloud - dubbo-plugin + skywalking-dubbo-plugin 1.0-SNAPSHOT com.ai.cloud - spring-plugin + skywalking-spring-plugin 1.0-SNAPSHOT @@ -102,12 +102,17 @@ skywalking-example-order-interfaces 1.0-SNAPSHOT - - com.ai.cloud - skywalking-auth - 1.0-SNAPSHOT + org.aspectj + aspectjweaver + 1.8.7 + + + + + + diff --git a/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml b/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml index f7e58a4a1..f70bd535b 100644 --- a/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml +++ b/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml @@ -33,5 +33,5 @@ - + \ No newline at end of file diff --git a/samples/skywalking-example/web-application/src/main/resources/sky-walking.auth b/samples/skywalking-example/web-application/src/main/resources/sky-walking.auth index 6b531b07d..25678c2b5 100644 --- a/samples/skywalking-example/web-application/src/main/resources/sky-walking.auth +++ b/samples/skywalking-example/web-application/src/main/resources/sky-walking.auth @@ -1,42 +1,20 @@ -#skyWalking用户ID -skywalking.user_id=2 -#skyWalking应用ID -skywalking.application_code=web-application - -#是否打印数据 -buriedpoint.printf=false -#埋点异常的最大长度 -buriedpoint.max_exception_stack_length=4000 -#业务字段的最大长度 +#test +#Mon Dec 28 11:30:00 CST 2015 buriedpoint.businesskey_max_length=300 -buriedpoint.exclusive_exceptions= - -#发送的最大长度 -sender.max_send_length=20000 -#最大发送者的连接数阀比例 -sender.connect_percent=100 -#当没有Sender时,尝试获取sender的等待周期 sender.retry_get_sender_wait_interval=2000 -#是否开启发送消息 -sender.is_off=false -#发送服务端配置 -sender.servers_addr=10.1.241.16:34000;10.1.241.16:35000;10.1.241.17:34000;10.1.241.17:35000; -#sender.servers_addr=127.0.0.1:34000; -#最大发送的副本数量 -sender.max_copy_num=2 - -#最大消费线程数 -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 - +sender.is_off=false +sender.max_send_length=20000 +consumer.max_consumer=2 +consumer.max_wait_time=5 +sender.max_copy_num=2 +skywalking.application_code=web-application +consumer.consumer_fail_retry_wait_interval=50 +skywalking.user_id=6 +buriedpoint.printf=false +buriedpoint.exclusive_exceptions= +buriedpoint.max_exception_stack_length=4000 +sender.connect_percent=100 +buffer.buffer_max_size=18000 +sender.servers_addr=127.0.0.1:34000;