From 91b59f538ab3fd6ac2f6098859cfeca153c8561c Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Tue, 22 Dec 2015 10:37:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=88=A0=E9=99=A4@Tracing=E6=A0=87?= =?UTF-8?q?=E6=B3=A8=EF=BC=8C=E5=B9=B6=E6=94=B9=E4=B8=BA=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84Spring-plugin=E9=85=8D=E7=BD=AE=202.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9mail=E7=9A=84=E5=8F=91=E9=80=81=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AccountMaintainServiceImpl.java | 2 - .../example/account/util/HttpClientUtil.java | 2 - .../src/main/resources/applicationContext.xml | 19 ++++--- .../example/mail/util/SendeUtil.java | 6 +-- .../src/main/resources/applicationcontext.xml | 10 ++-- .../src/main/resources/mail/mail.config | 2 +- .../order/service/impl/OrderManageImpl.java | 11 ++-- .../main/resources/context/spring-mybatis.xml | 10 +++- .../dubbo/impl/ResourceCheckImpl.java | 6 +-- .../service/impl/ResourceManageImpl.java | 14 +++-- .../src/main/resources/applicationContext.xml | 22 ++++---- .../controller/OrderSaveController.java | 23 ++++++--- .../src/main/resources/applicationcontext.xml | 51 +++++++++---------- 13 files changed, 93 insertions(+), 85 deletions(-) diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/impl/AccountMaintainServiceImpl.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/impl/AccountMaintainServiceImpl.java index efb8391b8..04d0a8ced 100644 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/impl/AccountMaintainServiceImpl.java +++ b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/impl/AccountMaintainServiceImpl.java @@ -5,7 +5,6 @@ import com.ai.cloud.skywalking.example.account.dao.mapper.interfaces.TAccountMap import com.ai.cloud.skywalking.example.account.dubbo.interfaces.param.AccountInfo; import com.ai.cloud.skywalking.example.account.exception.BusinessException; import com.ai.cloud.skywalking.example.account.manage.IAccountMaintainService; -import com.ai.cloud.skywalking.plugin.spring.Tracing; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.mybatis.spring.SqlSessionTemplate; @@ -23,7 +22,6 @@ public class AccountMaintainServiceImpl implements IAccountMaintainService { private SqlSessionTemplate sqlSessionTemplate; @Override - @Tracing public boolean createAccount(AccountInfo accountInfo) throws BusinessException { if (accountInfo.getPhoneNumber() == null || accountInfo.getPhoneNumber().length() <= 0) { throw new BusinessException("Phone number cannot be null"); 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 93efaab91..49e32f048 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,7 +1,6 @@ package com.ai.cloud.skywalking.example.account.util; import com.ai.cloud.skywalking.plugin.httpclient.SWTracingHttpClient; -import com.ai.cloud.skywalking.plugin.spring.Tracing; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpEntity; @@ -24,7 +23,6 @@ import java.util.Map; public class HttpClientUtil { private static final Log logger = LogFactory.getLog(HttpClientUtil.class); - @Tracing public static String sendPostRequest(String url, Map parametersMap) throws IOException, URISyntaxException { HttpClient httpclient = new SWTracingHttpClient(new DefaultHttpClient()); HttpPost httpPost = new HttpPost(new URL(url).toURI()); 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 d4d8ecfb5..dd6c50062 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,13 +1,18 @@ + http://www.springframework.org/schema/context/spring-context-3.0.xsd + http://cloud.asiainfo.com/schema/skywalking + http://cloud.asiainfo.com/schema/skywalking/skywalking.xsd"> - - - + + + + + \ No newline at end of file diff --git a/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/util/SendeUtil.java b/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/util/SendeUtil.java index 102c44ccc..edb608be8 100644 --- a/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/util/SendeUtil.java +++ b/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/util/SendeUtil.java @@ -1,6 +1,7 @@ package com.ai.cloud.skywalking.example.mail.util; -import com.ai.cloud.skywalking.plugin.spring.Tracing; +import java.io.IOException; +import java.util.Properties; import javax.mail.Message; import javax.mail.MessagingException; @@ -8,12 +9,9 @@ import javax.mail.Session; import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import java.io.IOException; -import java.util.Properties; public class SendeUtil { - @Tracing public static boolean sendeMail(String recipientAccount) { try { Properties prop = new Properties(); 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 cf5936c43..d9a1e52d3 100644 --- a/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml +++ b/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml @@ -3,16 +3,15 @@ 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 http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> - - - + 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"> @@ -33,4 +32,5 @@ + \ No newline at end of file diff --git a/samples/skywalking-example/mail-application/src/main/resources/mail/mail.config b/samples/skywalking-example/mail-application/src/main/resources/mail/mail.config index 6b968bf65..74fd41690 100644 --- a/samples/skywalking-example/mail-application/src/main/resources/mail/mail.config +++ b/samples/skywalking-example/mail-application/src/main/resources/mail/mail.config @@ -2,5 +2,5 @@ mail.host=mail.asiainfo.com mail.transport.protocol=smtp mail.smtp.auth=true mail.username=zhangxin10 -mail.password=!qaz2wsx +mail.password=3nj0yBV mail.account.prefix=@asiainfo.com \ No newline at end of file diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/impl/OrderManageImpl.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/impl/OrderManageImpl.java index a962b9ba6..38bb7caa4 100644 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/impl/OrderManageImpl.java +++ b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/impl/OrderManageImpl.java @@ -1,15 +1,15 @@ package com.ai.cloud.skywalking.example.order.service.impl; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import com.ai.cloud.skywalking.example.order.dao.mapper.bo.TOrder; import com.ai.cloud.skywalking.example.order.dao.mapper.interfaces.TOrderMapper; import com.ai.cloud.skywalking.example.order.interfaces.parameter.OrderInfo; import com.ai.cloud.skywalking.example.order.service.IOrderManage; import com.ai.cloud.skywalking.example.order.util.OrderIdGenerator; -import com.ai.cloud.skywalking.plugin.spring.Tracing; -import org.mybatis.spring.SqlSessionTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @Transactional @@ -19,7 +19,6 @@ public class OrderManageImpl implements IOrderManage { private SqlSessionTemplate sqlSessionTemplate; @Override - @Tracing public String saveOrder(OrderInfo orderInfo) { String orderId = OrderIdGenerator.generate(); TOrderMapper iOrderMapper = sqlSessionTemplate.getMapper(TOrderMapper.class); 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 2991bbb1f..b6fee95f5 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 @@ -2,11 +2,14 @@ - + 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"> + @@ -53,4 +56,7 @@ + + + \ No newline at end of file diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/impl/ResourceCheckImpl.java b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/impl/ResourceCheckImpl.java index ecde572b7..9a4270c35 100644 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/impl/ResourceCheckImpl.java +++ b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/impl/ResourceCheckImpl.java @@ -1,11 +1,11 @@ package com.ai.cloud.skywalking.example.resource.dubbo.impl; +import org.springframework.beans.factory.annotation.Autowired; + import com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker.IResourceCheck; import com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker.param.ResourceInfo; import com.ai.cloud.skywalking.example.resource.service.IResourceManage; -import com.ai.cloud.skywalking.plugin.spring.Tracing; import com.alibaba.dubbo.config.annotation.Service; -import org.springframework.beans.factory.annotation.Autowired; @Service public class ResourceCheckImpl implements IResourceCheck { @@ -14,12 +14,10 @@ public class ResourceCheckImpl implements IResourceCheck { private IResourceManage resourceManage; @Override - @Tracing public boolean checkResource(ResourceInfo info) { return resourceManage.checkResource(info); } - @Tracing public boolean reservationResource(ResourceInfo info) { return resourceManage.reservationResource(info); } diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/impl/ResourceManageImpl.java b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/impl/ResourceManageImpl.java index 74b6fa566..0bb38ed88 100644 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/impl/ResourceManageImpl.java +++ b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/impl/ResourceManageImpl.java @@ -1,12 +1,12 @@ package com.ai.cloud.skywalking.example.resource.service.impl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + import com.ai.cloud.skywalking.example.resource.dao.ResourceDAO; import com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker.param.ResourceInfo; import com.ai.cloud.skywalking.example.resource.exception.BusinessException; import com.ai.cloud.skywalking.example.resource.service.IResourceManage; -import com.ai.cloud.skywalking.plugin.spring.Tracing; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; @Component public class ResourceManageImpl implements IResourceManage { @@ -16,20 +16,18 @@ public class ResourceManageImpl implements IResourceManage { @Override - @Tracing public boolean checkResource(ResourceInfo resourceInfo) throws BusinessException { return checkPhoneNumber(resourceInfo.getPhoneNumber()) && checkResourceId(resourceInfo.getResourceId()) && checkPhonePackage(resourceInfo.getPhonePackage()); } @Override - @Tracing public boolean reservationResource(ResourceInfo resourceInfo) { return resourceDAO.updatePhoneNumberStatus(resourceInfo.getPhoneNumber()) && resourceDAO.updateResourceStatus(resourceInfo.getResourceId()); } - @Tracing + public boolean checkPhoneNumber(String phoneNumber) throws BusinessException { if (resourceDAO.selectPhoneNumberStatus(phoneNumber) == null) { throw new BusinessException("Cannot find phone number[" + phoneNumber + "]"); @@ -43,7 +41,7 @@ public class ResourceManageImpl implements IResourceManage { } - @Tracing + public boolean checkResourceId(String resourceId) throws BusinessException { if (resourceDAO.selectResourceStatus(resourceId) == null) { throw new BusinessException("Cannot find resourceId[" + resourceId + "]"); @@ -56,7 +54,7 @@ public class ResourceManageImpl implements IResourceManage { } } - @Tracing + public boolean checkPhonePackage(String packageId) throws BusinessException { if (resourceDAO.selectResourceStatus(packageId) == null) { throw new BusinessException("Cannot find package Id[" + packageId + "]"); 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 1e0ef1183..0a66e8135 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,15 +1,17 @@ - - - - - + http://www.springframework.org/schema/context/spring-context-3.0.xsd + http://cloud.asiainfo.com/schema/skywalking + http://cloud.asiainfo.com/schema/skywalking/skywalking.xsd"> + + + + + + \ No newline at end of file diff --git a/samples/skywalking-example/web-application/src/main/java/com/ai/cloud/skywalking/example/controller/OrderSaveController.java b/samples/skywalking-example/web-application/src/main/java/com/ai/cloud/skywalking/example/controller/OrderSaveController.java index f9bbdfa7c..13ce523bc 100644 --- a/samples/skywalking-example/web-application/src/main/java/com/ai/cloud/skywalking/example/controller/OrderSaveController.java +++ b/samples/skywalking-example/web-application/src/main/java/com/ai/cloud/skywalking/example/controller/OrderSaveController.java @@ -1,15 +1,19 @@ package com.ai.cloud.skywalking.example.controller; -import com.ai.cloud.skywalking.api.BusinessKeyAppender; -import com.ai.cloud.skywalking.example.order.interfaces.IOrderMaintain; -import com.ai.cloud.skywalking.example.order.interfaces.parameter.OrderInfo; -import com.ai.cloud.skywalking.plugin.spring.Tracing; -import com.alibaba.dubbo.config.annotation.Reference; +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; +import com.ai.cloud.skywalking.api.BusinessKeyAppender; +import com.ai.cloud.skywalking.example.order.interfaces.IOrderMaintain; +import com.ai.cloud.skywalking.example.order.interfaces.parameter.OrderInfo; +import com.alibaba.dubbo.config.annotation.Reference; @Controller @RequestMapping("/order") @@ -18,8 +22,10 @@ public class OrderSaveController { @Reference private IOrderMaintain orderMaintain; + @Autowired + private ApplicationContext applicationContext; + @RequestMapping("/save") - @Tracing public ModelAndView save(HttpServletRequest req) { String phoneNumber = req.getParameter("phoneNumber"); String resourceId = req.getParameter("resourceId"); @@ -27,7 +33,7 @@ public class OrderSaveController { String mail = req.getParameter("mail"); String businessKey = "phoneNumber:" + phoneNumber + ",resourceId:" + resourceId + ",mail:" + mail; - BusinessKeyAppender.setBusinessKey2Trace(businessKey); + BusinessKeyAppender.setBusinessKey2Trace(businessKey); OrderInfo orderInfo = new OrderInfo(); orderInfo.setResourceId(resourceId); @@ -39,4 +45,5 @@ public class OrderSaveController { ModelAndView view = new ModelAndView("order/saveOrderResult"); return view; } + } 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 d8d802e95..f7e58a4a1 100644 --- a/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml +++ b/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml @@ -1,38 +1,37 @@ + 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"> + + + - - - - - - - - + + - - + + - - - - - - - + + + + + + + - + + \ No newline at end of file