From 064d1d4198532dee997dfa6f41772dfa53ed77f5 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Tue, 19 Jan 2016 11:23:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9Pom=E4=BE=9D=E8=B5=96.?= =?UTF-8?q?=202.=20=E6=B7=BB=E5=8A=A0Log=E6=8F=92=E4=BB=B6=203.=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9HttpClient=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account-application/account-impl/pom.xml | 12 ++++- .../example/account/util/HttpClientUtil.java | 2 +- .../src/main/resources/log4j.properties | 4 +- .../src/main/resources/log4j2.xml | 2 +- .../src/main/resources/sky-walking.auth | 3 +- .../mail-application/pom.xml | 5 ++ .../src/main/resources/log4j.properties | 4 +- .../src/main/resources/sky-walking.auth | 3 +- .../order-application/order-impl/pom.xml | 5 ++ .../example/order/impl/OrderMaintainImpl.java | 2 +- .../src/main/resources/log4j.properties | 4 +- .../src/main/resources/sky-walking.auth | 3 +- .../resource-impl/pom.xml | 10 ++++ .../src/main/resources/log4j.xml | 4 +- .../src/main/resources/log4j2.xml | 2 +- .../src/main/resources/sky-walking.auth | 3 +- .../web-application/pom.xml | 11 +++-- .../src/main/resources/applicationcontext.xml | 46 ++++++++++--------- .../src/main/resources/log4j.properties | 4 +- .../src/main/resources/sky-walking.auth | 3 +- 20 files changed, 87 insertions(+), 45 deletions(-) diff --git a/samples/skywalking-example/account-application/account-impl/pom.xml b/samples/skywalking-example/account-application/account-impl/pom.xml index 035a34078..207671d01 100644 --- a/samples/skywalking-example/account-application/account-impl/pom.xml +++ b/samples/skywalking-example/account-application/account-impl/pom.xml @@ -159,7 +159,7 @@ com.ai.cloud - skywalking-httpClient-plugin + skywalking-httpClient-4.2.x-plugin 1.0-SNAPSHOT @@ -167,6 +167,16 @@ aspectjweaver 1.8.7 + + com.ai.cloud + skywalking-log4j-1.x-plugin + 1.0-SNAPSHOT + + + com.ai.cloud + skywalking-log4j-2.x-plugin + 1.0-SNAPSHOT + diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java index 49e32f048..dc8f671f8 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java +++ b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java @@ -1,6 +1,6 @@ package com.ai.cloud.skywalking.example.account.util; -import com.ai.cloud.skywalking.plugin.httpclient.SWTracingHttpClient; +import com.ai.cloud.skywalking.plugin.httpclient.v42x.SWTracingHttpClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpEntity; diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties b/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties index deb26a28d..e0cf7f9c7 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties +++ b/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties @@ -5,8 +5,8 @@ log4j.rootLogger=INFO, A1 #log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n +log4j.appender.A1.layout=com.ai.cloud.skywalking.plugin.log.log4j.v1.x.TraceIdPatternLayout +log4j.appender.A1.layout.ConversionPattern=[%x] %-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n log4j.logger.com.ailk=DEBUG log4j.logger.org.springframework=DEBUG \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml b/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml index 025d5b2fb..c26c51acc 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml +++ b/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml @@ -2,7 +2,7 @@ - + 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 56af9b7a2..d334a01a2 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 @@ -17,4 +17,5 @@ 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; +sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000; +skywalking.sdk_version=1.0a2 diff --git a/samples/skywalking-example/mail-application/pom.xml b/samples/skywalking-example/mail-application/pom.xml index d51b2e221..fe435d927 100644 --- a/samples/skywalking-example/mail-application/pom.xml +++ b/samples/skywalking-example/mail-application/pom.xml @@ -77,6 +77,11 @@ aspectjweaver 1.8.7 + + com.ai.cloud + skywalking-log4j-1.x-plugin + 1.0-SNAPSHOT + diff --git a/samples/skywalking-example/mail-application/src/main/resources/log4j.properties b/samples/skywalking-example/mail-application/src/main/resources/log4j.properties index 1523a2c2c..1cc7dc0c6 100644 --- a/samples/skywalking-example/mail-application/src/main/resources/log4j.properties +++ b/samples/skywalking-example/mail-application/src/main/resources/log4j.properties @@ -5,5 +5,5 @@ log4j.rootLogger=DEBUG, A1 #log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n +log4j.appender.A1.layout=com.ai.cloud.skywalking.plugin.log.log4j.v1.x.TraceIdPatternLayout +log4j.appender.A1.layout.ConversionPattern=%x %-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n 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 67fc3f012..5f84b6979 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 @@ -17,4 +17,5 @@ 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; +sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000; +skywalking.sdk_version=1.0a2 \ No newline at end of file diff --git a/samples/skywalking-example/order-application/order-impl/pom.xml b/samples/skywalking-example/order-application/order-impl/pom.xml index aa669b6fe..06eaad1db 100644 --- a/samples/skywalking-example/order-application/order-impl/pom.xml +++ b/samples/skywalking-example/order-application/order-impl/pom.xml @@ -151,6 +151,11 @@ aspectjweaver 1.8.7 + + com.ai.cloud + skywalking-log4j-1.x-plugin + 1.0-SNAPSHOT + diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java index 81ed48e9c..fd5f8bd9b 100644 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java +++ b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java @@ -48,7 +48,7 @@ public class OrderMaintainImpl implements IOrderMaintain { } return orderManage.saveOrder(orderInfo); } else { - throw new BusinessException("Resource check failed, please mail to Administrator"); + throw new BusinessException("请联系管理员"); } } } diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties b/samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties index deb26a28d..7540c6a39 100644 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties +++ b/samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties @@ -5,8 +5,8 @@ log4j.rootLogger=INFO, A1 #log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n +log4j.appender.A1.layout=com.ai.cloud.skywalking.plugin.log.log4j.v1.x.TraceIdPatternLayout +log4j.appender.A1.layout.ConversionPattern=%x %-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n log4j.logger.com.ailk=DEBUG log4j.logger.org.springframework=DEBUG \ 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 0a243cbc3..b620af0ee 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 @@ -17,4 +17,5 @@ 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; +sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000; +skywalking.sdk_version=1.0a2 \ No newline at end of file diff --git a/samples/skywalking-example/resources-application/resource-impl/pom.xml b/samples/skywalking-example/resources-application/resource-impl/pom.xml index d96dad3f7..60a129ff5 100644 --- a/samples/skywalking-example/resources-application/resource-impl/pom.xml +++ b/samples/skywalking-example/resources-application/resource-impl/pom.xml @@ -107,6 +107,16 @@ aspectjweaver 1.8.7 + + com.ai.cloud + skywalking-log4j-1.x-plugin + 1.0-SNAPSHOT + + + com.ai.cloud + skywalking-log4j-2.x-plugin + 1.0-SNAPSHOT + diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml index 0da28a6d5..020ea5baf 100644 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml +++ b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml @@ -4,9 +4,9 @@ - + + value="%x %d - %c -%-4r [%t] %-5p %x - %m%n" /> diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml index 025d5b2fb..81c5c2fa8 100644 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml +++ b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml @@ -2,7 +2,7 @@ - + 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 d7a35d2df..6dcf7f7cf 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 @@ -17,4 +17,5 @@ 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; +sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000; +skywalking.sdk_version=1.0a2 \ No newline at end of file diff --git a/samples/skywalking-example/web-application/pom.xml b/samples/skywalking-example/web-application/pom.xml index 6c0e537ce..9be84bc51 100644 --- a/samples/skywalking-example/web-application/pom.xml +++ b/samples/skywalking-example/web-application/pom.xml @@ -109,10 +109,15 @@ - - - + + + + + com.ai.cloud + skywalking-log4j-1.x-plugin + 1.0-SNAPSHOT + 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 f70bd535b..6bb17d179 100644 --- a/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml +++ b/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml @@ -1,8 +1,10 @@ - - - - - + + + + + - - + + - - - - - - - + + + + + + + - - + + \ No newline at end of file diff --git a/samples/skywalking-example/web-application/src/main/resources/log4j.properties b/samples/skywalking-example/web-application/src/main/resources/log4j.properties index 1523a2c2c..1cc7dc0c6 100644 --- a/samples/skywalking-example/web-application/src/main/resources/log4j.properties +++ b/samples/skywalking-example/web-application/src/main/resources/log4j.properties @@ -5,5 +5,5 @@ log4j.rootLogger=DEBUG, A1 #log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n log4j.appender.A1=org.apache.log4j.ConsoleAppender -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n +log4j.appender.A1.layout=com.ai.cloud.skywalking.plugin.log.log4j.v1.x.TraceIdPatternLayout +log4j.appender.A1.layout.ConversionPattern=%x %-d{yyyy-MM-dd HH:mm:ss.SSS} %c %n[%p] %n%m%n 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 25678c2b5..533edb6ac 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 @@ -17,4 +17,5 @@ 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; +sender.servers_addr=10.1.235.197:34000;10.1.235.197:35000; +skywalking.sdk_version=1.0a2 \ No newline at end of file