From 00a5cb9aebd86fd04864941475ca3c65307ef1e4 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Thu, 28 Jul 2016 07:59:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=A7=BB=E9=99=A4Sample=E5=B7=A5=E7=A8=8B=20?= =?UTF-8?q?2.=20=E5=B0=86SkywalkingAgent=E9=87=87=E7=94=A8ByteBuddy?= =?UTF-8?q?=E7=9A=84Agent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account-application/account-impl/pom.xml | 202 ------- .../account/dao/mapper/bo/TAccount.java | 33 -- .../dao/mapper/bo/TAccountCriteria.java | 420 ------------- .../dao/mapper/interfaces/TAccountMapper.java | 30 - .../dubbo/impl/AccountMaintainImpl.java | 67 --- .../account/exception/BusinessException.java | 12 - .../manage/IAccountMaintainService.java | 8 - .../impl/AccountMaintainServiceImpl.java | 44 -- .../account/model/CommonsHttpResult.java | 22 - .../example/account/util/DubboStart.java | 16 - .../example/account/util/HttpClientUtil.java | 50 -- .../src/main/resources/applicationContext.xml | 19 - .../main/resources/context/jdbc.properties | 8 - .../main/resources/context/spring-mybatis.xml | 55 -- .../src/main/resources/log4j.properties | 12 - .../src/main/resources/log4j2.xml | 13 - .../mybatis/mapper/TAccountMapper.xml | 181 ------ .../src/main/resources/mysql.db.sql | 7 - .../src/main/resources/provider/provider.xml | 14 - .../src/main/resources/sky-walking.auth | 21 - .../account-interfaces/pom.xml | 86 --- .../dubbo/interfaces/IAccountMaintain.java | 20 - .../dubbo/interfaces/param/AccountInfo.java | 36 -- .../account-application/pom.xml | 51 -- .../mail-application/pom.xml | 101 ---- .../mail/controller/MaillController.java | 52 -- .../example/mail/util/SendeUtil.java | 51 -- .../src/main/resources/applicationcontext.xml | 36 -- .../src/main/resources/log4j.properties | 9 - .../src/main/resources/mail/mail.config | 6 - .../src/main/resources/sky-walking.auth | 21 - .../src/main/webapp/WEB-INF/web.xml | 49 -- .../order-application/order-impl/pom.xml | 181 ------ .../example/order/dao/mapper/bo/TOrder.java | 53 -- .../order/dao/mapper/bo/TOrderCriteria.java | 550 ------------------ .../dao/mapper/interfaces/TOrderMapper.java | 30 - .../order/exception/BusinessException.java | 8 - .../example/order/impl/OrderMaintainImpl.java | 54 -- .../order/model/CommonsHttpResult.java | 22 - .../example/order/service/IOrderManage.java | 7 - .../order/service/impl/OrderManageImpl.java | 34 -- .../example/order/util/DubboStart.java | 16 - .../example/order/util/OrderIdGenerator.java | 9 - .../resources/consumer/dubbo-consumer.xml | 10 - .../main/resources/context/jdbc.properties | 8 - .../main/resources/context/spring-mybatis.xml | 62 -- .../src/main/resources/log4j.properties | 12 - .../resources/mybatis/mapper/TOrderMapper.xml | 207 ------- .../src/main/resources/mysql.db.sql | 9 - .../resources/provider/dubbo-provider.xml | 19 - .../src/main/resources/sky-walking.auth | 21 - .../order-interfaces/pom.xml | 45 -- .../order/interfaces/IOrderMaintain.java | 7 - .../order/interfaces/parameter/OrderInfo.java | 47 -- .../order-application/pom.xml | 40 -- samples/skywalking-example/pom.xml | 54 -- .../resources-application/pom.xml | 51 -- .../resource-impl/pom.xml | 142 ----- .../example/resource/dao/ResourceDAO.java | 118 ---- .../dubbo/impl/ResourceCheckImpl.java | 24 - .../resource/exception/BusinessException.java | 8 - .../resource/service/IResourceManage.java | 10 - .../service/impl/ResourceManageImpl.java | 69 --- .../example/resource/util/DubboStart.java | 16 - .../src/main/resources/applicationContext.xml | 18 - .../src/main/resources/log4j.xml | 19 - .../src/main/resources/log4j2.xml | 13 - .../src/main/resources/mysql.db.sql | 19 - .../resources/provider/dubbo-provider.xml | 14 - .../src/main/resources/sky-walking.auth | 21 - .../resource-interfaces/pom.xml | 51 -- .../interfaces/checker/IResourceCheck.java | 8 - .../checker/param/ResourceInfo.java | 34 -- .../web-application/pom.xml | 131 ----- .../controller/OrderSaveController.java | 49 -- .../src/main/resources/applicationcontext.xml | 39 -- .../resources/consumer/dubbo-consumer.xml | 15 - .../src/main/resources/log4j.properties | 9 - .../src/main/resources/sky-walking.auth | 21 - .../src/main/webapp/WEB-INF/web.xml | 51 -- .../main/webapp/jsp/order/saveOrderResult.jsp | 16 - .../skywalking/agent/SkywalkingAgent.java | 50 +- .../AbstractClassEnhancePluginDefine.java | 55 +- .../ai/cloud/skywalking/plugin/IPlugin.java | 4 +- .../skywalking/plugin/PluginBootstrap.java | 31 +- .../plugin/PluginDefineCategory.java | 44 ++ .../skywalking/plugin/TracingBootstrap.java | 65 ++- .../plugin/boot/BootPluginDefine.java | 13 +- .../plugin/interceptor/MethodMatcher.java | 3 +- .../enhance/ClassEnhancePluginDefine.java | 2 +- ...MethodInputAndOutParameterInterceptor.java | 42 ++ .../cloud/matcher/ExclusionMatcherTest.java | 28 +- .../test/ai/cloud/plugin/PluginMainTest.java | 39 +- .../dubbo-plugin/pom.xml | 4 +- .../test/dubbo/consumer/DubboConsumer.java | 10 +- .../plugin/test/dubbo/impl/DubboStart.java | 9 +- .../consumer/DubboxRestConsumer.java | 3 +- .../dubbox283/consumer/DubboxRestStart.java | 9 +- .../consumer/DubboxRestConsumer.java | 3 +- .../dubbox284/consumer/DubboxRestStart.java | 9 +- .../httpClient-4.x-plugin/pom.xml | 2 +- .../v4/plugin/TestHttpClientV42.java | 5 +- .../v4/plugin/TestHttpClientV43.java | 5 +- .../skywalking/plugin/h2/H2JDBCTest.java | 11 +- .../plugin/mysql/MysqlJDBCTest.java | 3 +- .../plugin/oracle/OracleJDBCTest.java | 20 +- .../jedis/v2/plugin/JedisClusterTest.java | 3 +- .../skywalking/jedis/v2/plugin/JedisTest.java | 3 +- .../plugin/tomcat78x/TomcatPluginTest.java | 13 +- .../target/classes/skywalking-plugin.def | 2 +- 110 files changed, 311 insertions(+), 4402 deletions(-) delete mode 100644 samples/skywalking-example/account-application/account-impl/pom.xml delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccount.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccountCriteria.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/interfaces/TAccountMapper.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/exception/BusinessException.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/IAccountMaintainService.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/impl/AccountMaintainServiceImpl.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/model/CommonsHttpResult.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/DubboStart.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/applicationContext.xml delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/context/jdbc.properties delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/context/spring-mybatis.xml delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/mybatis/mapper/TAccountMapper.xml delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/mysql.db.sql delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/provider/provider.xml delete mode 100644 samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth delete mode 100644 samples/skywalking-example/account-application/account-interfaces/pom.xml delete mode 100644 samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/IAccountMaintain.java delete mode 100644 samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/param/AccountInfo.java delete mode 100644 samples/skywalking-example/account-application/pom.xml delete mode 100644 samples/skywalking-example/mail-application/pom.xml delete mode 100644 samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/controller/MaillController.java delete mode 100644 samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/util/SendeUtil.java delete mode 100644 samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml delete mode 100644 samples/skywalking-example/mail-application/src/main/resources/log4j.properties delete mode 100644 samples/skywalking-example/mail-application/src/main/resources/mail/mail.config delete mode 100644 samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth delete mode 100644 samples/skywalking-example/mail-application/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/skywalking-example/order-application/order-impl/pom.xml delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrder.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrderCriteria.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/interfaces/TOrderMapper.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/exception/BusinessException.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/model/CommonsHttpResult.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/IOrderManage.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/impl/OrderManageImpl.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/DubboStart.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/OrderIdGenerator.java delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/consumer/dubbo-consumer.xml delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/context/jdbc.properties delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/context/spring-mybatis.xml delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/mybatis/mapper/TOrderMapper.xml delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/mysql.db.sql delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/provider/dubbo-provider.xml delete mode 100644 samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth delete mode 100644 samples/skywalking-example/order-application/order-interfaces/pom.xml delete mode 100644 samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/IOrderMaintain.java delete mode 100644 samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/parameter/OrderInfo.java delete mode 100644 samples/skywalking-example/order-application/pom.xml delete mode 100644 samples/skywalking-example/pom.xml delete mode 100644 samples/skywalking-example/resources-application/pom.xml delete mode 100644 samples/skywalking-example/resources-application/resource-impl/pom.xml delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dao/ResourceDAO.java delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/impl/ResourceCheckImpl.java delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/exception/BusinessException.java delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/IResourceManage.java delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/impl/ResourceManageImpl.java delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/util/DubboStart.java delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/resources/applicationContext.xml delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/resources/mysql.db.sql delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/resources/provider/dubbo-provider.xml delete mode 100644 samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth delete mode 100644 samples/skywalking-example/resources-application/resource-interfaces/pom.xml delete mode 100644 samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/IResourceCheck.java delete mode 100644 samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/param/ResourceInfo.java delete mode 100644 samples/skywalking-example/web-application/pom.xml delete mode 100644 samples/skywalking-example/web-application/src/main/java/com/ai/cloud/skywalking/example/controller/OrderSaveController.java delete mode 100644 samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml delete mode 100644 samples/skywalking-example/web-application/src/main/resources/consumer/dubbo-consumer.xml delete mode 100644 samples/skywalking-example/web-application/src/main/resources/log4j.properties delete mode 100644 samples/skywalking-example/web-application/src/main/resources/sky-walking.auth delete mode 100644 samples/skywalking-example/web-application/src/main/webapp/WEB-INF/web.xml delete mode 100644 samples/skywalking-example/web-application/src/main/webapp/jsp/order/saveOrderResult.jsp rename skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/{interceptor => }/AbstractClassEnhancePluginDefine.java (54%) create mode 100644 skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginDefineCategory.java create mode 100644 skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInputAndOutParameterInterceptor.java diff --git a/samples/skywalking-example/account-application/account-impl/pom.xml b/samples/skywalking-example/account-application/account-impl/pom.xml deleted file mode 100644 index b4d8c76a6..000000000 --- a/samples/skywalking-example/account-application/account-impl/pom.xml +++ /dev/null @@ -1,202 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-account-impl - 1.0-Final - - skywalking-example-account-impl - http://maven.apache.org - - - Company - http://10.1.228.199:18081/nexus/content/groups/public/ - - - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - com.alibaba - dubbox - 2.8.4 - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - org.springframework - spring-context - - - org.springframework - spring-aop - - - org.springframework - spring-expression - - - - - com.101tec - zkclient - 0.7 - - - org.apache.logging.log4j - log4j-core - 2.4.1 - - - mysql - mysql-connector-java - 5.1.37 - - - org.javassist - javassist - 3.20.0-GA - - - org.springframework - spring-context - 4.1.5.RELEASE - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - - - org.springframework - spring-tx - 4.1.5.RELEASE - - - org.apache.commons - commons-dbcp2 - 2.1 - - - - org.mybatis - mybatis - 3.3.0 - - - org.mybatis - mybatis-spring - 1.2.2 - - - org.springframework - spring-jdbc - - - - - - com.ai.cloud - skywalking-example-account-interfaces - 1.0-Final - - - org.apache.httpcomponents - httpclient - 4.2.1 - - - - - com.google.code.gson - gson - 2.5 - - - - com.ai.cloud - skywalking-spring-plugin - 1.0-Final - - - com.ai.cloud - skywalking-dubbo-plugin - 1.0-Final - - - - org.apache.logging.log4j - log4j-api - 2.4.1 - - - com.ai.cloud - skywalking-jdbc-plugin - 1.0-Final - - - - - com.ai.cloud - skywalking-httpClient-4.2.x-plugin - 1.0-Final - - - org.aspectj - aspectjweaver - 1.8.7 - - - com.ai.cloud - skywalking-log4j-1.x-plugin - 1.0-Final - - - com.ai.cloud - skywalking-log4j-2.x-plugin - 1.0-Final - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccount.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccount.java deleted file mode 100644 index 1857793d1..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccount.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.ai.cloud.skywalking.example.account.dao.mapper.bo; - -public class TAccount { - private int accountId; - - private String phoneNumber; - - private String mail; - - public int getAccountId() { - return accountId; - } - - public void setAccountId(int accountId) { - this.accountId = accountId; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber == null ? null : phoneNumber.trim(); - } - - public String getMail() { - return mail; - } - - public void setMail(String mail) { - this.mail = mail == null ? null : mail.trim(); - } -} \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccountCriteria.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccountCriteria.java deleted file mode 100644 index 60a5e3a29..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/bo/TAccountCriteria.java +++ /dev/null @@ -1,420 +0,0 @@ -package com.ai.cloud.skywalking.example.account.dao.mapper.bo; - -import java.util.ArrayList; -import java.util.List; - -public class TAccountCriteria { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - protected Integer limitStart; - - protected Integer limitEnd; - - public TAccountCriteria() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimitStart(Integer limitStart) { - this.limitStart=limitStart; - } - - public Integer getLimitStart() { - return limitStart; - } - - public void setLimitEnd(Integer limitEnd) { - this.limitEnd=limitEnd; - } - - public Integer getLimitEnd() { - return limitEnd; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andAccountIdIsNull() { - addCriterion("ACCOUNT_ID is null"); - return (Criteria) this; - } - - public Criteria andAccountIdIsNotNull() { - addCriterion("ACCOUNT_ID is not null"); - return (Criteria) this; - } - - public Criteria andAccountIdEqualTo(int value) { - addCriterion("ACCOUNT_ID =", value, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdNotEqualTo(int value) { - addCriterion("ACCOUNT_ID <>", value, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdGreaterThan(int value) { - addCriterion("ACCOUNT_ID >", value, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdGreaterThanOrEqualTo(int value) { - addCriterion("ACCOUNT_ID >=", value, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdLessThan(int value) { - addCriterion("ACCOUNT_ID <", value, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdLessThanOrEqualTo(int value) { - addCriterion("ACCOUNT_ID <=", value, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdIn(List values) { - addCriterion("ACCOUNT_ID in", values, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdNotIn(List values) { - addCriterion("ACCOUNT_ID not in", values, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdBetween(int value1, int value2) { - addCriterion("ACCOUNT_ID between", value1, value2, "accountId"); - return (Criteria) this; - } - - public Criteria andAccountIdNotBetween(int value1, int value2) { - addCriterion("ACCOUNT_ID not between", value1, value2, "accountId"); - return (Criteria) this; - } - - public Criteria andPhoneNumberIsNull() { - addCriterion("PHONE_NUMBER is null"); - return (Criteria) this; - } - - public Criteria andPhoneNumberIsNotNull() { - addCriterion("PHONE_NUMBER is not null"); - return (Criteria) this; - } - - public Criteria andPhoneNumberEqualTo(String value) { - addCriterion("PHONE_NUMBER =", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotEqualTo(String value) { - addCriterion("PHONE_NUMBER <>", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberGreaterThan(String value) { - addCriterion("PHONE_NUMBER >", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberGreaterThanOrEqualTo(String value) { - addCriterion("PHONE_NUMBER >=", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberLessThan(String value) { - addCriterion("PHONE_NUMBER <", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberLessThanOrEqualTo(String value) { - addCriterion("PHONE_NUMBER <=", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberLike(String value) { - addCriterion("PHONE_NUMBER like", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotLike(String value) { - addCriterion("PHONE_NUMBER not like", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberIn(List values) { - addCriterion("PHONE_NUMBER in", values, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotIn(List values) { - addCriterion("PHONE_NUMBER not in", values, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberBetween(String value1, String value2) { - addCriterion("PHONE_NUMBER between", value1, value2, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotBetween(String value1, String value2) { - addCriterion("PHONE_NUMBER not between", value1, value2, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andMailIsNull() { - addCriterion("MAIL is null"); - return (Criteria) this; - } - - public Criteria andMailIsNotNull() { - addCriterion("MAIL is not null"); - return (Criteria) this; - } - - public Criteria andMailEqualTo(String value) { - addCriterion("MAIL =", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailNotEqualTo(String value) { - addCriterion("MAIL <>", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailGreaterThan(String value) { - addCriterion("MAIL >", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailGreaterThanOrEqualTo(String value) { - addCriterion("MAIL >=", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailLessThan(String value) { - addCriterion("MAIL <", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailLessThanOrEqualTo(String value) { - addCriterion("MAIL <=", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailLike(String value) { - addCriterion("MAIL like", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailNotLike(String value) { - addCriterion("MAIL not like", value, "mail"); - return (Criteria) this; - } - - public Criteria andMailIn(List values) { - addCriterion("MAIL in", values, "mail"); - return (Criteria) this; - } - - public Criteria andMailNotIn(List values) { - addCriterion("MAIL not in", values, "mail"); - return (Criteria) this; - } - - public Criteria andMailBetween(String value1, String value2) { - addCriterion("MAIL between", value1, value2, "mail"); - return (Criteria) this; - } - - public Criteria andMailNotBetween(String value1, String value2) { - addCriterion("MAIL not between", value1, value2, "mail"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/interfaces/TAccountMapper.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/interfaces/TAccountMapper.java deleted file mode 100644 index 46ebdbb22..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dao/mapper/interfaces/TAccountMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ai.cloud.skywalking.example.account.dao.mapper.interfaces; - -import com.ai.cloud.skywalking.example.account.dao.mapper.bo.TAccount; -import com.ai.cloud.skywalking.example.account.dao.mapper.bo.TAccountCriteria; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface TAccountMapper { - int countByExample(TAccountCriteria example); - - int deleteByExample(TAccountCriteria example); - - int deleteByPrimaryKey(int accountId); - - int insert(TAccount record); - - int insertSelective(TAccount record); - - List selectByExample(TAccountCriteria example); - - TAccount selectByPrimaryKey(int accountId); - - int updateByExampleSelective(@Param("record") TAccount record, @Param("example") TAccountCriteria example); - - int updateByExample(@Param("record") TAccount record, @Param("example") TAccountCriteria example); - - int updateByPrimaryKeySelective(TAccount record); - - int updateByPrimaryKey(TAccount record); -} \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java deleted file mode 100644 index c23c53959..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/impl/AccountMaintainImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.ai.cloud.skywalking.example.account.dubbo.impl; - -import com.ai.cloud.skywalking.tracer.RPCBuriedPointSender; -import com.ai.cloud.skywalking.example.account.dubbo.interfaces.IAccountMaintain; -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.example.account.model.CommonsHttpResult; -import com.ai.cloud.skywalking.example.account.util.HttpClientUtil; -import com.ai.cloud.skywalking.model.Identification; -import com.alibaba.dubbo.config.annotation.Service; -import com.google.gson.Gson; -import org.springframework.beans.factory.annotation.Autowired; - -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.HashMap; -import java.util.Map; - -@Service -public class AccountMaintainImpl implements IAccountMaintain { - - private static final String MAIL_APPLICATION_DEPLOY_ADDRESS = "http://localhost:8080/mail-web"; - - private static final String SEND_MAIL_URL = "/mail/send"; - - @Autowired - private IAccountMaintainService iAccountMaintainService; - - @Override - public String create(AccountInfo accountInfo) { - Gson gson = new Gson(); - CommonsHttpResult commonsHttpResult = new CommonsHttpResult(); - try { - boolean result = iAccountMaintainService.createAccount(accountInfo); - if (!result) { - commonsHttpResult.setErrorCode("99999"); - commonsHttpResult.setMessage("Create account failed"); - } else { - Map parameters = new HashMap(); - parameters.put("recipientAccount", accountInfo.getMail()); - String mailResult = HttpClientUtil.sendPostRequest(MAIL_APPLICATION_DEPLOY_ADDRESS + SEND_MAIL_URL, - parameters); - - CommonsHttpResult commonsHttpResult1 = gson.fromJson(mailResult, CommonsHttpResult.class); - if ("000000".equals(commonsHttpResult1.getErrorCode())) { - commonsHttpResult.setErrorCode("000000"); - commonsHttpResult.setMessage("Create account success"); - } else { - commonsHttpResult.setErrorCode("99999"); - commonsHttpResult.setMessage("Send mail failed"); - } - } - } catch (BusinessException e) { - commonsHttpResult.setErrorCode("99999"); - commonsHttpResult.setMessage("Create account failed"); - } catch (URISyntaxException e) { - commonsHttpResult.setErrorCode("99999"); - commonsHttpResult.setMessage("Create account failed"); - } catch (IOException e) { - commonsHttpResult.setErrorCode("99999"); - commonsHttpResult.setMessage("Create account failed"); - } - - return gson.toJson(commonsHttpResult); - } -} diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/exception/BusinessException.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/exception/BusinessException.java deleted file mode 100644 index 5545097d7..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/exception/BusinessException.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.ai.cloud.skywalking.example.account.exception; - -public class BusinessException extends Exception { - - public BusinessException(String message) { - super(message); - } - - public BusinessException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/IAccountMaintainService.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/IAccountMaintainService.java deleted file mode 100644 index 76b96a616..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/IAccountMaintainService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ai.cloud.skywalking.example.account.manage; - -import com.ai.cloud.skywalking.example.account.dubbo.interfaces.param.AccountInfo; -import com.ai.cloud.skywalking.example.account.exception.BusinessException; - -public interface IAccountMaintainService { - boolean createAccount(AccountInfo accountInfo) throws BusinessException; -} 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 deleted file mode 100644 index 04d0a8ced..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/manage/impl/AccountMaintainServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ai.cloud.skywalking.example.account.manage.impl; - -import com.ai.cloud.skywalking.example.account.dao.mapper.bo.TAccount; -import com.ai.cloud.skywalking.example.account.dao.mapper.interfaces.TAccountMapper; -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 org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -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 -public class AccountMaintainServiceImpl implements IAccountMaintainService { - - private Logger logger = LogManager.getLogger(AccountMaintainServiceImpl.class); - - @Autowired - private SqlSessionTemplate sqlSessionTemplate; - - @Override - public boolean createAccount(AccountInfo accountInfo) throws BusinessException { - if (accountInfo.getPhoneNumber() == null || accountInfo.getPhoneNumber().length() <= 0) { - throw new BusinessException("Phone number cannot be null"); - } - if (accountInfo.getPhoneNumber() == null || accountInfo.getPhoneNumber().length() <= 0) { - throw new BusinessException("Phone number cannot be null"); - } - try { - TAccountMapper tAccountMapper = sqlSessionTemplate.getMapper(TAccountMapper.class); - TAccount tAccount = new TAccount(); - tAccount.setPhoneNumber(accountInfo.getPhoneNumber()); - tAccount.setMail(accountInfo.getMail()); - tAccountMapper.insert(tAccount); - return true; - } catch (Exception e) { - logger.error("Create account failed", e); - throw new BusinessException("Create account failed", e); - } - } -} diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/model/CommonsHttpResult.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/model/CommonsHttpResult.java deleted file mode 100644 index 1071fc660..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/model/CommonsHttpResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ai.cloud.skywalking.example.account.model; - -public class CommonsHttpResult { - private String errorCode; - private String message; - - public String getErrorCode() { - return errorCode; - } - - public void setErrorCode(String errorCode) { - this.errorCode = errorCode; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/DubboStart.java b/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/DubboStart.java deleted file mode 100644 index faea9b984..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/DubboStart.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ai.cloud.skywalking.example.account.util; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class DubboStart { - - - public static void main(String[] args) throws InterruptedException { - ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("classpath*:applicationContext.xml"); - context.start(); - while (true){ - Thread.sleep(1000000000L); - } - } -} 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 deleted file mode 100644 index dc8f671f8..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/java/com/ai/cloud/skywalking/example/account/util/HttpClientUtil.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ai.cloud.skywalking.example.account.util; - -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; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class HttpClientUtil { - private static final Log logger = LogFactory.getLog(HttpClientUtil.class); - - 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()); - List formparams = new ArrayList(); - for (Map.Entry entry : parametersMap.entrySet()) { - formparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); - } - - httpPost.setEntity(new UrlEncodedFormEntity(formparams, "UTF-8")); - HttpResponse response = httpclient.execute(httpPost); - if (response.getStatusLine().getStatusCode() == 200) { - HttpEntity entity = response.getEntity(); - BufferedReader reader = new BufferedReader(new InputStreamReader( - entity.getContent())); - StringBuffer buffer = new StringBuffer(); - String tempStr; - while ((tempStr = reader.readLine()) != null) - buffer.append(tempStr); - return buffer.toString(); - } else { - throw new RuntimeException("error code " + response.getStatusLine().getStatusCode() - + ":" + response.getStatusLine().getReasonPhrase()); - } - } -} 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 deleted file mode 100644 index 51df427ab..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/applicationContext.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/context/jdbc.properties b/samples/skywalking-example/account-application/account-impl/src/main/resources/context/jdbc.properties deleted file mode 100644 index 135cda55e..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/context/jdbc.properties +++ /dev/null @@ -1,8 +0,0 @@ -jdbc.driverClassName=com.ai.cloud.skywalking.plugin.jdbc.mysql.MySQLTracingDriver -jdbc.url=tracing:jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8 -jdbc.username=root -jdbc.password=root -jdbc.maxTotal=200 -jdbc.maxIdle=50 -jdbc.maxWaitMillis=1000 -jdbc.defaultAutoCommit=true diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/context/spring-mybatis.xml b/samples/skywalking-example/account-application/account-impl/src/main/resources/context/spring-mybatis.xml deleted file mode 100644 index 43308808d..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/context/spring-mybatis.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - classpath:context/jdbc.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 deleted file mode 100644 index e0cf7f9c7..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=INFO, A1 -#log4j.appender.A1=org.apache.log4j.FileAppender -#log4j.appender.A1.File=${catalina.base}/logs/mvno_crm_all.log -#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=org.apache.log4j.ConsoleAppender -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 deleted file mode 100644 index c26c51acc..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/mybatis/mapper/TAccountMapper.xml b/samples/skywalking-example/account-application/account-impl/src/main/resources/mybatis/mapper/TAccountMapper.xml deleted file mode 100644 index 6eb10e603..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/mybatis/mapper/TAccountMapper.xml +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - ACCOUNT_ID, PHONE_NUMBER, MAIL - - - - - delete from t_account - where ACCOUNT_ID = #{accountId,jdbcType=INTEGER} - - - delete from t_account - - - - - - insert into t_account (ACCOUNT_ID, PHONE_NUMBER, MAIL - ) - values (#{accountId,jdbcType=INTEGER}, #{phoneNumber,jdbcType=VARCHAR}, #{mail,jdbcType=VARCHAR} - ) - - - insert into t_account - - ACCOUNT_ID, - - PHONE_NUMBER, - - - MAIL, - - - - #{accountId,jdbcType=INTEGER}, - - #{phoneNumber,jdbcType=VARCHAR}, - - - #{mail,jdbcType=VARCHAR}, - - - - - - update t_account - - - ACCOUNT_ID = #{record.accountId,jdbcType=INTEGER}, - - - PHONE_NUMBER = #{record.phoneNumber,jdbcType=VARCHAR}, - - - MAIL = #{record.mail,jdbcType=VARCHAR}, - - - - - - - - update t_account - set ACCOUNT_ID = #{record.accountId,jdbcType=INTEGER}, - PHONE_NUMBER = #{record.phoneNumber,jdbcType=VARCHAR}, - MAIL = #{record.mail,jdbcType=VARCHAR} - - - - - - update t_account - - - PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR}, - - - MAIL = #{mail,jdbcType=VARCHAR}, - - - where ACCOUNT_ID = #{accountId,jdbcType=INTEGER} - - - update t_account - set PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR}, - MAIL = #{mail,jdbcType=VARCHAR} - where ACCOUNT_ID = #{accountId,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/mysql.db.sql b/samples/skywalking-example/account-application/account-impl/src/main/resources/mysql.db.sql deleted file mode 100644 index fa02155a8..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/mysql.db.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE test.T_ACCOUNT -( - ACCOUNT_ID int PRIMARY KEY NOT NULL AUTO_INCREMENT, - PHONE_NUMBER varchar(11) NOT NULL, - MAIL varchar(60) NOT NULL -); -CREATE UNIQUE INDEX T_ACCOUNT_ACCOUNT_ID_uindex ON test.T_ACCOUNT (ACCOUNT_ID); \ No newline at end of file diff --git a/samples/skywalking-example/account-application/account-impl/src/main/resources/provider/provider.xml b/samples/skywalking-example/account-application/account-impl/src/main/resources/provider/provider.xml deleted file mode 100644 index 864cf80a3..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/provider/provider.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ 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 deleted file mode 100644 index ddb8386c3..000000000 --- a/samples/skywalking-example/account-application/account-impl/src/main/resources/sky-walking.auth +++ /dev/null @@ -1,21 +0,0 @@ -#test -#Mon Dec 28 11:28:47 CST 2015 -buriedpoint.businesskey_max_length=300 -sender.retry_get_sender_wait_interval=2000 -buffer.pool_size=5 -senderchecker.check_polling_time=200 - -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=10.1.235.197:34000;10.1.235.197:35000; -skywalking.sdk_version=1.0a2 diff --git a/samples/skywalking-example/account-application/account-interfaces/pom.xml b/samples/skywalking-example/account-application/account-interfaces/pom.xml deleted file mode 100644 index 57eaaa86c..000000000 --- a/samples/skywalking-example/account-application/account-interfaces/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-account-interfaces - 1.0-Final - - skywalking-example-account-interfaces - http://maven.apache.org - - - Company - http://10.1.228.199:18081/nexus/content/groups/public/ - - - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - org.jboss.resteasy - resteasy-jaxrs - 3.0.7.Final - - - org.jboss.resteasy - resteasy-client - 3.0.7.Final - - - javax.validation - validation-api - 1.0.0.GA - - - org.jboss.resteasy - resteasy-jackson-provider - 3.0.7.Final - - - org.apache.tomcat.embed - tomcat-embed-core - 8.0.11 - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - 8.0.11 - - - javax.ws.rs - javax.ws.rs-api - 2.0 - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/IAccountMaintain.java b/samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/IAccountMaintain.java deleted file mode 100644 index 9653180e7..000000000 --- a/samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/IAccountMaintain.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ai.cloud.skywalking.example.account.dubbo.interfaces; - -import com.ai.cloud.skywalking.example.account.dubbo.interfaces.param.AccountInfo; - -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - - -@Path("/accountMaintain") -@Consumes({MediaType.APPLICATION_JSON}) -@Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_XML}) -public interface IAccountMaintain { - - @Path("/create") - @POST - String create(AccountInfo accountInfo); -} diff --git a/samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/param/AccountInfo.java b/samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/param/AccountInfo.java deleted file mode 100644 index bede9d6ad..000000000 --- a/samples/skywalking-example/account-application/account-interfaces/src/main/java/com/ai/cloud/skywalking/example/account/dubbo/interfaces/param/AccountInfo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.ai.cloud.skywalking.example.account.dubbo.interfaces.param; - -import org.codehaus.jackson.annotate.JsonIgnoreProperties; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; - -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) -@JsonIgnoreProperties(ignoreUnknown = true) -public class AccountInfo implements Serializable { - - @XmlElement(name = "phoneNumber") - public String phoneNumber; - @XmlElement(name = "mail") - public String mail; - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getMail() { - return mail; - } - - public void setMail(String mail) { - this.mail = mail; - } -} diff --git a/samples/skywalking-example/account-application/pom.xml b/samples/skywalking-example/account-application/pom.xml deleted file mode 100644 index c491ee5b5..000000000 --- a/samples/skywalking-example/account-application/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-account - 1.0-Final - - skywalking-example-account - http://maven.apache.org - - - account-impl - account-interfaces - - pom - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/mail-application/pom.xml b/samples/skywalking-example/mail-application/pom.xml deleted file mode 100644 index 3120b4243..000000000 --- a/samples/skywalking-example/mail-application/pom.xml +++ /dev/null @@ -1,101 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-mail - 1.0-Final - - skywalking-example-mail - http://maven.apache.org - - - UTF-8 - - war - - - - junit - junit - 3.8.1 - test - - - javax.servlet - javax.servlet-api - 3.1.0 - - - jstl - jstl - 1.2 - - - com.sun.mail - javax.mail - 1.5.4 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - com.ai.cloud - skywalking-web-plugin - 1.0-Final - - - org.springframework - spring-web - 4.2.2.RELEASE - - - org.springframework - spring-webmvc - 4.2.2.RELEASE - - - com.ai.cloud - skywalking-spring-plugin - 1.0-Final - - - org.apache.logging.log4j - log4j-api - 2.4.1 - - - org.aspectj - aspectjweaver - 1.8.7 - - - com.ai.cloud - skywalking-log4j-1.x-plugin - 1.0-Final - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/controller/MaillController.java b/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/controller/MaillController.java deleted file mode 100644 index b44bf6a41..000000000 --- a/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/controller/MaillController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ai.cloud.skywalking.example.mail.controller; - -import com.ai.cloud.skywalking.example.mail.util.SendeUtil; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; - -@Controller -@RequestMapping("/mail") -public class MaillController { - - private Logger logger = LogManager.getLogger(MaillController.class); - - @RequestMapping("/send") - protected void sendMail(HttpServletRequest req, HttpServletResponse response) { - String recipientAccount = req.getParameter("recipientAccount"); - response.setCharacterEncoding("UTF-8"); - response.setContentType("application/json; charset=utf-8"); - OutputStream outputStream = null; - try { - outputStream = response.getOutputStream(); - if (recipientAccount == null || recipientAccount.length() <= 0) { - outputStream.write("{\"errorCode\":\"99999\",\"message\":\"Recipient Account can not be null\"}".getBytes()); - outputStream.flush(); - return; - } - boolean result = SendeUtil.sendeMail(recipientAccount); - if (result) { - outputStream.write("{\"errorCode\":\"000000\",\"message\":\"Send mail success\"}".getBytes()); - } else { - outputStream.write("{\"errorCode\":\"99999\",\"message\":\"Send mail failed\"}".getBytes()); - } - outputStream.flush(); - } catch (Exception e) { - logger.error("Send mail failed", e); - } finally { - if (outputStream != null) { - try { - outputStream.close(); - } catch (IOException e) { - logger.error("Failed to close output stream", e); - } - } - } - } -} 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 deleted file mode 100644 index edb608be8..000000000 --- a/samples/skywalking-example/mail-application/src/main/java/com/ai/cloud/skywalking/example/mail/util/SendeUtil.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.ai.cloud.skywalking.example.mail.util; - -import java.io.IOException; -import java.util.Properties; - -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; - -public class SendeUtil { - - public static boolean sendeMail(String recipientAccount) { - try { - Properties prop = new Properties(); - prop.load(SendeUtil.class.getResourceAsStream("/mail/mail.config")); - Session session = Session.getInstance(prop); - session.setDebug(true); - Transport ts = session.getTransport(); - ts.connect(prop.getProperty("mail.host"), prop.getProperty("mail.username"), prop.getProperty("mail.password")); - Message message = createSimpleMail(session, prop.getProperty("mail.username") + - prop.getProperty("mail.account.prefix"), recipientAccount); - ts.sendMessage(message, message.getAllRecipients()); - ts.close(); - return true; - } catch (MessagingException e) { - e.printStackTrace(); - return false; - } catch (IOException e) { - e.printStackTrace(); - return false; - } - } - - private static MimeMessage createSimpleMail(Session session, String senderAccount, String recipientAccount) throws MessagingException { - //创建邮件对象 - MimeMessage message = new MimeMessage(session); - //指明邮件的发件人 - message.setFrom(new InternetAddress(senderAccount)); - //指明邮件的收件人，现在发件人和收件人是一样的，那就是自己给自己发 - message.setRecipient(Message.RecipientType.TO, new InternetAddress(recipientAccount)); - //邮件的标题 - message.setSubject("注册成功"); - //邮件的文本内容 - message.setContent("你好啊！", "text/html;charset=UTF-8"); - //返回创建好的邮件对象 - return message; - } -} diff --git a/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml b/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml deleted file mode 100644 index 6efeafc9d..000000000 --- a/samples/skywalking-example/mail-application/src/main/resources/applicationcontext.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/skywalking-example/mail-application/src/main/resources/log4j.properties b/samples/skywalking-example/mail-application/src/main/resources/log4j.properties deleted file mode 100644 index 1cc7dc0c6..000000000 --- a/samples/skywalking-example/mail-application/src/main/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootLogger=DEBUG, A1 -#log4j.appender.A1=org.apache.log4j.FileAppender -#log4j.appender.A1.File=${catalina.base}/logs/mvno_crm_all.log -#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=org.apache.log4j.ConsoleAppender -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/mail/mail.config b/samples/skywalking-example/mail-application/src/main/resources/mail/mail.config deleted file mode 100644 index 25ae09e7b..000000000 --- a/samples/skywalking-example/mail-application/src/main/resources/mail/mail.config +++ /dev/null @@ -1,6 +0,0 @@ -mail.host=mail.asiainfo.com -mail.transport.protocol=smtp -mail.smtp.auth=true -mail.username=zhangxin10 -mail.password=******** -mail.account.prefix=@asiainfo.com \ 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 deleted file mode 100644 index bdddccca3..000000000 --- a/samples/skywalking-example/mail-application/src/main/resources/sky-walking.auth +++ /dev/null @@ -1,21 +0,0 @@ -#test -#Mon Dec 28 11:29:34 CST 2015 -buriedpoint.businesskey_max_length=300 -sender.retry_get_sender_wait_interval=2000 -buffer.pool_size=5 -senderchecker.check_polling_time=200 - -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=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/mail-application/src/main/webapp/WEB-INF/web.xml b/samples/skywalking-example/mail-application/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index b30a70f19..000000000 --- a/samples/skywalking-example/mail-application/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - skywalking-example-mail-application - - tracingFilter - com.ai.cloud.skywalking.plugin.web.SkyWalkingFilter - - - tracingFilter - /mail/send - - - - encoding - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - encoding - /* - - - - springmvc - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - classpath*:applicationcontext.xml - - - 1 - - - - springmvc - / - - \ 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 deleted file mode 100644 index 24a350c34..000000000 --- a/samples/skywalking-example/order-application/order-impl/pom.xml +++ /dev/null @@ -1,181 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-order-impl - 1.0-Final - - skywalking-example-order-impl - http://maven.apache.org - - - Company - http://10.1.228.199:18081/nexus/content/groups/public/ - - - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - com.alibaba - dubbo - 2.8.4 - - - org.springframework - spring - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - org.springframework - spring-context - - - org.springframework - spring-aop - - - org.springframework - spring-expression - - - - - com.101tec - zkclient - 0.7 - - - org.javassist - javassist - 3.20.0-GA - - - org.springframework - spring-context - 4.2.2.RELEASE - - - org.springframework - spring-jdbc - 4.1.5.RELEASE - - - org.springframework - spring-tx - 4.1.5.RELEASE - - - org.apache.commons - commons-dbcp2 - 2.1 - - - - com.ai.cloud - skywalking-example-order-interfaces - 1.0-Final - - - - com.ai.cloud - skywalking-example-resource-interfaces - 1.0-Final - - - - org.mybatis - mybatis - 3.3.0 - - - org.mybatis - mybatis-spring - 1.2.2 - - - org.springframework - spring-jdbc - - - - - com.google.code.gson - gson - 2.5 - - - com.ai.cloud - skywalking-spring-plugin - 1.0-Final - - - com.ai.cloud - skywalking-dubbo-plugin - 1.0-Final - - - mysql - mysql-connector-java - 5.1.37 - - - com.ai.cloud - skywalking-example-account-interfaces - 1.0-Final - - - com.ai.cloud - skywalking-jdbc-plugin - 1.0-Final - - - org.aspectj - aspectjweaver - 1.8.7 - - - com.ai.cloud - skywalking-log4j-1.x-plugin - 1.0-Final - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrder.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrder.java deleted file mode 100644 index 73196171c..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrder.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.ai.cloud.skywalking.example.order.dao.mapper.bo; - -public class TOrder { - private String orderId; - - private int resourceId; - - private String phoneNumber; - - private int packageId; - - private String mailAccount; - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId == null ? null : orderId.trim(); - } - - public int getResourceId() { - return resourceId; - } - - public void setResourceId(int resourceId) { - this.resourceId = resourceId; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber == null ? null : phoneNumber.trim(); - } - - public int getPackageId() { - return packageId; - } - - public void setPackageId(int packageId) { - this.packageId = packageId; - } - - public String getMailAccount() { - return mailAccount; - } - - public void setMailAccount(String mailAccount) { - this.mailAccount = mailAccount == null ? null : mailAccount.trim(); - } -} \ 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/dao/mapper/bo/TOrderCriteria.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrderCriteria.java deleted file mode 100644 index d617560b6..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/bo/TOrderCriteria.java +++ /dev/null @@ -1,550 +0,0 @@ -package com.ai.cloud.skywalking.example.order.dao.mapper.bo; - -import java.util.ArrayList; -import java.util.List; - -public class TOrderCriteria { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - protected Integer limitStart; - - protected Integer limitEnd; - - public TOrderCriteria() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - public void setLimitStart(Integer limitStart) { - this.limitStart=limitStart; - } - - public Integer getLimitStart() { - return limitStart; - } - - public void setLimitEnd(Integer limitEnd) { - this.limitEnd=limitEnd; - } - - public Integer getLimitEnd() { - return limitEnd; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andOrderIdIsNull() { - addCriterion("ORDER_ID is null"); - return (Criteria) this; - } - - public Criteria andOrderIdIsNotNull() { - addCriterion("ORDER_ID is not null"); - return (Criteria) this; - } - - public Criteria andOrderIdEqualTo(String value) { - addCriterion("ORDER_ID =", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotEqualTo(String value) { - addCriterion("ORDER_ID <>", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdGreaterThan(String value) { - addCriterion("ORDER_ID >", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdGreaterThanOrEqualTo(String value) { - addCriterion("ORDER_ID >=", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLessThan(String value) { - addCriterion("ORDER_ID <", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLessThanOrEqualTo(String value) { - addCriterion("ORDER_ID <=", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLike(String value) { - addCriterion("ORDER_ID like", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotLike(String value) { - addCriterion("ORDER_ID not like", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdIn(List values) { - addCriterion("ORDER_ID in", values, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotIn(List values) { - addCriterion("ORDER_ID not in", values, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdBetween(String value1, String value2) { - addCriterion("ORDER_ID between", value1, value2, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotBetween(String value1, String value2) { - addCriterion("ORDER_ID not between", value1, value2, "orderId"); - return (Criteria) this; - } - - public Criteria andResourceIdIsNull() { - addCriterion("RESOURCE_ID is null"); - return (Criteria) this; - } - - public Criteria andResourceIdIsNotNull() { - addCriterion("RESOURCE_ID is not null"); - return (Criteria) this; - } - - public Criteria andResourceIdEqualTo(int value) { - addCriterion("RESOURCE_ID =", value, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdNotEqualTo(int value) { - addCriterion("RESOURCE_ID <>", value, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdGreaterThan(int value) { - addCriterion("RESOURCE_ID >", value, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdGreaterThanOrEqualTo(int value) { - addCriterion("RESOURCE_ID >=", value, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdLessThan(int value) { - addCriterion("RESOURCE_ID <", value, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdLessThanOrEqualTo(int value) { - addCriterion("RESOURCE_ID <=", value, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdIn(List values) { - addCriterion("RESOURCE_ID in", values, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdNotIn(List values) { - addCriterion("RESOURCE_ID not in", values, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdBetween(int value1, int value2) { - addCriterion("RESOURCE_ID between", value1, value2, "resourceId"); - return (Criteria) this; - } - - public Criteria andResourceIdNotBetween(int value1, int value2) { - addCriterion("RESOURCE_ID not between", value1, value2, "resourceId"); - return (Criteria) this; - } - - public Criteria andPhoneNumberIsNull() { - addCriterion("PHONE_NUMBER is null"); - return (Criteria) this; - } - - public Criteria andPhoneNumberIsNotNull() { - addCriterion("PHONE_NUMBER is not null"); - return (Criteria) this; - } - - public Criteria andPhoneNumberEqualTo(String value) { - addCriterion("PHONE_NUMBER =", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotEqualTo(String value) { - addCriterion("PHONE_NUMBER <>", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberGreaterThan(String value) { - addCriterion("PHONE_NUMBER >", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberGreaterThanOrEqualTo(String value) { - addCriterion("PHONE_NUMBER >=", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberLessThan(String value) { - addCriterion("PHONE_NUMBER <", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberLessThanOrEqualTo(String value) { - addCriterion("PHONE_NUMBER <=", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberLike(String value) { - addCriterion("PHONE_NUMBER like", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotLike(String value) { - addCriterion("PHONE_NUMBER not like", value, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberIn(List values) { - addCriterion("PHONE_NUMBER in", values, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotIn(List values) { - addCriterion("PHONE_NUMBER not in", values, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberBetween(String value1, String value2) { - addCriterion("PHONE_NUMBER between", value1, value2, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPhoneNumberNotBetween(String value1, String value2) { - addCriterion("PHONE_NUMBER not between", value1, value2, "phoneNumber"); - return (Criteria) this; - } - - public Criteria andPackageIdIsNull() { - addCriterion("PACKAGE_ID is null"); - return (Criteria) this; - } - - public Criteria andPackageIdIsNotNull() { - addCriterion("PACKAGE_ID is not null"); - return (Criteria) this; - } - - public Criteria andPackageIdEqualTo(int value) { - addCriterion("PACKAGE_ID =", value, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdNotEqualTo(int value) { - addCriterion("PACKAGE_ID <>", value, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdGreaterThan(int value) { - addCriterion("PACKAGE_ID >", value, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdGreaterThanOrEqualTo(int value) { - addCriterion("PACKAGE_ID >=", value, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdLessThan(int value) { - addCriterion("PACKAGE_ID <", value, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdLessThanOrEqualTo(int value) { - addCriterion("PACKAGE_ID <=", value, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdIn(List values) { - addCriterion("PACKAGE_ID in", values, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdNotIn(List values) { - addCriterion("PACKAGE_ID not in", values, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdBetween(int value1, int value2) { - addCriterion("PACKAGE_ID between", value1, value2, "packageId"); - return (Criteria) this; - } - - public Criteria andPackageIdNotBetween(int value1, int value2) { - addCriterion("PACKAGE_ID not between", value1, value2, "packageId"); - return (Criteria) this; - } - - public Criteria andMailAccountIsNull() { - addCriterion("MAIL_ACCOUNT is null"); - return (Criteria) this; - } - - public Criteria andMailAccountIsNotNull() { - addCriterion("MAIL_ACCOUNT is not null"); - return (Criteria) this; - } - - public Criteria andMailAccountEqualTo(String value) { - addCriterion("MAIL_ACCOUNT =", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountNotEqualTo(String value) { - addCriterion("MAIL_ACCOUNT <>", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountGreaterThan(String value) { - addCriterion("MAIL_ACCOUNT >", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountGreaterThanOrEqualTo(String value) { - addCriterion("MAIL_ACCOUNT >=", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountLessThan(String value) { - addCriterion("MAIL_ACCOUNT <", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountLessThanOrEqualTo(String value) { - addCriterion("MAIL_ACCOUNT <=", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountLike(String value) { - addCriterion("MAIL_ACCOUNT like", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountNotLike(String value) { - addCriterion("MAIL_ACCOUNT not like", value, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountIn(List values) { - addCriterion("MAIL_ACCOUNT in", values, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountNotIn(List values) { - addCriterion("MAIL_ACCOUNT not in", values, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountBetween(String value1, String value2) { - addCriterion("MAIL_ACCOUNT between", value1, value2, "mailAccount"); - return (Criteria) this; - } - - public Criteria andMailAccountNotBetween(String value1, String value2) { - addCriterion("MAIL_ACCOUNT not between", value1, value2, "mailAccount"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ 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/dao/mapper/interfaces/TOrderMapper.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/interfaces/TOrderMapper.java deleted file mode 100644 index 033a3da2a..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/dao/mapper/interfaces/TOrderMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.ai.cloud.skywalking.example.order.dao.mapper.interfaces; - -import com.ai.cloud.skywalking.example.order.dao.mapper.bo.TOrder; -import com.ai.cloud.skywalking.example.order.dao.mapper.bo.TOrderCriteria; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface TOrderMapper { - int countByExample(TOrderCriteria example); - - int deleteByExample(TOrderCriteria example); - - int deleteByPrimaryKey(String orderId); - - int insert(TOrder record); - - int insertSelective(TOrder record); - - List selectByExample(TOrderCriteria example); - - TOrder selectByPrimaryKey(String orderId); - - int updateByExampleSelective(@Param("record") TOrder record, @Param("example") TOrderCriteria example); - - int updateByExample(@Param("record") TOrder record, @Param("example") TOrderCriteria example); - - int updateByPrimaryKeySelective(TOrder record); - - int updateByPrimaryKey(TOrder record); -} \ 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/exception/BusinessException.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/exception/BusinessException.java deleted file mode 100644 index 06f7b7c5c..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/exception/BusinessException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ai.cloud.skywalking.example.order.exception; - -public class BusinessException extends RuntimeException { - - public BusinessException(String message) { - super(message); - } -} 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 deleted file mode 100644 index fd5f8bd9b..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/impl/OrderMaintainImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.ai.cloud.skywalking.example.order.impl; - -import com.ai.cloud.skywalking.example.account.dubbo.interfaces.IAccountMaintain; -import com.ai.cloud.skywalking.example.account.dubbo.interfaces.param.AccountInfo; -import com.ai.cloud.skywalking.example.order.exception.BusinessException; -import com.ai.cloud.skywalking.example.order.interfaces.IOrderMaintain; -import com.ai.cloud.skywalking.example.order.interfaces.parameter.OrderInfo; -import com.ai.cloud.skywalking.example.order.model.CommonsHttpResult; -import com.ai.cloud.skywalking.example.order.service.IOrderManage; -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.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.annotation.Service; -import com.google.gson.Gson; -import org.springframework.beans.factory.annotation.Autowired; - -@Service -public class OrderMaintainImpl implements IOrderMaintain { - @Reference - private IResourceCheck iResourceCheck; - - @Autowired - private IOrderManage orderManage; - - @Autowired - private IAccountMaintain iAccountMaintain; - - - @Override - public String saveOrder(OrderInfo orderInfo) { - ResourceInfo resourceInfo = new ResourceInfo(); - resourceInfo.setPhoneNumber(orderInfo.getPhoneNumber()); - resourceInfo.setResourceId(orderInfo.getResourceId()); - resourceInfo.setPhonePackage(orderInfo.getPackageId()); - boolean checkResourceResult = iResourceCheck.checkResource(resourceInfo); - - if (checkResourceResult) { - // 预占资源 - iResourceCheck.reservationResource(resourceInfo); - // 创建用户 - AccountInfo accountInfo = new AccountInfo(); - accountInfo.setPhoneNumber(orderInfo.getPhoneNumber()); - accountInfo.setMail(orderInfo.getMailAccount()); - String result = iAccountMaintain.create(accountInfo); - CommonsHttpResult commonsHttpResult = new Gson().fromJson(result, CommonsHttpResult.class); - if ("99999".equals(commonsHttpResult)) { - throw new RuntimeException("Create account failed"); - } - return orderManage.saveOrder(orderInfo); - } else { - throw new BusinessException("请联系管理员"); - } - } -} diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/model/CommonsHttpResult.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/model/CommonsHttpResult.java deleted file mode 100644 index 0b01b2788..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/model/CommonsHttpResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ai.cloud.skywalking.example.order.model; - -public class CommonsHttpResult { - private String errorCode; - private String message; - - public String getErrorCode() { - return errorCode; - } - - public void setErrorCode(String errorCode) { - this.errorCode = errorCode; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/IOrderManage.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/IOrderManage.java deleted file mode 100644 index 9437f1cd0..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/IOrderManage.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ai.cloud.skywalking.example.order.service; - -import com.ai.cloud.skywalking.example.order.interfaces.parameter.OrderInfo; - -public interface IOrderManage { - String saveOrder(OrderInfo orderInfo); -} 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 deleted file mode 100644 index 38bb7caa4..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/service/impl/OrderManageImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -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; - -@Service -@Transactional -public class OrderManageImpl implements IOrderManage { - - @Autowired - private SqlSessionTemplate sqlSessionTemplate; - - @Override - public String saveOrder(OrderInfo orderInfo) { - String orderId = OrderIdGenerator.generate(); - TOrderMapper iOrderMapper = sqlSessionTemplate.getMapper(TOrderMapper.class); - TOrder tOrder = new TOrder(); - tOrder.setPhoneNumber(orderInfo.getPhoneNumber()); - tOrder.setOrderId(orderId); - tOrder.setPackageId(Integer.valueOf(orderInfo.getPackageId())); - tOrder.setResourceId(Integer.valueOf(orderInfo.getResourceId())); - tOrder.setMailAccount(orderInfo.getMailAccount()); - iOrderMapper.insert(tOrder); - return orderId; - } -} diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/DubboStart.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/DubboStart.java deleted file mode 100644 index 076b3cd12..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/DubboStart.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ai.cloud.skywalking.example.order.util; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class DubboStart { - - - public static void main(String[] args) throws InterruptedException { - ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("classpath*:provider/dubbo-provider.xml"); - context.start(); - while (true){ - Thread.sleep(1000000000L); - } - } -} diff --git a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/OrderIdGenerator.java b/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/OrderIdGenerator.java deleted file mode 100644 index ba173b218..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/java/com/ai/cloud/skywalking/example/order/util/OrderIdGenerator.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.ai.cloud.skywalking.example.order.util; - -import java.util.UUID; - -public class OrderIdGenerator { - public static String generate() { - return UUID.randomUUID().toString().replaceAll("-", ""); - } -} diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/consumer/dubbo-consumer.xml b/samples/skywalking-example/order-application/order-impl/src/main/resources/consumer/dubbo-consumer.xml deleted file mode 100644 index fb6796ad9..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/consumer/dubbo-consumer.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/context/jdbc.properties b/samples/skywalking-example/order-application/order-impl/src/main/resources/context/jdbc.properties deleted file mode 100644 index 135cda55e..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/context/jdbc.properties +++ /dev/null @@ -1,8 +0,0 @@ -jdbc.driverClassName=com.ai.cloud.skywalking.plugin.jdbc.mysql.MySQLTracingDriver -jdbc.url=tracing:jdbc:mysql://localhost:3306/test?useUnicode=true&characterEncoding=UTF-8 -jdbc.username=root -jdbc.password=root -jdbc.maxTotal=200 -jdbc.maxIdle=50 -jdbc.maxWaitMillis=1000 -jdbc.defaultAutoCommit=true 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 deleted file mode 100644 index 700195e33..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/context/spring-mybatis.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - classpath:context/jdbc.properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file 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 deleted file mode 100644 index 7540c6a39..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.rootLogger=INFO, A1 -#log4j.appender.A1=org.apache.log4j.FileAppender -#log4j.appender.A1.File=${catalina.base}/logs/mvno_crm_all.log -#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=org.apache.log4j.ConsoleAppender -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/mybatis/mapper/TOrderMapper.xml b/samples/skywalking-example/order-application/order-impl/src/main/resources/mybatis/mapper/TOrderMapper.xml deleted file mode 100644 index 6a77d359c..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/mybatis/mapper/TOrderMapper.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - ORDER_ID, RESOURCE_ID, PHONE_NUMBER, PACKAGE_ID, MAIL_ACCOUNT - - - - - delete from t_order - where ORDER_ID = #{orderId,jdbcType=VARCHAR} - - - delete from t_order - - - - - - insert into t_order (ORDER_ID, RESOURCE_ID, PHONE_NUMBER, - PACKAGE_ID, MAIL_ACCOUNT) - values (#{orderId,jdbcType=VARCHAR}, #{resourceId,jdbcType=INTEGER}, #{phoneNumber,jdbcType=VARCHAR}, - #{packageId,jdbcType=INTEGER}, #{mailAccount,jdbcType=VARCHAR}) - - - insert into t_order - - - ORDER_ID, - - RESOURCE_ID, - - PHONE_NUMBER, - - PACKAGE_ID, - - MAIL_ACCOUNT, - - - - - #{orderId,jdbcType=VARCHAR}, - - #{resourceId,jdbcType=INTEGER}, - - #{phoneNumber,jdbcType=VARCHAR}, - - #{packageId,jdbcType=INTEGER}, - - #{mailAccount,jdbcType=VARCHAR}, - - - - - - update t_order - - - ORDER_ID = #{record.orderId,jdbcType=VARCHAR}, - - - RESOURCE_ID = #{record.resourceId,jdbcType=INTEGER}, - - - PHONE_NUMBER = #{record.phoneNumber,jdbcType=VARCHAR}, - - - PACKAGE_ID = #{record.packageId,jdbcType=INTEGER}, - - - MAIL_ACCOUNT = #{record.mailAccount,jdbcType=VARCHAR}, - - - - - - - - update t_order - set ORDER_ID = #{record.orderId,jdbcType=VARCHAR}, - RESOURCE_ID = #{record.resourceId,jdbcType=INTEGER}, - PHONE_NUMBER = #{record.phoneNumber,jdbcType=VARCHAR}, - PACKAGE_ID = #{record.packageId,jdbcType=INTEGER}, - MAIL_ACCOUNT = #{record.mailAccount,jdbcType=VARCHAR} - - - - - - update t_order - - - RESOURCE_ID = #{resourceId,jdbcType=INTEGER}, - - - PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR}, - - - PACKAGE_ID = #{packageId,jdbcType=INTEGER}, - - - MAIL_ACCOUNT = #{mailAccount,jdbcType=VARCHAR}, - - - where ORDER_ID = #{orderId,jdbcType=VARCHAR} - - - update t_order - set RESOURCE_ID = #{resourceId,jdbcType=INTEGER}, - PHONE_NUMBER = #{phoneNumber,jdbcType=VARCHAR}, - PACKAGE_ID = #{packageId,jdbcType=INTEGER}, - MAIL_ACCOUNT = #{mailAccount,jdbcType=VARCHAR} - where ORDER_ID = #{orderId,jdbcType=VARCHAR} - - \ No newline at end of file diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/mysql.db.sql b/samples/skywalking-example/order-application/order-impl/src/main/resources/mysql.db.sql deleted file mode 100644 index 09342a104..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/mysql.db.sql +++ /dev/null @@ -1,9 +0,0 @@ -create TABLE t_order ( - ORDER_ID varchar(32) not null, - RESOURCE_ID int(11), - PHONE_NUMBER varchar(11) not null, - PACKAGE_ID int(11), - MAIL_ACCOUNT varchar(45), - PRIMARY KEY (ORDER_ID) -); -CREATE UNIQUE INDEX T_ORDER_ORDER_ID_uindex ON t_order (ORDER_ID ASC); \ No newline at end of file diff --git a/samples/skywalking-example/order-application/order-impl/src/main/resources/provider/dubbo-provider.xml b/samples/skywalking-example/order-application/order-impl/src/main/resources/provider/dubbo-provider.xml deleted file mode 100644 index df598dd86..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/provider/dubbo-provider.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - \ 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 deleted file mode 100644 index bdafe6b60..000000000 --- a/samples/skywalking-example/order-application/order-impl/src/main/resources/sky-walking.auth +++ /dev/null @@ -1,21 +0,0 @@ -#test -#Mon Dec 28 11:30:29 CST 2015 -buriedpoint.businesskey_max_length=300 -sender.retry_get_sender_wait_interval=2000 -buffer.pool_size=5 -senderchecker.check_polling_time=200 - -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=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-interfaces/pom.xml b/samples/skywalking-example/order-application/order-interfaces/pom.xml deleted file mode 100644 index a573b670e..000000000 --- a/samples/skywalking-example/order-application/order-interfaces/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-order-interfaces - 1.0-Final - - skywalking-example-order-interfaces - http://maven.apache.org - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/IOrderMaintain.java b/samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/IOrderMaintain.java deleted file mode 100644 index 7c0b33f3d..000000000 --- a/samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/IOrderMaintain.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ai.cloud.skywalking.example.order.interfaces; - -import com.ai.cloud.skywalking.example.order.interfaces.parameter.OrderInfo; - -public interface IOrderMaintain { - String saveOrder(OrderInfo orderInfo); -} diff --git a/samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/parameter/OrderInfo.java b/samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/parameter/OrderInfo.java deleted file mode 100644 index 1b8b0930b..000000000 --- a/samples/skywalking-example/order-application/order-interfaces/src/main/java/com/ai/cloud/skywalking/example/order/interfaces/parameter/OrderInfo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ai.cloud.skywalking.example.order.interfaces.parameter; - -import java.io.Serializable; - -public class OrderInfo implements Serializable { - - private String resourceId; - - private String phoneNumber; - - private String packageId; - - private String mailAccount; - - - public String getResourceId() { - return resourceId; - } - - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getPackageId() { - return packageId; - } - - public void setPackageId(String packageId) { - this.packageId = packageId; - } - - public String getMailAccount() { - return mailAccount; - } - - public void setMailAccount(String mailAccount) { - this.mailAccount = mailAccount; - } -} diff --git a/samples/skywalking-example/order-application/pom.xml b/samples/skywalking-example/order-application/pom.xml deleted file mode 100644 index f65ff35e7..000000000 --- a/samples/skywalking-example/order-application/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-order - 1.0-Final - - skywalking-example-order - http://maven.apache.org - - order-interfaces - order-impl - - pom - - - UTF-8 - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/pom.xml b/samples/skywalking-example/pom.xml deleted file mode 100644 index c3638b2bc..000000000 --- a/samples/skywalking-example/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example - 1.0-Final - - - account-application - mail-application - resources-application - web-application - order-application - - pom - - skywalking-example - http://maven.apache.org - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/resources-application/pom.xml b/samples/skywalking-example/resources-application/pom.xml deleted file mode 100644 index 4af84beb2..000000000 --- a/samples/skywalking-example/resources-application/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-resources - 1.0-Final - - - resource-impl - resource-interfaces - - skywalking-example-resources - http://maven.apache.org - - pom - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/resources-application/resource-impl/pom.xml b/samples/skywalking-example/resources-application/resource-impl/pom.xml deleted file mode 100644 index 6fbcb2b37..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/pom.xml +++ /dev/null @@ -1,142 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-resource-impl - 1.0-Final - - skywalking-example-resource-impl - http://maven.apache.org - - - Company - http://10.1.228.199:18081/nexus/content/groups/public/ - - - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - com.alibaba - dubbox - 2.8.4 - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - org.springframework - spring-context - - - org.springframework - spring-aop - - - org.springframework - spring-expression - - - - - com.101tec - zkclient - 0.7 - - - org.apache.logging.log4j - log4j-core - 2.4.1 - - - mysql - mysql-connector-java - 5.1.37 - - - org.javassist - javassist - 3.20.0-GA - - - org.springframework - spring-context - 4.1.5.RELEASE - - - - - com.ai.cloud - skywalking-example-resource-interfaces - 1.0-Final - - - - - com.ai.cloud - skywalking-spring-plugin - 1.0-Final - - - com.ai.cloud - skywalking-dubbo-plugin - 1.0-Final - - - com.ai.cloud - skywalking-jdbc-plugin - 1.0-Final - - - org.aspectj - aspectjweaver - 1.8.7 - - - com.ai.cloud - skywalking-log4j-1.x-plugin - 1.0-Final - - - com.ai.cloud - skywalking-log4j-2.x-plugin - 1.0-Final - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dao/ResourceDAO.java b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dao/ResourceDAO.java deleted file mode 100644 index 8f49aa7c0..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dao/ResourceDAO.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.ai.cloud.skywalking.example.resource.dao; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.stereotype.Component; - -import java.sql.*; - -@Component -public class ResourceDAO { - private static Logger logger = LogManager.getLogger(ResourceDAO.class); - private static final String URL = "tracing:jdbc:mysql://localhost:3306/test"; - private static final String DRIVER_CLASS = "com.ai.cloud.skywalking.plugin.jdbc.mysql.MySQLTracingDriver"; - private static final String USER_NAME = "root"; - private static final String PASSWORD = "root"; - private static Connection con; - - static { - try { - Class.forName(DRIVER_CLASS); - } catch (ClassNotFoundException e) { - logger.error("Cannot find the driver class", e); - } - try { - con = DriverManager.getConnection(URL, USER_NAME, PASSWORD); - } catch (SQLException e) { - logger.error("Cannot connect the DB.", e); - } - } - - public String selectPhoneNumberStatus(String phoneNumber) { - try { - PreparedStatement preparedStatement = con.prepareStatement( - "SELECT STATUE FROM T_PHONE_NUMBER WHERE PHONE_NUMBER = ?"); - preparedStatement.setString(1, phoneNumber); - ResultSet resultSet = preparedStatement.executeQuery(); - if (resultSet.next()) { - return resultSet.getString("STATUE"); - } - } catch (SQLException e) { - logger.error("Select phone number status failed", e); - } - return null; - } - - public boolean updatePhoneNumberStatus(String phoneNumber) { - try { - PreparedStatement preparedStatement = con.prepareStatement( - "UPDATE t_phone_number SET STATUE = ? WHERE PHONE_NUMBER = ?"); - preparedStatement.setString(1, "1"); - preparedStatement.setString(2, phoneNumber); - preparedStatement.execute(); - return true; - } catch (SQLException e) { - logger.error("update phone number status failed", e); - } - return false; - } - - public String selectResourceStatus(String resourceId) { - try { - PreparedStatement preparedStatement = con.prepareStatement( - "SELECT STATUE FROM T_RESOURCE WHERE RESOURCE_ID = ?"); - preparedStatement.setString(1, resourceId); - ResultSet resultSet = preparedStatement.executeQuery(); - if (resultSet.next()) { - return resultSet.getString("STATUE"); - } - } catch (SQLException e) { - logger.error("Select resource status failed.", e); - } - return null; - } - - public boolean updateResourceStatus(String resourceId) { - try { - PreparedStatement preparedStatement = con.prepareStatement( - "UPDATE t_resource SET STATUE = ? WHERE RESOURCE_ID = ?"); - preparedStatement.setString(1, "1"); - preparedStatement.setString(2, resourceId); - preparedStatement.execute(); - return true; - } catch (SQLException e) { - logger.error("Update phone number status failed", e); - } - return false; - } - - public String selectPhonePackageStatus(String packageId) { - try { - PreparedStatement preparedStatement = con.prepareStatement( - "SELECT STATUE FROM T_PHONE_PACKAGE WHERE PACKAGE_ID = ?"); - preparedStatement.setString(1, packageId); - ResultSet resultSet = preparedStatement.executeQuery(); - if (resultSet.next()) { - return resultSet.getString("STATUE"); - } - } catch (SQLException e) { - logger.error("Select phone package status failed.", e); - } - - return null; - } - - public boolean updatePhonePackageStatus(String packageId) { - try { - PreparedStatement preparedStatement = con.prepareStatement( - "UPDATE t_phone_package SET STATUE = ? WHERE PACKAGE_ID = ?"); - preparedStatement.setString(1, "1"); - preparedStatement.setString(2, packageId); - preparedStatement.execute(); - return true; - } catch (SQLException e) { - logger.error("Update phone number status failed", e); - } - return false; - } -} 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 deleted file mode 100644 index 9a4270c35..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/impl/ResourceCheckImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -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.alibaba.dubbo.config.annotation.Service; - -@Service -public class ResourceCheckImpl implements IResourceCheck { - - @Autowired - private IResourceManage resourceManage; - - @Override - public boolean checkResource(ResourceInfo info) { - return resourceManage.checkResource(info); - } - - 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/exception/BusinessException.java b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/exception/BusinessException.java deleted file mode 100644 index 2280d630a..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/exception/BusinessException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ai.cloud.skywalking.example.resource.exception; - -public class BusinessException extends RuntimeException { - - public BusinessException(String message) { - super(message); - } -} diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/IResourceManage.java b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/IResourceManage.java deleted file mode 100644 index 0791d2063..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/IResourceManage.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.ai.cloud.skywalking.example.resource.service; - -import com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker.param.ResourceInfo; -import com.ai.cloud.skywalking.example.resource.exception.BusinessException; - -public interface IResourceManage { - boolean checkResource(ResourceInfo resourceInfo); - - boolean reservationResource(ResourceInfo resourceInfo); -} 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 deleted file mode 100644 index 0bb38ed88..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/service/impl/ResourceManageImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -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; - -@Component -public class ResourceManageImpl implements IResourceManage { - - @Autowired - private ResourceDAO resourceDAO; - - - @Override - public boolean checkResource(ResourceInfo resourceInfo) throws BusinessException { - return checkPhoneNumber(resourceInfo.getPhoneNumber()) && checkResourceId(resourceInfo.getResourceId()) && - checkPhonePackage(resourceInfo.getPhonePackage()); - } - - @Override - public boolean reservationResource(ResourceInfo resourceInfo) { - return resourceDAO.updatePhoneNumberStatus(resourceInfo.getPhoneNumber()) - && resourceDAO.updateResourceStatus(resourceInfo.getResourceId()); - } - - - public boolean checkPhoneNumber(String phoneNumber) throws BusinessException { - if (resourceDAO.selectPhoneNumberStatus(phoneNumber) == null) { - throw new BusinessException("Cannot find phone number[" + phoneNumber + "]"); - } - - if ("0".equals(resourceDAO.selectPhoneNumberStatus(phoneNumber))) { - return true; - } else { - return false; - } - - } - - - public boolean checkResourceId(String resourceId) throws BusinessException { - if (resourceDAO.selectResourceStatus(resourceId) == null) { - throw new BusinessException("Cannot find resourceId[" + resourceId + "]"); - } - - if ("0".equals(resourceDAO.selectResourceStatus(resourceId))) { - return true; - } else { - return false; - } - } - - - public boolean checkPhonePackage(String packageId) throws BusinessException { - if (resourceDAO.selectResourceStatus(packageId) == null) { - throw new BusinessException("Cannot find package Id[" + packageId + "]"); - } - - if ("0".equals(resourceDAO.selectPhonePackageStatus(packageId))) { - return true; - } else { - return false; - } - } -} diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/util/DubboStart.java b/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/util/DubboStart.java deleted file mode 100644 index 6140f6cb6..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/java/com/ai/cloud/skywalking/example/resource/util/DubboStart.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ai.cloud.skywalking.example.resource.util; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class DubboStart { - - - public static void main(String[] args) throws InterruptedException { - ClassPathXmlApplicationContext context = - new ClassPathXmlApplicationContext("classpath*:applicationContext.xml"); - context.start(); - while (true){ - Thread.sleep(1000000000L); - } - } -} 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 deleted file mode 100644 index 1cba6e657..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/applicationContext.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - \ No newline at end of file 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 deleted file mode 100644 index 020ea5baf..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 81c5c2fa8..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/mysql.db.sql b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/mysql.db.sql deleted file mode 100644 index 545c8cbb5..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/mysql.db.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE `t_phone_number` ( - `PHONE_NUMBER` VARCHAR(11) NOT NULL, - `STATUE` VARCHAR(2) NOT NULL, - PRIMARY KEY (`PHONE_NUMBER`) -); - -CREATE TABLE `t_resource` ( - `RESOURCE_ID` INT NOT NULL, - `RESOURCE_NAME` VARCHAR(45) NOT NULL, - `STATUE` VARCHAR(5) NOT NULL, - PRIMARY KEY (`RESOURCE_ID`) -); - -CREATE TABLE `t_phone_package` ( - `PACKAGE_ID` INT NOT NULL, - `PACKAGE_NAME` VARCHAR(45) NOT NULL, - `STATUE` VARCHAR(5) NOT NULL, - PRIMARY KEY (`PACKAGE_ID`) -); diff --git a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/provider/dubbo-provider.xml b/samples/skywalking-example/resources-application/resource-impl/src/main/resources/provider/dubbo-provider.xml deleted file mode 100644 index b57ba9f9e..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/provider/dubbo-provider.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - \ 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 deleted file mode 100644 index 9427a511c..000000000 --- a/samples/skywalking-example/resources-application/resource-impl/src/main/resources/sky-walking.auth +++ /dev/null @@ -1,21 +0,0 @@ -#test -#Mon Dec 28 11:31:03 CST 2015 -buriedpoint.businesskey_max_length=300 -sender.retry_get_sender_wait_interval=2000 -buffer.pool_size=5 -senderchecker.check_polling_time=200 - -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=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-interfaces/pom.xml b/samples/skywalking-example/resources-application/resource-interfaces/pom.xml deleted file mode 100644 index 10147d1b1..000000000 --- a/samples/skywalking-example/resources-application/resource-interfaces/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-resource-interfaces - 1.0-Final - - skywalking-example-resource-interfaces - http://maven.apache.org - - - Company - http://10.1.228.199:18081/nexus/content/groups/public/ - - - - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - diff --git a/samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/IResourceCheck.java b/samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/IResourceCheck.java deleted file mode 100644 index b7b6e6fe9..000000000 --- a/samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/IResourceCheck.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker; - -import com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker.param.ResourceInfo; - -public interface IResourceCheck { - boolean checkResource(ResourceInfo info); - boolean reservationResource(ResourceInfo info); -} diff --git a/samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/param/ResourceInfo.java b/samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/param/ResourceInfo.java deleted file mode 100644 index 3885718c4..000000000 --- a/samples/skywalking-example/resources-application/resource-interfaces/src/main/java/com/ai/cloud/skywalking/example/resource/dubbo/interfaces/checker/param/ResourceInfo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ai.cloud.skywalking.example.resource.dubbo.interfaces.checker.param; - -import java.io.Serializable; - -public class ResourceInfo implements Serializable{ - private String phoneNumber; - private String resourceId; - //手机套餐 - private String phonePackage; - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public String getResourceId() { - return resourceId; - } - - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - - public String getPhonePackage() { - return phonePackage; - } - - public void setPhonePackage(String phonePackage) { - this.phonePackage = phonePackage; - } -} diff --git a/samples/skywalking-example/web-application/pom.xml b/samples/skywalking-example/web-application/pom.xml deleted file mode 100644 index 75e2917e2..000000000 --- a/samples/skywalking-example/web-application/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - 4.0.0 - - com.ai.cloud - skywalking-example-web - 1.0-Final - - skywalking-example-web - http://maven.apache.org - - - UTF-8 - - war - - - - junit - junit - 3.8.1 - test - - - javax.servlet - javax.servlet-api - 3.1.0 - - - jstl - jstl - 1.2 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - - - com.alibaba - dubbo - 2.5.3 - - - org.springframework - spring - - - - - com.101tec - zkclient - 0.7 - - - org.javassist - javassist - 3.20.0-GA - - - org.springframework - spring-context - 4.2.2.RELEASE - - - org.springframework - spring-web - 4.2.2.RELEASE - - - org.springframework - spring-webmvc - 4.2.2.RELEASE - - - - com.ai.cloud - skywalking-web-plugin - 1.0-Final - - - - com.ai.cloud - skywalking-dubbo-plugin - 1.0-Final - - - - com.ai.cloud - skywalking-spring-plugin - 1.0-Final - - - - com.ai.cloud - skywalking-example-order-interfaces - 1.0-Final - - - org.aspectj - aspectjweaver - 1.8.7 - - - com.ai.cloud - skywalking-log4j-1.x-plugin - 1.0-Final - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - 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 deleted file mode 100644 index 13ce523bc..000000000 --- a/samples/skywalking-example/web-application/src/main/java/com/ai/cloud/skywalking/example/controller/OrderSaveController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ai.cloud.skywalking.example.controller; - -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 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") -public class OrderSaveController { - - @Reference - private IOrderMaintain orderMaintain; - - @Autowired - private ApplicationContext applicationContext; - - @RequestMapping("/save") - public ModelAndView save(HttpServletRequest req) { - String phoneNumber = req.getParameter("phoneNumber"); - String resourceId = req.getParameter("resourceId"); - String packageId = req.getParameter("packageId"); - String mail = req.getParameter("mail"); - - String businessKey = "phoneNumber:" + phoneNumber + ",resourceId:" + resourceId + ",mail:" + mail; - BusinessKeyAppender.setBusinessKey2Trace(businessKey); - - OrderInfo orderInfo = new OrderInfo(); - orderInfo.setResourceId(resourceId); - orderInfo.setPhoneNumber(phoneNumber); - orderInfo.setPackageId(packageId); - orderInfo.setMailAccount(mail); - String orderId = orderMaintain.saveOrder(orderInfo); - System.out.println("orderId:" + orderId); - 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 deleted file mode 100644 index 6bb17d179..000000000 --- a/samples/skywalking-example/web-application/src/main/resources/applicationcontext.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/skywalking-example/web-application/src/main/resources/consumer/dubbo-consumer.xml b/samples/skywalking-example/web-application/src/main/resources/consumer/dubbo-consumer.xml deleted file mode 100644 index dfe49b334..000000000 --- a/samples/skywalking-example/web-application/src/main/resources/consumer/dubbo-consumer.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ 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 deleted file mode 100644 index 1cc7dc0c6..000000000 --- a/samples/skywalking-example/web-application/src/main/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootLogger=DEBUG, A1 -#log4j.appender.A1=org.apache.log4j.FileAppender -#log4j.appender.A1.File=${catalina.base}/logs/mvno_crm_all.log -#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=org.apache.log4j.ConsoleAppender -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 deleted file mode 100644 index 495cfed62..000000000 --- a/samples/skywalking-example/web-application/src/main/resources/sky-walking.auth +++ /dev/null @@ -1,21 +0,0 @@ -#test -#Mon Dec 28 11:30:00 CST 2015 -buriedpoint.businesskey_max_length=300 -sender.retry_get_sender_wait_interval=2000 -buffer.pool_size=5 -senderchecker.check_polling_time=200 - -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=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/src/main/webapp/WEB-INF/web.xml b/samples/skywalking-example/web-application/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 217ce0052..000000000 --- a/samples/skywalking-example/web-application/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - skywalking-example-web-application - - - tracingFilter - com.ai.cloud.skywalking.plugin.web.SkyWalkingFilter - - - - tracingFilter - /order/save - - - - encoding - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - encoding - /* - - - - springmvc - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - classpath*:applicationcontext.xml - - - 1 - - - - springmvc - / - - \ No newline at end of file diff --git a/samples/skywalking-example/web-application/src/main/webapp/jsp/order/saveOrderResult.jsp b/samples/skywalking-example/web-application/src/main/webapp/jsp/order/saveOrderResult.jsp deleted file mode 100644 index 6a3d68666..000000000 --- a/samples/skywalking-example/web-application/src/main/webapp/jsp/order/saveOrderResult.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Created by IntelliJ IDEA. - User: astraea - Date: 2015/11/26 - Time: 15:37 - To change this template use File | Settings | File Templates. ---%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Save Order result - - - Save Order Success - - diff --git a/skywalking-collector/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java b/skywalking-collector/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java index 7aab8ae7b..438b508fd 100644 --- a/skywalking-collector/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java +++ b/skywalking-collector/skywalking-agent/src/main/java/com/ai/cloud/skywalking/agent/SkywalkingAgent.java @@ -1,23 +1,55 @@ package com.ai.cloud.skywalking.agent; -import com.ai.cloud.skywalking.conf.Config; +import com.ai.cloud.skywalking.conf.AuthDesc; import com.ai.cloud.skywalking.conf.ConfigInitializer; -import com.ai.cloud.skywalking.plugin.PluginBootstrap; -import com.ai.cloud.skywalking.transformer.ClassTransformer; +import com.ai.cloud.skywalking.logging.LogManager; +import com.ai.cloud.skywalking.logging.Logger; +import com.ai.cloud.skywalking.plugin.*; +import com.ai.cloud.skywalking.plugin.boot.BootPluginDefine; +import net.bytebuddy.agent.builder.AgentBuilder; +import net.bytebuddy.description.type.TypeDescription; +import net.bytebuddy.dynamic.DynamicType; +import net.bytebuddy.matcher.ElementMatchers; import java.lang.instrument.Instrumentation; +import java.util.List; public class SkywalkingAgent { - public static void premain(String agentArgs, Instrumentation inst) { + private static Logger logger = LogManager.getLogger(SkywalkingAgent.class); + + public static void premain(String agentArgs, Instrumentation instrumentation) throws PluginException { ConfigInitializer.initialize(); + if (!AuthDesc.isAuth()) { + + List plugins = new PluginBootstrap().loadPlugins(); + final PluginDefineCategory pluginDefineCategory = PluginDefineCategory.category(plugins); + + startBootPluginDefines(pluginDefineCategory.getBootPluginsDefines()); + + new AgentBuilder.Default().type(ElementMatchers.any()).transform(new AgentBuilder.Transformer() { + public DynamicType.Builder transform(DynamicType.Builder builder, TypeDescription typeDescription, ClassLoader classLoader) { + AbstractClassEnhancePluginDefine pluginDefine = pluginDefineCategory.getClassEnhancePluginDefines().get(typeDescription.getTypeName()); + if (pluginDefine == null) { + return builder; + } + + try { + return pluginDefine.define0(builder); + } catch (PluginException e) { + logger.error("Failed to enhance plugin " + pluginDefine.getClass().getName(), e); + return builder; + } + } + }).installOn(instrumentation); - if (Config.SkyWalking.ALL_METHOD_MONITOR) { - String interceptorPackage = System.getProperty("interceptor.package", ""); - inst.addTransformer(new ClassTransformer(interceptorPackage)); } + } - PluginBootstrap bootstrap = new PluginBootstrap(); - bootstrap.start(); + + public static void startBootPluginDefines(List bootPluginDefines) throws PluginException { + for (BootPluginDefine bootPluginDefine : bootPluginDefines) { + bootPluginDefine.define(null); + } } } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/AbstractClassEnhancePluginDefine.java similarity index 54% rename from skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/AbstractClassEnhancePluginDefine.java index 4cff5b2e1..0107eec33 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/AbstractClassEnhancePluginDefine.java @@ -1,9 +1,7 @@ -package com.ai.cloud.skywalking.plugin.interceptor; +package com.ai.cloud.skywalking.plugin; import com.ai.cloud.skywalking.logging.LogManager; import com.ai.cloud.skywalking.logging.Logger; -import com.ai.cloud.skywalking.plugin.IPlugin; -import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.protocol.util.StringUtil; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.ClassFileLocator; @@ -17,36 +15,33 @@ public abstract class AbstractClassEnhancePluginDefine implements IPlugin { private static Logger logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class); @Override - public void define() throws PluginException { + public void define(DynamicType.Builder builder) throws PluginException { + builder = define0(builder); + builder.name(enhanceClassName()).make().load(ClassLoader.getSystemClassLoader(), ClassLoadingStrategy.Default.INJECTION).getLoaded(); + } + + public DynamicType.Builder define0(DynamicType.Builder builder) throws PluginException { String interceptorDefineClassName = this.getClass().getName(); String enhanceOriginClassName = enhanceClassName(); if (StringUtil.isEmpty(enhanceOriginClassName)) { - logger.warn("classname of being intercepted is not defined by {}.", - interceptorDefineClassName); - return; + logger.warn("classname of being intercepted is not defined by {}.", interceptorDefineClassName); + return builder; } - logger.debug("prepare to enhance class {} by {}.", - enhanceOriginClassName, interceptorDefineClassName); - - Resolution resolution = CLASS_TYPE_POOL.describe(enhanceOriginClassName); - if (!resolution.isResolved()) { - logger.warn("class {} can't be resolved, enhance by {} failue.", - enhanceOriginClassName, interceptorDefineClassName); - return; - } + logger.debug("prepare to enhance class {} by {}.", enhanceOriginClassName, interceptorDefineClassName); /** * find witness classes for enhance class */ String[] witnessClasses = witnessClasses(); - if(witnessClasses != null) { + if (witnessClasses != null) { for (String witnessClass : witnessClasses) { Resolution witnessClassResolution = CLASS_TYPE_POOL.describe(witnessClass); if (!witnessClassResolution.isResolved()) { - logger.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", enhanceOriginClassName, interceptorDefineClassName, witnessClass); - return; + logger.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", enhanceOriginClassName, interceptorDefineClassName, + witnessClass); + return builder; } } } @@ -54,24 +49,12 @@ public abstract class AbstractClassEnhancePluginDefine implements IPlugin { /** * find origin class source code for interceptor */ - DynamicType.Builder newClassBuilder = new ByteBuddy() - .rebase(resolution.resolve(), - ClassFileLocator.ForClassLoader.ofClassPath()); + DynamicType.Builder newClassBuilder = this.enhance(enhanceOriginClassName, builder); - newClassBuilder = this.enhance(enhanceOriginClassName, newClassBuilder); - /** - * naming class as origin class name, make and load class to - * classloader. - */ - newClassBuilder - .name(enhanceOriginClassName) - .make() - .load(ClassLoader.getSystemClassLoader(), - ClassLoadingStrategy.Default.INJECTION).getLoaded(); + logger.debug("enhance class {} by {} completely.", enhanceOriginClassName, interceptorDefineClassName); - logger.debug("enhance class {} by {} completely.", - enhanceOriginClassName, interceptorDefineClassName); + return newClassBuilder; } protected abstract DynamicType.Builder enhance(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException; @@ -89,7 +72,7 @@ public abstract class AbstractClassEnhancePluginDefine implements IPlugin { * * @return */ - protected String[] witnessClasses(){ - return new String[]{}; + protected String[] witnessClasses() { + return new String[] {}; } } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java index ecfadcb2f..16b100781 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/IPlugin.java @@ -1,6 +1,8 @@ package com.ai.cloud.skywalking.plugin; +import net.bytebuddy.dynamic.DynamicType; + public interface IPlugin { - public void define() throws PluginException; + void define(DynamicType.Builder builder) throws PluginException; } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java index 94e82d381..0be4b7917 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginBootstrap.java @@ -1,11 +1,11 @@ package com.ai.cloud.skywalking.plugin; -import com.ai.cloud.skywalking.conf.AuthDesc; import com.ai.cloud.skywalking.logging.LogManager; import com.ai.cloud.skywalking.logging.Logger; import net.bytebuddy.pool.TypePool; import java.net.URL; +import java.util.ArrayList; import java.util.List; public class PluginBootstrap { @@ -13,11 +13,7 @@ public class PluginBootstrap { public static TypePool CLASS_TYPE_POOL = null; - public void start() { - if (!AuthDesc.isAuth()) { - return; - } - + public List loadPlugins() { CLASS_TYPE_POOL = TypePool.Default.ofClassPath(); PluginResourcesResolver resolver = new PluginResourcesResolver(); @@ -25,32 +21,33 @@ public class PluginBootstrap { if (resources == null || resources.size() == 0) { logger.info("no plugin files (skywalking-plugin.properties) found, continue to start application."); - return; + return new ArrayList(); } for (URL pluginUrl : resources) { try { PluginCfg.CFG.load(pluginUrl.openStream()); } catch (Throwable t) { - logger.error("plugin [{}] init failure.", new Object[]{pluginUrl}, t); + logger.error("plugin [{}] init failure.", new Object[] {pluginUrl}, t); } } - List pluginClassList = PluginCfg.CFG - .getPluginClassList(); + List pluginClassList = PluginCfg.CFG.getPluginClassList(); + List plugins = new ArrayList(); for (String pluginClassName : pluginClassList) { try { - logger.debug("prepare to enhance class by plugin {}.", - pluginClassName); - IPlugin plugin = (IPlugin) Class.forName( - pluginClassName).newInstance(); - plugin.define(); + logger.debug("prepare to enhance class by plugin {}.", pluginClassName); + IPlugin plugin = (IPlugin) Class.forName(pluginClassName).newInstance(); + plugins.add(plugin); } catch (Throwable t) { - logger.error("prepare to enhance class by plugin [{}] failure.", - new Object[]{pluginClassName}, t); + logger.error("prepare to enhance class by plugin [{}] failure.", new Object[] {pluginClassName}, t); } } + return plugins; + } + + } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginDefineCategory.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginDefineCategory.java new file mode 100644 index 000000000..2c5d440c7 --- /dev/null +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginDefineCategory.java @@ -0,0 +1,44 @@ +package com.ai.cloud.skywalking.plugin; + +import com.ai.cloud.skywalking.plugin.boot.BootPluginDefine; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class PluginDefineCategory { + + private static PluginDefineCategory pluginDefineCategory; + + private final Map classEnhancePluginDefines = new HashMap(); + private final List bootPluginDefines = new ArrayList(); + + private PluginDefineCategory(List plugins) { + for (IPlugin plugin : plugins) { + if (plugin instanceof AbstractClassEnhancePluginDefine) { + classEnhancePluginDefines.put(((AbstractClassEnhancePluginDefine) plugin).enhanceClassName(), (AbstractClassEnhancePluginDefine) plugin); + } + + if (plugin instanceof BootPluginDefine) { + bootPluginDefines.add((BootPluginDefine) plugin); + } + } + } + + public static PluginDefineCategory category(List plugins) { + if (pluginDefineCategory == null) { + pluginDefineCategory = new PluginDefineCategory(plugins); + } + return pluginDefineCategory; + } + + public List getBootPluginsDefines() { + return pluginDefineCategory.bootPluginDefines; + } + + public Map getClassEnhancePluginDefines() { + return pluginDefineCategory.classEnhancePluginDefines; + } + +} diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java index aa17bb438..ba39aac69 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/TracingBootstrap.java @@ -2,42 +2,61 @@ package com.ai.cloud.skywalking.plugin; import com.ai.cloud.skywalking.logging.LogManager; import com.ai.cloud.skywalking.logging.Logger; +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.ClassFileLocator; +import net.bytebuddy.dynamic.DynamicType; +import net.bytebuddy.pool.TypePool; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; +import java.util.List; /** * 替代应用函数的main函数入口，确保在程序入口处运行
* 用于替代-javaagent的另一种模式
- * - * @author wusheng * + * @author wusheng */ public class TracingBootstrap { - private static Logger logger = LogManager.getLogger(TracingBootstrap.class); + private static Logger logger = LogManager.getLogger(TracingBootstrap.class); - private TracingBootstrap() { - } + private TracingBootstrap() { + } - public static void main(String[] args) throws IllegalAccessException, - IllegalArgumentException, InvocationTargetException, - NoSuchMethodException, SecurityException, ClassNotFoundException { - if (args.length == 0) { - throw new RuntimeException( - "bootstrap failure. need args[0] to be main class."); - } + public static void main(String[] args) throws PluginException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException { + if (args.length == 0) { + throw new RuntimeException("bootstrap failure. need args[0] to be main class."); + } - try { - PluginBootstrap bootstrap = new PluginBootstrap(); - bootstrap.start(); - } catch (Throwable t) { - logger.error("PluginBootstrap start failure.", t); - } + List plugins = null; - String[] newArgs = Arrays.copyOfRange(args, 1, args.length); + try { + PluginBootstrap bootstrap = new PluginBootstrap(); + plugins = bootstrap.loadPlugins(); + } catch (Throwable t) { + logger.error("PluginBootstrap start failure.", t); + } - - Class.forName(args[0]).getMethod("main", String[].class) - .invoke(null, new Object[]{newArgs}); - } + for (IPlugin plugin : plugins) { + DynamicType.Builder newClassBuilder = null; + + if (plugin instanceof AbstractClassEnhancePluginDefine) { + String enhanceClassName = ((AbstractClassEnhancePluginDefine) plugin).enhanceClassName(); + TypePool.Resolution resolution = TypePool.Default.ofClassPath().describe(enhanceClassName); + if (!resolution.isResolved()) { + logger.error("Failed to resolve the class " + enhanceClassName); + continue; + } + newClassBuilder = new ByteBuddy().rebase(resolution.resolve(), ClassFileLocator.ForClassLoader.ofClassPath()); + } + + plugin.define(newClassBuilder); + + } + + String[] newArgs = Arrays.copyOfRange(args, 1, args.length); + + + Class.forName(args[0]).getMethod("main", String[].class).invoke(null, new Object[] {newArgs}); + } } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java index b0a61a3fe..be92b60fe 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/boot/BootPluginDefine.java @@ -2,14 +2,15 @@ package com.ai.cloud.skywalking.plugin.boot; import com.ai.cloud.skywalking.plugin.IPlugin; import com.ai.cloud.skywalking.plugin.PluginException; +import net.bytebuddy.dynamic.DynamicType; public abstract class BootPluginDefine implements IPlugin { - @Override - public void define() throws PluginException { - this.boot(); - } - - protected abstract void boot() throws BootException; + @Override + public void define(DynamicType.Builder builder) throws PluginException { + this.boot(); + } + + protected abstract void boot() throws BootException; } diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java index 2375b270c..a142c8658 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/MethodMatcher.java @@ -68,7 +68,8 @@ public abstract class MethodMatcher { } public enum Modifier { - Public, Default, Private, Protected; + Public, Default, Private, Protected, + ClassLoadingStrategy; private ElementMatcher.Junction elementMatcher() { switch (this) { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index 28d55a313..82d128873 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -14,7 +14,7 @@ import net.bytebuddy.matcher.ElementMatcher; import net.bytebuddy.matcher.ElementMatchers; import com.ai.cloud.skywalking.plugin.PluginException; -import com.ai.cloud.skywalking.plugin.interceptor.AbstractClassEnhancePluginDefine; +import com.ai.cloud.skywalking.plugin.AbstractClassEnhancePluginDefine; import com.ai.cloud.skywalking.plugin.interceptor.EnhanceException; import com.ai.cloud.skywalking.plugin.interceptor.EnhancedClassInstanceContext; import com.ai.cloud.skywalking.plugin.interceptor.MethodMatcher; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInputAndOutParameterInterceptor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInputAndOutParameterInterceptor.java new file mode 100644 index 000000000..310b35200 --- /dev/null +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/enhance/MethodInputAndOutParameterInterceptor.java @@ -0,0 +1,42 @@ +package com.ai.cloud.skywalking.plugin.interceptor.enhance; + +import com.ai.cloud.skywalking.api.IBuriedPointType; +import com.ai.cloud.skywalking.protocol.common.CallType; +import net.bytebuddy.implementation.bind.annotation.AllArguments; +import net.bytebuddy.implementation.bind.annotation.Origin; +import net.bytebuddy.implementation.bind.annotation.RuntimeType; +import net.bytebuddy.implementation.bind.annotation.SuperCall; + +import java.lang.reflect.Method; +import java.util.concurrent.Callable; + +public class MethodInputAndOutParameterInterceptor { + public static IBuriedPointType METHOD_INVOKE_BURIEDPOINT = new IBuriedPointType() { + @Override + public String getTypeName() { + return "LOCAL"; + } + + @Override + public CallType getCallType() { + return CallType.SYNC; + } + }; + @RuntimeType + public Object interceptor(@AllArguments Object[] allArgument, @Origin Method method, @Origin Class clazz, @SuperCall Callable zuper) throws Exception { + + + + Object ret = null; + try { + ret = zuper.call(); + } catch (Throwable e) { + + throw e; + } finally { + + } + + return ret; + } +} diff --git a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java index ee0255cc1..d97813a6e 100644 --- a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java +++ b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/ExclusionMatcherTest.java @@ -1,15 +1,31 @@ package test.ai.cloud.matcher; +import com.ai.cloud.skywalking.plugin.*; import junit.framework.TestCase; - +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.ClassFileLocator; +import net.bytebuddy.dynamic.DynamicType; +import net.bytebuddy.pool.TypePool; import org.junit.Test; -import com.ai.cloud.skywalking.plugin.PluginBootstrap; +import java.util.List; +import java.util.Map; + +public class ExclusionMatcherTest extends TestCase { + @Test + public void testMatcher() throws ClassNotFoundException, IllegalAccessException, InstantiationException, InterruptedException, PluginException { + List pluginDefines = new PluginBootstrap().loadPlugins(); + + PluginDefineCategory category = PluginDefineCategory.category(pluginDefines); + + + for (Map.Entry entry : category.getClassEnhancePluginDefines().entrySet()) { + DynamicType.Builder newClassBuilder = + new ByteBuddy().rebase(TypePool.Default.ofClassPath().describe(entry.getKey()).resolve(), ClassFileLocator.ForClassLoader.ofClassPath()); + + entry.getValue().define(newClassBuilder); + } -public class ExclusionMatcherTest extends TestCase{ - @Test - public void testMatcher() throws ClassNotFoundException, IllegalAccessException, InstantiationException, InterruptedException { - new PluginBootstrap().start(); TestMatcherClass testMatcherClass = (TestMatcherClass) Class.forName("test.ai.cloud.matcher.TestMatcherClass").newInstance(); testMatcherClass.set(); diff --git a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java index b41d38d25..70b828437 100644 --- a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java +++ b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/PluginMainTest.java @@ -1,28 +1,27 @@ package test.ai.cloud.plugin; +import com.ai.cloud.skywalking.plugin.PluginException; +import com.ai.cloud.skywalking.plugin.TracingBootstrap; +import org.junit.Test; + import java.lang.reflect.InvocationTargetException; -import org.junit.Test; - -import com.ai.cloud.skywalking.plugin.TracingBootstrap; - public class PluginMainTest { - @Test - public void testMain() throws IllegalAccessException, - IllegalArgumentException, InvocationTargetException, - NoSuchMethodException, SecurityException, ClassNotFoundException { - TracingBootstrap - .main(new String[] { "test.ai.cloud.plugin.PluginMainTest" }); - } + @Test + public void testMain() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"test.ai.cloud.plugin.PluginMainTest"}); + } - public static void main(String[] args) throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { - long start = System.currentTimeMillis(); + public static void main(String[] args) + throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, + SecurityException { + long start = System.currentTimeMillis(); - BeInterceptedClass inst = (BeInterceptedClass) Class.forName("test.ai.cloud.plugin.BeInterceptedClass").newInstance(); - inst.printabc(); - long end = System.currentTimeMillis(); - System.out.println(end - start + "ms"); - - BeInterceptedClass.call(); - } + BeInterceptedClass inst = (BeInterceptedClass) Class.forName("test.ai.cloud.plugin.BeInterceptedClass").newInstance(); + inst.printabc(); + long end = System.currentTimeMillis(); + System.out.println(end - start + "ms"); + + BeInterceptedClass.call(); + } } diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml index 1e5460750..8f3602fba 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml @@ -97,20 +97,20 @@ compile --> - + org.apache.httpcomponents httpclient diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java index 924817064..3b535fcf9 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/consumer/DubboConsumer.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.plugin.test.dubbo.consumer; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.cloud.skywalking.plugin.test.dubbo.interfaces.IDubboInterA; import com.ai.skywalking.testframework.api.RequestSpanAssert; @@ -13,17 +14,14 @@ public class DubboConsumer { @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { - TracingBootstrap - .main(new String[]{"com.ai.cloud.skywalking.plugin.test.dubbo.consumer.DubboConsumer"}); + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.plugin.test.dubbo.consumer.DubboConsumer"}); } public static void main(String[] args) throws InterruptedException { ApplicationContext context = new ClassPathXmlApplicationContext("classpath*:consumer/dubbo-consumer.xml"); IDubboInterA dubboInterA = context.getBean(IDubboInterA.class); dubboInterA.doBusiness("AAAAA"); - RequestSpanAssert.assertEquals(new String[][]{ - {"0", "dubbo://127.0.0.1:20880/com.ai.cloud.skywalking.plugin.test.dubbo.interfaces.IDubboInterA.doBusiness(String)", ""} - }); + RequestSpanAssert.assertEquals(new String[][] {{"0", "dubbo://127.0.0.1:20880/com.ai.cloud.skywalking.plugin.test.dubbo.interfaces.IDubboInterA.doBusiness(String)", ""}}); } } diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java index 9f48f0781..4c51505a1 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbo/impl/DubboStart.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.plugin.test.dubbo.impl; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -9,14 +10,12 @@ import java.lang.reflect.InvocationTargetException; public class DubboStart { @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { - TracingBootstrap - .main(new String[]{"com.ai.cloud.skywalking.plugin.test.dubbo.impl.DubboStart"}); + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.plugin.test.dubbo.impl.DubboStart"}); } public static void main(String[] args) throws InterruptedException { - ClassPathXmlApplicationContext classPathXmlApplicationContext = new - ClassPathXmlApplicationContext("classpath*:provider/dubbo-provider.xml"); + ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("classpath*:provider/dubbo-provider.xml"); classPathXmlApplicationContext.start(); diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java index d8a7cb13d..f1c594bd1 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestConsumer.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.plugin.test.dubbox283.consumer; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.cloud.skywalking.plugin.dubbox.bugfix.below283.BugFixAcitve; import com.ai.cloud.skywalking.plugin.test.dubbox283.interfaces.IDubboxRestInterA; @@ -19,7 +20,7 @@ public class DubboxRestConsumer { private static final Log logger = LogFactory.getLog(DubboxRestConsumer.class); @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.plugin.test.dubbox283.consumer.DubboxRestConsumer"}); } diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java index 96116300e..7a3cb88cf 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox283/consumer/DubboxRestStart.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.plugin.test.dubbox283.consumer; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.cloud.skywalking.plugin.dubbox.bugfix.below283.BugFixAcitve; import org.junit.Test; @@ -10,15 +11,13 @@ import java.lang.reflect.InvocationTargetException; public class DubboxRestStart { @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { - TracingBootstrap - .main(new String[]{"com.ai.cloud.skywalking.plugin.test.dubbox283.consumer.DubboxRestStart"}); + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.plugin.test.dubbox283.consumer.DubboxRestStart"}); } public static void main(String[] args) throws InterruptedException { new BugFixAcitve(); - ClassPathXmlApplicationContext classPathXmlApplicationContext = new - ClassPathXmlApplicationContext("classpath*:provider/dubbox283-provider.xml"); + ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("classpath*:provider/dubbox283-provider.xml"); classPathXmlApplicationContext.start(); diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java index 84b81083d..ff8bd6369 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestConsumer.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.plugin.test.dubbox284.consumer; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.cloud.skywalking.plugin.test.dubbox283.interfaces.param.DubboxRestInterAParameter; import com.ai.cloud.skywalking.plugin.test.dubbox284.interfaces.IDubboxRestInterA; @@ -18,7 +19,7 @@ public class DubboxRestConsumer { private static final Log logger = LogFactory.getLog(DubboxRestConsumer.class); @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.plugin.test.dubbox284.consumer.DubboxRestConsumer"}); } diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java index 2c384bc59..a83c6793e 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/ai/cloud/skywalking/plugin/test/dubbox284/consumer/DubboxRestStart.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.plugin.test.dubbox284.consumer; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.cloud.skywalking.plugin.dubbox.bugfix.below283.BugFixAcitve; import org.junit.Test; @@ -10,15 +11,13 @@ import java.lang.reflect.InvocationTargetException; public class DubboxRestStart { @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { - TracingBootstrap - .main(new String[]{"com.ai.cloud.skywalking.plugin.test.dubbox284.consumer.DubboxRestStart"}); + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.plugin.test.dubbox284.consumer.DubboxRestStart"}); } public static void main(String[] args) throws InterruptedException { new BugFixAcitve(); - ClassPathXmlApplicationContext classPathXmlApplicationContext = new - ClassPathXmlApplicationContext("classpath*:provider/dubbox284-provider.xml"); + ClassPathXmlApplicationContext classPathXmlApplicationContext = new ClassPathXmlApplicationContext("classpath*:provider/dubbox284-provider.xml"); classPathXmlApplicationContext.start(); diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml index ecf5a988b..134ab200e 100644 --- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -26,7 +26,7 @@ 1.0-Final - + org.apache.httpcomponents httpclient diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java index ef43176d9..39798eabe 100644 --- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.httpClient.v4.plugin; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.apache.http.HttpEntity; @@ -19,8 +20,8 @@ import java.sql.SQLException; public class TestHttpClientV42 { @Test - public void testsql() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException { - TracingBootstrap.main(new String[] {"TestHttpClientV42"}); + public void testHttpClient() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.httpClient.v4.plugin.TestHttpClientV42"}); } public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException, ClientProtocolException, IOException { diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java index 19a43d6a2..f6a99af89 100644 --- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.httpClient.v4.plugin; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.apache.http.HttpEntity; @@ -16,8 +17,8 @@ import java.sql.SQLException; public class TestHttpClientV43 { @Test - public void testsql() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException { - TracingBootstrap.main(new String[] {"TestHttpClientV43"}); + public void testHttpClient() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.httpClient.v4.plugin.TestHttpClientV43"}); } public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException { diff --git a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/h2/H2JDBCTest.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/h2/H2JDBCTest.java index 3d208f312..0b2affaeb 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/h2/H2JDBCTest.java +++ b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/h2/H2JDBCTest.java @@ -1,5 +1,6 @@ package test.ai.cloud.skywalking.plugin.h2; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.junit.Test; @@ -12,8 +13,8 @@ import java.sql.SQLException; public class H2JDBCTest { @Test - public void testMySqlJDBC() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { - TracingBootstrap.main(new String[]{H2JDBCTest.class.getName()}); + public void testMySqlJDBC() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {H2JDBCTest.class.getName()}); } public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException { @@ -28,9 +29,9 @@ public class H2JDBCTest { con.commit(); con.close(); RequestSpanAssert.assertEquals( - new String[][]{{"0", "jdbc:h2:" +H2JDBCTest.class.getResource("/") + "test.db" + "(null)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, - {"0", "jdbc:h2:" +H2JDBCTest.class.getResource("/") + "test.db" + "(null)", "connection.commit"}, - {"0", "jdbc:h2:" +H2JDBCTest.class.getResource("/") + "test.db" + "(null)", "connection.close"},}, true); + new String[][] {{"0", "jdbc:h2:" + H2JDBCTest.class.getResource("/") + "test.db" + "(null)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, + {"0", "jdbc:h2:" + H2JDBCTest.class.getResource("/") + "test.db" + "(null)", "connection.commit"}, + {"0", "jdbc:h2:" + H2JDBCTest.class.getResource("/") + "test.db" + "(null)", "connection.close"},}, true); } } diff --git a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java index d93214333..5ef3f6f06 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java +++ b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/mysql/MysqlJDBCTest.java @@ -1,5 +1,6 @@ package test.ai.cloud.skywalking.plugin.mysql; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.junit.Test; @@ -13,7 +14,7 @@ import java.sql.SQLException; public class MysqlJDBCTest { @Test - public void testMySqlJDBC() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { + public void testMySqlJDBC() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { TracingBootstrap.main(new String[] {"test.ai.cloud.skywalking.plugin.mysql.MysqlJDBCTest"}); } diff --git a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java index fa0bf6b86..a623ae787 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java +++ b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/test/java/test/ai/cloud/skywalking/plugin/oracle/OracleJDBCTest.java @@ -1,5 +1,6 @@ package test.ai.cloud.skywalking.plugin.oracle; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.junit.Test; @@ -16,15 +17,11 @@ import java.sql.SQLException; public class OracleJDBCTest { @Test - public void testOracleJDBC() throws InvocationTargetException, - NoSuchMethodException, ClassNotFoundException, - IllegalAccessException { - TracingBootstrap - .main(new String[]{"test.ai.cloud.skywalking.plugin.oracle.OracleJDBCTest"}); + public void testOracleJDBC() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {"test.ai.cloud.skywalking.plugin.oracle.OracleJDBCTest"}); } - public static void main(String[] args) throws ClassNotFoundException, - SQLException, InterruptedException { + public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException { Class.forName("oracle.jdbc.driver.OracleDriver"); String url = "jdbc:oracle:thin:@10.1.130.239:1521:ora"; Connection con = DriverManager.getConnection(url, "edc_export", "edc_export"); @@ -35,11 +32,10 @@ public class OracleJDBCTest { p0.execute(); con.commit(); con.close(); - RequestSpanAssert.assertEquals(new String[][]{ - {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, - {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.commit"}, - {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.close"}, - }, true); + RequestSpanAssert.assertEquals( + new String[][] {{"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, + {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.commit"}, + {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.close"},}, true); } } diff --git a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java index e88855443..5a35f0b5f 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java +++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisClusterTest.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.jedis.v2.plugin; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.junit.Test; @@ -13,7 +14,7 @@ import java.util.Set; public class JedisClusterTest { @Test - public void test() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException { + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.jedis.v2.plugin.JedisClusterTest"}); } diff --git a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java index ebf5d079c..e33a0df9f 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java +++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/ai/cloud/skywalking/jedis/v2/plugin/JedisTest.java @@ -1,5 +1,6 @@ package com.ai.cloud.skywalking.jedis.v2.plugin; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.junit.Test; @@ -10,7 +11,7 @@ import java.sql.SQLException; public class JedisTest { @Test - public void test() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException { + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { TracingBootstrap.main(new String[] {"com.ai.cloud.skywalking.jedis.v2.plugin.JedisTest"}); } diff --git a/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/test/com/ai/cloud/skywalking/plugin/tomcat78x/TomcatPluginTest.java b/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/test/com/ai/cloud/skywalking/plugin/tomcat78x/TomcatPluginTest.java index ecc280db4..72080e8f9 100644 --- a/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/test/com/ai/cloud/skywalking/plugin/tomcat78x/TomcatPluginTest.java +++ b/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/test/com/ai/cloud/skywalking/plugin/tomcat78x/TomcatPluginTest.java @@ -1,5 +1,6 @@ package test.com.ai.cloud.skywalking.plugin.tomcat78x; +import com.ai.cloud.skywalking.plugin.PluginException; import com.ai.cloud.skywalking.plugin.TracingBootstrap; import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.apache.catalina.LifecycleException; @@ -20,9 +21,8 @@ import java.lang.reflect.InvocationTargetException; public class TomcatPluginTest { @Test - public void test() throws InvocationTargetException, NoSuchMethodException, ClassNotFoundException, IllegalAccessException { - TracingBootstrap - .main(new String[]{TomcatPluginTest.class.getName()}); + public void test() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, PluginException { + TracingBootstrap.main(new String[] {TomcatPluginTest.class.getName()}); } public static void main(String[] args) throws ServletException, LifecycleException, IOException, InterruptedException { @@ -31,9 +31,7 @@ public class TomcatPluginTest { // curl httpclient visitURL("http://127.0.0.1:8080/hello"); // assert client - RequestSpanAssert.assertEquals(new String[][]{ - {"0", "http://127.0.0.1:8080/hello" , ""} - }); + RequestSpanAssert.assertEquals(new String[][] {{"0", "http://127.0.0.1:8080/hello", ""}}); } public static void visitURL(String url) throws IOException { @@ -42,8 +40,7 @@ public class TomcatPluginTest { HttpGet httpget = new HttpGet(url); ResponseHandler responseHandler = new ResponseHandler() { @Override - public String handleResponse( - final HttpResponse response) throws ClientProtocolException, IOException { + public String handleResponse(final HttpResponse response) throws ClientProtocolException, IOException { int status = response.getStatusLine().getStatusCode(); if (status >= 200 && status < 300) { HttpEntity entity = response.getEntity(); diff --git a/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/target/classes/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/target/classes/skywalking-plugin.def index b406779af..0e95388d3 100644 --- a/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/target/classes/skywalking-plugin.def +++ b/skywalking-collector/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/target/classes/skywalking-plugin.def @@ -1 +1 @@ -com.ai.cloud.skywalking.plugin.tomcat8.define.Tomcat8PluginDefine +com.ai.cloud.skywalking.plugin.tomcat78x.define.TomcatPluginDefine