kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修改Pom依赖. 

2. 添加Log插件
3. 修改HttpClient插件
This commit is contained in:
zhangxin10 2016-01-19 11:23:41 +08:00
parent ab08ff1226
commit 064d1d4198
20 changed files with 87 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/skywalking-example/account-application/account-impl/pom.xml
View File

@ -159,7 +159,7 @@
<!-- -->
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-httpClient-plugin</artifactId>
<artifactId>skywalking-httpClient-4.2.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@ -167,6 +167,16 @@
<artifactId>aspectjweaver</artifactId>
<version>1.8.7</version>
</dependency>
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-1.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-2.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

2
samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java
View File

@ -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;

4
samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties
View File

@ -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

2
samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml
View File

@ -2,7 +2,7 @@
<Configuration status="debug">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
<PatternLayout pattern="[%tid] %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>

3
samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth
View File

@ -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

5
samples/skywalking-example/mail-application/pom.xml
View File

@ -77,6 +77,11 @@
<artifactId>aspectjweaver</artifactId>
<version>1.8.7</version>
</dependency>
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-1.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

4
samples/skywalking-example/mail-application/src/main/resources/log4j.properties
View File

@ -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

3
samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth
View File

@ -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

5
samples/skywalking-example/order-application/order-impl/pom.xml
View File

@ -151,6 +151,11 @@
<artifactId>aspectjweaver</artifactId>
<version>1.8.7</version>
</dependency>
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-1.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

2
samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java
View File

@ -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("请联系管理员");
}
}
}

4
samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties
View File

@ -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

3
samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth
View File

@ -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

10
samples/skywalking-example/resources-application/resource-impl/pom.xml
View File

@ -107,6 +107,16 @@
<artifactId>aspectjweaver</artifactId>
<version>1.8.7</version>
</dependency>
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-1.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-2.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

4
samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml
View File

@ -4,9 +4,9 @@
<log4j:configuration>
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<layout class="com.ai.cloud.skywalking.plugin.log.log4j.v1.x.TraceIdPatternLayout">
<param name="ConversionPattern"
value="%d - %c -%-4r [%t] %-5p %x - %m%n" />
value="%x %d - %c -%-4r [%t] %-5p %x - %m%n" />
</layout>
</appender>

2
samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml
View File

@ -2,7 +2,7 @@
<Configuration status="debug">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
<PatternLayout pattern="%tid %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>

3
samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth
View File

@ -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

11
samples/skywalking-example/web-application/pom.xml
View File

@ -109,10 +109,15 @@
</dependency>
<!-- addAuth -->
<!--<dependency>-->
<!--<groupId>com.ai.cloud</groupId>-->
<!--<artifactId>skywalking-auth</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--<groupId>com.ai.cloud</groupId>-->
<!--<artifactId>skywalking-auth</artifactId>-->
<!--<version>1.0-SNAPSHOT</version>-->
<!--</dependency>-->
<dependency>
<groupId>com.ai.cloud</groupId>
<artifactId>skywalking-log4j-1.x-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>

46
samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml
View File

@ -1,8 +1,10 @@
<?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:mvc="http://www.springframework.org/schema/mvc" xmlns:skywalking="http://cloud.asiainfo.com/schema/skywalking"
xsi:schemaLocation="http://www.springframework.org/schema/beans
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:skywalking="http://cloud.asiainfo.com/schema/skywalking"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd
@ -10,28 +12,28 @@
http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
http://cloud.asiainfo.com/schema/skywalking
http://cloud.asiainfo.com/schema/skywalking/skywalking.xsd">
<!-- 默认的注解映射的支持 -->
<mvc:annotation-driven />
<!-- 设置使用注解的类所在的jar包 ,当使用 <context:component-scan/> 后，就可以将 <context:annotation-config/>
移除了 -->
<context:component-scan base-package="com.ai.cloud.skywalking.example.controller" />
<!-- 默认的注解映射的支持 -->
<mvc:annotation-driven/>
<!-- 设置使用注解的类所在的jar包 ,当使用 <context:component-scan/> 后，就可以将 <context:annotation-config/>
移除了 -->
<context:component-scan base-package="com.ai.cloud.skywalking.example.controller"/>
<!-- 完成请求和注解POJO的映射 -->
<!--<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/> -->
<!-- 完成请求和注解POJO的映射 -->
<!--<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/> -->
<bean
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/jsp/" />
<property name="suffix" value=".jsp" />
<property name="viewClass"
value="org.springframework.web.servlet.view.JstlView" />
</bean>
<!-- 对静态资源文件的访问 -->
<mvc:default-servlet-handler />
<bean
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/jsp/"/>
<property name="suffix" value=".jsp"/>
<property name="viewClass"
value="org.springframework.web.servlet.view.JstlView"/>
</bean>
<!-- 对静态资源文件的访问 -->
<mvc:default-servlet-handler/>
<import resource="consumer/dubbo-consumer.xml" />
<skywalking:trace classExpression="*" method="save" packageExpression="com.ai.cloud.skywalking.example.controller"/>
<import resource="consumer/dubbo-consumer.xml"/>
<skywalking:trace classExpression="*" packageExpression="com.ai.cloud.skywalking.example.controller..*"/>
</beans>

4
samples/skywalking-example/web-application/src/main/resources/log4j.properties
View File

@ -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

3
samples/skywalking-example/web-application/src/main/resources/sky-walking.auth
View File

@ -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