Refactor trace related code to make CAT dependency optional

apollo-adminservice/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.3.0</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -19,11 +19,6 @@
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-biz</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.ctrip.framework.apollo</groupId>
-			<artifactId>apollo-buildtools</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<!-- end of apollo -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -108,11 +103,6 @@
 				<package.environment>github</package.environment>
 			</properties>
 			<dependencies>
-				<!-- disable cat for outside use -->
-				<dependency>
-					<groupId>com.ctrip.framework.apollo</groupId>
-					<artifactId>apollo-buildtools</artifactId>
-				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceHealthIndicator.java

 package com.ctrip.framework.apollo.adminservice;
 
+import com.ctrip.framework.apollo.biz.service.AppService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
 
-import com.ctrip.framework.apollo.biz.service.AppService;
-
 @Component
 public class AdminServiceHealthIndicator implements HealthIndicator {
 

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppController.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.service.AdminService;
+import com.ctrip.framework.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.common.dto.AppDTO;
+import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.common.exception.BadRequestException;
+import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.common.utils.InputValidator;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -11,15 +19,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.service.AdminService;
-import com.ctrip.framework.apollo.biz.service.AppService;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
-import com.ctrip.framework.apollo.common.utils.InputValidator;
-import com.ctrip.framework.apollo.common.dto.AppDTO;
-import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
-import com.ctrip.framework.apollo.core.utils.StringUtils;
+import java.util.List;
 
 @RestController
 public class AppController {

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceController.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
+import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
+import com.ctrip.framework.apollo.common.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.common.entity.AppNamespace;
+import com.ctrip.framework.apollo.common.exception.BadRequestException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.framework.apollo.common.entity.AppNamespace;
-import com.ctrip.framework.apollo.biz.service.AppNamespaceService;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
-import com.ctrip.framework.apollo.common.dto.AppNamespaceDTO;
-import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.core.utils.StringUtils;
-
 @RestController
 public class AppNamespaceController {
 

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ClusterController.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.service.ClusterService;
+import com.ctrip.framework.apollo.common.dto.ClusterDTO;
+import com.ctrip.framework.apollo.common.exception.BadRequestException;
+import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.common.utils.InputValidator;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10,13 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.framework.apollo.biz.entity.Cluster;
-import com.ctrip.framework.apollo.biz.service.ClusterService;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
-import com.ctrip.framework.apollo.common.utils.InputValidator;
-import com.ctrip.framework.apollo.common.dto.ClusterDTO;
-import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import java.util.List;
 
 @RestController
 public class ClusterController {

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/CommitController.java

@@ -2,8 +2,8 @@ package com.ctrip.framework.apollo.adminservice.controller;
 
 import com.ctrip.framework.apollo.biz.entity.Commit;
 import com.ctrip.framework.apollo.biz.service.CommitService;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.dto.CommitDTO;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ctrip.framework.apollo.adminservice.aop.PreAcquireNamespaceLock;
 import com.ctrip.framework.apollo.biz.entity.Commit;
 import com.ctrip.framework.apollo.biz.entity.Item;
@@ -18,10 +8,20 @@ import com.ctrip.framework.apollo.biz.service.CommitService;
 import com.ctrip.framework.apollo.biz.service.ItemService;
 import com.ctrip.framework.apollo.biz.service.NamespaceService;
 import com.ctrip.framework.apollo.biz.utils.ConfigChangeContentBuilder;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.dto.ItemDTO;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 @RestController
 public class ItemController {

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetController.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
+import com.ctrip.framework.apollo.adminservice.aop.PreAcquireNamespaceLock;
+import com.ctrip.framework.apollo.biz.service.ItemSetService;
+import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -9,10 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.framework.apollo.adminservice.aop.PreAcquireNamespaceLock;
-import com.ctrip.framework.apollo.biz.service.ItemSetService;
-import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
-
 @RestController
 public class ItemSetController {
 

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceController.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.service.NamespaceService;
+import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
+import com.ctrip.framework.apollo.common.exception.BadRequestException;
+import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+import com.ctrip.framework.apollo.common.utils.InputValidator;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10,13 +16,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ctrip.framework.apollo.biz.entity.Namespace;
-import com.ctrip.framework.apollo.biz.service.NamespaceService;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
-import com.ctrip.framework.apollo.common.utils.InputValidator;
-import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
-import com.ctrip.framework.apollo.common.exception.BadRequestException;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import java.util.List;
 
 @RestController
 public class NamespaceController {

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/NamespaceLockController.java

@@ -5,9 +5,9 @@ import com.ctrip.framework.apollo.biz.entity.NamespaceLock;
 import com.ctrip.framework.apollo.biz.service.NamespaceLockService;
 import com.ctrip.framework.apollo.biz.service.NamespaceService;
 import com.ctrip.framework.apollo.biz.utils.ApolloSwitcher;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.dto.NamespaceLockDTO;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseController.java

@@ -13,9 +13,9 @@ import com.ctrip.framework.apollo.biz.service.ReleaseService;
 import com.ctrip.framework.apollo.biz.utils.ReleaseMessageKeyGenerator;
 import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
 import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/AdminServiceTestConfiguration.java

 package com.ctrip.framework.apollo;
 
+import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
 import com.ctrip.framework.apollo.common.controller.HttpMessageConverterConfiguration;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -8,8 +9,6 @@ import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
-
 @Configuration
 @ComponentScan(excludeFilters = {@Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
         LocalAdminServiceApplication.class, AdminServiceApplication.class,

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import javax.annotation.PostConstruct;
+import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
 
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
-import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
+import javax.annotation.PostConstruct;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = AdminServiceTestConfiguration.class)

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppControllerTest.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.common.dto.AppDTO;
+import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,11 +14,6 @@ import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.repository.AppRepository;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
-import com.ctrip.framework.apollo.common.dto.AppDTO;
-
 public class AppControllerTest extends AbstractControllerTest {
 
   @Autowired

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AppNamespaceControllerTest.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import com.ctrip.framework.apollo.common.entity.AppNamespace;
 import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
 import com.ctrip.framework.apollo.common.dto.AppNamespaceDTO;
+import com.ctrip.framework.apollo.common.entity.AppNamespace;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerExceptionTest.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.List;
+import com.ctrip.framework.apollo.biz.service.AdminService;
+import com.ctrip.framework.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.common.dto.AppDTO;
+import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.exception.ServiceException;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -16,12 +17,11 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.service.AdminService;
-import com.ctrip.framework.apollo.biz.service.AppService;
-import com.ctrip.framework.apollo.common.dto.AppDTO;
-import com.ctrip.framework.apollo.common.exception.NotFoundException;
-import com.ctrip.framework.apollo.common.exception.ServiceException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ControllerExceptionTest {

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerIntegrationExceptionTest.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.when;
+import com.google.gson.Gson;
 
-import java.util.Map;
+import com.ctrip.framework.apollo.biz.service.AdminService;
+import com.ctrip.framework.apollo.biz.service.AppService;
+import com.ctrip.framework.apollo.common.dto.AppDTO;
+import com.ctrip.framework.apollo.common.entity.App;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -16,12 +18,10 @@ import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.client.HttpStatusCodeException;
 
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.service.AdminService;
-import com.ctrip.framework.apollo.biz.service.AppService;
-import com.ctrip.framework.apollo.common.dto.AppDTO;
+import java.util.Map;
 
-import com.google.gson.Gson;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
 
 public class ControllerIntegrationExceptionTest extends AbstractControllerTest {
 

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ItemSetControllerTest.java

 package com.ctrip.framework.apollo.adminservice.controller;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Item;
+import com.ctrip.framework.apollo.biz.repository.ItemRepository;
+import com.ctrip.framework.apollo.common.dto.AppDTO;
+import com.ctrip.framework.apollo.common.dto.ClusterDTO;
+import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
+import com.ctrip.framework.apollo.common.dto.ItemDTO;
+import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -12,13 +18,7 @@ import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.springframework.web.client.RestTemplate;
 
-import com.ctrip.framework.apollo.biz.entity.Item;
-import com.ctrip.framework.apollo.biz.repository.ItemRepository;
-import com.ctrip.framework.apollo.common.dto.AppDTO;
-import com.ctrip.framework.apollo.common.dto.ClusterDTO;
-import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
-import com.ctrip.framework.apollo.common.dto.ItemDTO;
-import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
+import java.util.List;
 
 public class ItemSetControllerTest extends AbstractControllerTest {
 

apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ReleaseControllerTest.java

@@ -9,12 +9,12 @@ import com.ctrip.framework.apollo.biz.message.Topics;
 import com.ctrip.framework.apollo.biz.repository.ReleaseRepository;
 import com.ctrip.framework.apollo.biz.service.NamespaceService;
 import com.ctrip.framework.apollo.biz.service.ReleaseService;
-import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.common.dto.AppDTO;
 import com.ctrip.framework.apollo.common.dto.ClusterDTO;
 import com.ctrip.framework.apollo.common.dto.ItemDTO;
 import com.ctrip.framework.apollo.common.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.common.dto.ReleaseDTO;
+import com.ctrip.framework.apollo.core.ConfigConsts;
 
 import org.junit.Assert;
 import org.junit.Test;

apollo-adminservice/src/test/resources/META-INF/plexus/plexus.xml

-<plexus>
-	<components>
-		<component>
-			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.spi.MessageManager</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
-			</implementation>
-		</component>
-	</components>
-</plexus>

apollo-assembly/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.3.0</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -27,11 +27,6 @@
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-portal</artifactId>
 		</dependency>
-        <!-- disable cat for assembly -->
-		<dependency>
-			<groupId>com.ctrip.framework.apollo</groupId>
-			<artifactId>apollo-buildtools</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>

apollo-assembly/src/main/java/com/ctrip/framework/apollo/assembly/ApolloApplication.java

 package com.ctrip.framework.apollo.assembly;
 
+import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
+import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
+import com.ctrip.framework.apollo.portal.PortalApplication;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.actuate.system.ApplicationPidFileWriter;
@@ -10,10 +14,6 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import com.ctrip.framework.apollo.portal.PortalApplication;
-import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
-import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
-
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
     HibernateJpaAutoConfiguration.class})
 public class ApolloApplication {

apollo-assembly/src/main/resources/META-INF/plexus/plexus.xml

-<plexus>
-	<components>
-		<component>
-			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.spi.MessageManager</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
-			</implementation>
-		</component>
-	</components>
-</plexus>

apollo-assembly/src/test/java/com/ctrip/framework/apollo/assembly/LocalApolloApplication.java

 package com.ctrip.framework.apollo.assembly;
 
+import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
+import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
+import com.ctrip.framework.apollo.portal.PortalApplication;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.actuate.system.ApplicationPidFileWriter;
@@ -10,10 +14,6 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import com.ctrip.framework.apollo.adminservice.AdminServiceApplication;
-import com.ctrip.framework.apollo.configservice.ConfigServiceApplication;
-import com.ctrip.framework.apollo.portal.PortalApplication;
-
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
     HibernateJpaAutoConfiguration.class})
 public class LocalApolloApplication {

apollo-biz/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>apollo</artifactId>
 		<groupId>com.ctrip.framework.apollo</groupId>
-		<version>0.3.0</version>
+		<version>0.4.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-biz</artifactId>
@@ -24,11 +24,6 @@
 			<artifactId>spring-cloud-starter-eureka</artifactId>
 		</dependency>
 		<!-- end of eureka -->
-		<dependency>
-			<groupId>com.ctrip.framework.apollo</groupId>
-			<artifactId>apollo-buildtools</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Audit.java

@@ -2,13 +2,13 @@ package com.ctrip.framework.apollo.biz.entity;
 
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
 @Entity
 @Table(name = "Audit")
 @SQLDelete(sql = "Update Audit set isDeleted = 1 where id = ?")

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java

@@ -2,13 +2,13 @@ package com.ctrip.framework.apollo.biz.entity;
 
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
 /**
  * @author Jason Song(song_s@ctrip.com)
  */

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/GrayReleaseRule.java

@@ -2,7 +2,6 @@ package com.ctrip.framework.apollo.biz.entity;
 
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 
-
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java

@@ -2,14 +2,14 @@ package com.ctrip.framework.apollo.biz.entity;
 
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
 @Entity
 @Table(name = "Item")
 @SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Namespace.java

@@ -2,13 +2,13 @@ package com.ctrip.framework.apollo.biz.entity;
 
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
 @Entity
 @Table(name = "Namespace")
 @SQLDelete(sql = "Update Namespace set isDeleted = 1 where id = ?")

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Privilege.java

@@ -2,13 +2,13 @@ package com.ctrip.framework.apollo.biz.entity;
 
 import com.ctrip.framework.apollo.common.entity.BaseEntity;
 
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
 @Entity
 @Table(name = "Privilege")
 @SQLDelete(sql = "Update Privilege set isDeleted = 1 where id = ?")

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRulesHolder.java

@@ -20,9 +20,8 @@ import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
 import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,12 +101,12 @@ public class GrayReleaseRulesHolder implements ReleaseMessageListener, Initializ
   }
 
   private void periodicScanRules() {
-    Transaction transaction = Cat.newTransaction("Apollo.GrayReleaseRulesScanner",
+    Transaction transaction = Tracer.newTransaction("Apollo.GrayReleaseRulesScanner",
         "scanGrayReleaseRules");
     try {
       loadVersion.incrementAndGet();
       scanGrayReleaseRules();
-      transaction.setStatus(Message.SUCCESS);
+      transaction.setStatus(Transaction.SUCCESS);
     } catch (Throwable ex) {
       transaction.setStatus(ex);
       logger.error("Scan gray release rule failed", ex);
@@ -238,7 +237,7 @@ public class GrayReleaseRulesHolder implements ReleaseMessageListener, Initializ
       ruleItems = GrayReleaseRuleItemTransformer.batchTransformFromJSON(grayReleaseRule.getRules());
     } catch (Throwable ex) {
       ruleItems = Sets.newHashSet();
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger.error("parse rule for gray release rule {} failed", grayReleaseRule.getId(), ex);
     }
 
@@ -257,7 +256,7 @@ public class GrayReleaseRulesHolder implements ReleaseMessageListener, Initializ
         databaseScanInterval = Integer.parseInt(interval);
       }
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger.error("Load apollo gray release rule scan interval from server config failed", ex);
     }
   }

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/DatabaseMessageSender.java

@@ -2,9 +2,8 @@ package com.ctrip.framework.apollo.biz.message;
 
 import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
 import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,11 +30,11 @@ public class DatabaseMessageSender implements MessageSender {
       return;
     }
 
-    Cat.logEvent("Apollo.AdminService.ReleaseMessage", message);
-    Transaction transaction = Cat.newTransaction("Apollo.AdminService", "sendMessage");
+    Tracer.logEvent("Apollo.AdminService.ReleaseMessage", message);
+    Transaction transaction = Tracer.newTransaction("Apollo.AdminService", "sendMessage");
     try {
       releaseMessageRepository.save(new ReleaseMessage(message));
-      transaction.setStatus(Message.SUCCESS);
+      transaction.setStatus(Transaction.SUCCESS);
     } catch (Throwable ex) {
       logger.error("Sending message to database failed", ex);
       transaction.setStatus(ex);

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/ReleaseMessageScanner.java

@@ -5,9 +5,8 @@ import com.google.common.collect.Lists;
 import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
 import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,10 +47,10 @@ public class ReleaseMessageScanner implements InitializingBean {
     populateDataBaseInterval();
     maxIdScanned = loadLargestMessageId();
     executorService.scheduleWithFixedDelay((Runnable) () -> {
-      Transaction transaction = Cat.newTransaction("Apollo.ReleaseMessageScanner", "scanMessage");
+      Transaction transaction = Tracer.newTransaction("Apollo.ReleaseMessageScanner", "scanMessage");
       try {
         scanMessages();
-        transaction.setStatus(Message.SUCCESS);
+        transaction.setStatus(Transaction.SUCCESS);
       } catch (Throwable ex) {
         transaction.setStatus(ex);
         logger.error("Scan and send message failed", ex);
@@ -119,7 +118,7 @@ public class ReleaseMessageScanner implements InitializingBean {
         try {
           listener.handleMessage(message, Topics.APOLLO_RELEASE_TOPIC);
         } catch (Throwable ex) {
-          Cat.logError(ex);
+          Tracer.logError(ex);
           logger.error("Failed to invoke message listener {}", listener.getClass(), ex);
         }
       }
@@ -134,7 +133,7 @@ public class ReleaseMessageScanner implements InitializingBean {
         databaseScanInterval = Integer.parseInt(interval);
       }
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger.error("Load apollo message scan interval from system property failed", ex);
     }
   }

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import org.springframework.data.repository.PagingAndSortingRepository;
-
 import com.ctrip.framework.apollo.common.entity.AppNamespace;
 
+import org.springframework.data.repository.PagingAndSortingRepository;
+
 import java.util.List;
 import java.util.Set;
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import java.util.List;
+import com.ctrip.framework.apollo.common.entity.App;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.ctrip.framework.apollo.common.entity.App;
+import java.util.List;
 
 public interface AppRepository extends PagingAndSortingRepository<App, Long> {
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AuditRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Audit;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.ctrip.framework.apollo.biz.entity.Audit;
+import java.util.List;
 
 public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/GrayReleaseRuleRepository.java

 package com.ctrip.framework.apollo.biz.repository;
+
 import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
-import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ItemRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Item;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ctrip.framework.apollo.biz.entity.Item;
+import java.util.List;
 
 public interface ItemRepository extends PagingAndSortingRepository<Item, Long> {
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/NamespaceRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-import com.ctrip.framework.apollo.biz.entity.Namespace;
+import java.util.List;
 
 public interface NamespaceRepository extends PagingAndSortingRepository<Namespace, Long> {
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/PrivilegeRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import org.springframework.data.repository.PagingAndSortingRepository;
-
 import com.ctrip.framework.apollo.biz.entity.Privilege;
 
+import org.springframework.data.repository.PagingAndSortingRepository;
+
 import java.util.List;
 
 public interface PrivilegeRepository extends PagingAndSortingRepository<Privilege, Long> {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ReleaseRepository.java

 package com.ctrip.framework.apollo.biz.repository;
 
-import java.util.List;
-import java.util.Set;
+import com.ctrip.framework.apollo.biz.entity.Release;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Modifying;
@@ -9,7 +8,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 
-import com.ctrip.framework.apollo.biz.entity.Release;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AdminService.java

 package com.ctrip.framework.apollo.biz.service;
 
+import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.core.ConfigConsts;
-
 @Service
 public class AdminService {
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java

@@ -8,10 +8,10 @@ import com.ctrip.framework.apollo.biz.entity.Cluster;
 import com.ctrip.framework.apollo.biz.entity.Namespace;
 import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
 import com.ctrip.framework.apollo.common.entity.AppNamespace;
+import com.ctrip.framework.apollo.common.exception.ServiceException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
-import com.ctrip.framework.apollo.common.exception.ServiceException;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppService.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.List;
-import java.util.Objects;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.common.exception.ServiceException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -9,11 +12,8 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.entity.Audit;
-import com.ctrip.framework.apollo.biz.repository.AppRepository;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
-import com.ctrip.framework.apollo.common.exception.ServiceException;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 public class AppService {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AuditService.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.List;
+import com.ctrip.framework.apollo.biz.entity.Audit;
+import com.ctrip.framework.apollo.biz.repository.AuditRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.ctrip.framework.apollo.biz.entity.Audit;
-import com.ctrip.framework.apollo.biz.repository.AuditRepository;
+import java.util.List;
 
 @Service
 public class AuditService {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ClusterService.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.google.common.base.Strings;
 
 import com.ctrip.framework.apollo.biz.entity.Audit;
 import com.ctrip.framework.apollo.biz.entity.Cluster;
 import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
+import com.ctrip.framework.apollo.common.exception.ServiceException;
 import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.ConfigConsts;
-import com.ctrip.framework.apollo.common.exception.ServiceException;
 
-import com.google.common.base.Strings;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 @Service
 public class ClusterService {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/InstanceService.java

 package com.ctrip.framework.apollo.biz.service;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Interner;
 import com.google.common.collect.Lists;
 
 import com.ctrip.framework.apollo.biz.entity.Instance;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java

@@ -8,14 +8,13 @@ import com.ctrip.framework.apollo.biz.entity.Audit;
 import com.ctrip.framework.apollo.biz.entity.Item;
 import com.ctrip.framework.apollo.biz.entity.Namespace;
 import com.ctrip.framework.apollo.biz.repository.ItemRepository;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,10 +73,10 @@ public class ItemService implements InitializingBean {
   @Override
   public void afterPropertiesSet() throws Exception {
     executorService.scheduleWithFixedDelay(() -> {
-      Transaction transaction = Cat.newTransaction("Apollo.ItemServiceLimitUpdater", "updateLimit");
+      Transaction transaction = Tracer.newTransaction("Apollo.ItemServiceLimitUpdater", "updateLimit");
       try {
         updateLimits();
-        transaction.setStatus(Message.SUCCESS);
+        transaction.setStatus(Transaction.SUCCESS);
       } catch (Throwable ex) {
         transaction.setStatus(ex);
       } finally {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemSetService.java

 package com.ctrip.framework.apollo.biz.service;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 import com.ctrip.framework.apollo.biz.entity.Audit;
 import com.ctrip.framework.apollo.biz.entity.Commit;
 import com.ctrip.framework.apollo.biz.entity.Item;
 import com.ctrip.framework.apollo.biz.entity.Namespace;
 import com.ctrip.framework.apollo.biz.utils.ConfigChangeContentBuilder;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.dto.ItemChangeSets;
 import com.ctrip.framework.apollo.common.dto.ItemDTO;
 import com.ctrip.framework.apollo.common.exception.NotFoundException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 
 @Service

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/NamespaceService.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 import com.ctrip.framework.apollo.biz.entity.Audit;
 import com.ctrip.framework.apollo.biz.entity.Cluster;
 import com.ctrip.framework.apollo.biz.entity.Namespace;
 import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
 import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
 import com.ctrip.framework.apollo.common.entity.AppNamespace;
-import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.common.exception.ServiceException;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 public class NamespaceService {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ReleaseMessageService.java

@@ -4,7 +4,7 @@ import com.google.common.collect.Lists;
 
 import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
 import com.ctrip.framework.apollo.biz.repository.ReleaseMessageRepository;
-import com.dianping.cat.Cat;
+import com.ctrip.framework.apollo.tracer.Tracer;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,7 +13,6 @@ import org.springframework.util.CollectionUtils;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Jason Song(song_s@ctrip.com)
@@ -43,7 +42,7 @@ public class ReleaseMessageService {
         releaseMessage.setId((Long) o[1]);
         releaseMessages.add(releaseMessage);
       } catch (Exception ex) {
-        Cat.logError("Parsing LatestReleaseMessagesGroupByMessages failed", ex);
+        Tracer.logError("Parsing LatestReleaseMessagesGroupByMessages failed", ex);
       }
     }
     return releaseMessages;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/utils/ConfigChangeContentBuilder.java

@@ -6,7 +6,6 @@ import com.google.gson.GsonBuilder;
 import com.ctrip.framework.apollo.biz.entity.Item;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/repository/AppRepositoryTest.java

 package com.ctrip.framework.apollo.biz.repository;
 
+import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
+import com.ctrip.framework.apollo.common.entity.App;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.common.entity.App;
-
 public class AppRepositoryTest extends AbstractIntegrationTest{
 
   @Autowired

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTest.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.Date;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.common.entity.App;
 import com.ctrip.framework.apollo.biz.entity.Audit;
 import com.ctrip.framework.apollo.biz.entity.Cluster;
 import com.ctrip.framework.apollo.biz.entity.Namespace;
 import com.ctrip.framework.apollo.biz.repository.AppRepository;
-import com.ctrip.framework.apollo.core.ConfigConsts;
+import com.ctrip.framework.apollo.common.entity.App;
 import com.ctrip.framework.apollo.common.exception.ServiceException;
+import com.ctrip.framework.apollo.core.ConfigConsts;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.List;
 
 public class AdminServiceTest extends AbstractIntegrationTest{
 

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTransactionTest.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.Date;
+import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
+import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
+import com.ctrip.framework.apollo.biz.repository.AppRepository;
+import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
+import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
+import com.ctrip.framework.apollo.common.entity.App;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -11,12 +16,7 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 
-import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.repository.AppNamespaceRepository;
-import com.ctrip.framework.apollo.biz.repository.AppRepository;
-import com.ctrip.framework.apollo.biz.repository.ClusterRepository;
-import com.ctrip.framework.apollo.biz.repository.NamespaceRepository;
+import java.util.Date;
 
 public class AdminServiceTransactionTest extends AbstractIntegrationTest {
 

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ClusterServiceTest.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.Date;
+import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
+import com.ctrip.framework.apollo.common.entity.App;
+import com.ctrip.framework.apollo.common.exception.ServiceException;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.common.exception.ServiceException;
+import java.util.Date;
 
 public class ClusterServiceTest extends AbstractIntegrationTest {
 

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/NamespaceBranchServiceTest.java

@@ -14,7 +14,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.test.context.jdbc.Sql;
-import org.springframework.test.util.AssertionErrors;
 
 public class NamespaceBranchServiceTest extends AbstractIntegrationTest {
 

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/PrivilegeServiceTest.java

 package com.ctrip.framework.apollo.biz.service;
 
-import java.util.Date;
-import java.util.List;
+import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
+import com.ctrip.framework.apollo.biz.entity.Cluster;
+import com.ctrip.framework.apollo.biz.entity.Namespace;
+import com.ctrip.framework.apollo.biz.entity.Privilege;
+import com.ctrip.framework.apollo.common.entity.App;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
-import com.ctrip.framework.apollo.common.entity.App;
-import com.ctrip.framework.apollo.biz.entity.Cluster;
-import com.ctrip.framework.apollo.biz.entity.Namespace;
-import com.ctrip.framework.apollo.biz.entity.Privilege;
+import java.util.Date;
+import java.util.List;
 
 public class PrivilegeServiceTest extends AbstractIntegrationTest {
 

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ReleaseCreationTest.java

@@ -19,7 +19,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.test.context.jdbc.Sql;
 
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.Map;
 
 public class ReleaseCreationTest extends AbstractIntegrationTest {

apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/ServerConfigServiceTest.java

@@ -11,7 +11,8 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 

apollo-biz/src/test/resources/META-INF/plexus/plexus.xml

-<plexus>
-	<components>
-		<component>
-			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.spi.MessageManager</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
-			</implementation>
-		</component>
-	</components>
-</plexus>

apollo-buildtools/pom.xml

@@ -4,22 +4,12 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.3.0</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-buildtools</artifactId>
 	<name>Apollo BuildTools</name>
-	<properties>
-		<java.version>1.7</java.version>
-		<github.path>${project.artifactId}</github.path>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>com.dianping.cat</groupId>
-			<artifactId>cat-client</artifactId>
-		</dependency>
-	</dependencies>
 	<build>
 		<plugins>
 			<plugin>

apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullClientConfigManager.java

-package com.ctrip.framework.apollo.cat;
-
-import java.io.File;
-import java.util.List;
-
-import com.dianping.cat.configuration.ClientConfigManager;
-import com.dianping.cat.configuration.client.entity.Domain;
-import com.dianping.cat.configuration.client.entity.Server;
-
-public class NullClientConfigManager implements ClientConfigManager{
-
-  @Override
-  public Domain getDomain() {
-    return null;
-  }
-
-  @Override
-  public int getMaxMessageLength() {
-    return 0;
-  }
-
-  @Override
-  public String getServerConfigUrl() {
-    return null;
-  }
-
-  @Override
-  public List<Server> getServers() {
-    return null;
-  }
-
-  @Override
-  public int getTaggedTransactionCacheSize() {
-    return 0;
-  }
-
-  @Override
-  public void initialize(File configFile) throws Exception {
-    
-  }
-
-  @Override
-  public boolean isCatEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isDumpLocked() {
-    return false;
-  }
-
-  @Override
-  public int getQueueSize() {
-    return 0;
-  }
-
-}

apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullLoggerManager.java

-package com.ctrip.framework.apollo.cat;
-
-import org.codehaus.plexus.logging.console.ConsoleLoggerManager;
-
-public class NullLoggerManager extends ConsoleLoggerManager{
-
-
-}

apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullMessageManager.java

-package com.ctrip.framework.apollo.cat;
-
-import java.io.IOException;
-
-import org.codehaus.plexus.logging.LogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import org.unidal.lookup.ContainerHolder;
-import org.unidal.lookup.annotation.Inject;
-
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
-import com.dianping.cat.message.internal.MessageIdFactory;
-import com.dianping.cat.message.spi.MessageManager;
-import com.dianping.cat.message.spi.MessageTree;
-
-public class NullMessageManager extends ContainerHolder
-    implements
-      MessageManager,
-      Initializable,
-      LogEnabled {
-
-  @Inject
-  private MessageIdFactory m_factory;
-
-  @Override
-  public void enableLogging(Logger logger) {
-
-  }
-
-  @Override
-  public void initialize() throws InitializationException {
-    try {
-      m_factory.initialize("localhost");
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-  }
-
-  @Override
-  public void add(Message message) {
-
-  }
-
-  @Override
-  public void end(Transaction transaction) {
-
-  }
-
-  @Override
-  public Transaction getPeekTransaction() {
-    return null;
-  }
-
-  @Override
-  public MessageTree getThreadLocalMessageTree() {
-    return null;
-  }
-
-  @Override
-  public boolean hasContext() {
-    return false;
-  }
-
-  @Override
-  public boolean isMessageEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isCatEnabled() {
-    return false;
-  }
-
-  @Override
-  public boolean isTraceMode() {
-    return false;
-  }
-
-  @Override
-  public void reset() {
-
-  }
-
-  @Override
-  public void setTraceMode(boolean traceMode) {
-
-  }
-
-  @Override
-  public void setup() {
-
-  }
-
-  @Override
-  public void start(Transaction transaction, boolean forked) {
-
-  }
-
-  @Override
-  public void bind(String tag, String title) {
-
-  }
-
-  @Override
-  public String getDomain() {
-    return null;
-  }
-
-}

apollo-buildtools/src/main/java/com/ctrip/framework/apollo/cat/NullTransportManager.java

-package com.ctrip.framework.apollo.cat;
-
-import com.dianping.cat.message.io.MessageSender;
-import com.dianping.cat.message.io.TransportManager;
-import com.dianping.cat.message.spi.MessageTree;
-
-public class NullTransportManager implements TransportManager {
-
-  private static final MessageSender nullMessageSender = new MessageSender() {
-
-    @Override
-    public void initialize() {
-
-    }
-
-    @Override
-    public void send(MessageTree tree) {
-
-    }
-
-    @Override
-    public void shutdown() {
-
-    }
-
-  };
-
-  @Override
-  public MessageSender getSender() {
-    return nullMessageSender;
-  }
-
-}

apollo-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.3.0</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -20,16 +20,11 @@
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.ctrip.framework.apollo</groupId>
-			<artifactId>apollo-buildtools</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<!-- end of apollo -->
 		<!-- foundation service -->
 		<dependency>
-			<groupId>com.ctrip.framework</groupId>
-			<artifactId>framework-foundation</artifactId>
+			<groupId>org.unidal.framework</groupId>
+			<artifactId>foundation-service</artifactId>
 		</dependency>
 		<!-- end of foundation service -->
 		<!-- log -->
@@ -37,27 +32,6 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<!-- end of log -->
 		<!-- test -->
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
@@ -69,13 +43,29 @@
 			<artifactId>commons-logging</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- end of test -->
 		<!-- dal-jdbc -->
 		<dependency>
 			<groupId>org.unidal.framework</groupId>
 			<artifactId>dal-jdbc</artifactId>
 			<version>2.4.0</version>
-			<scope>provided</scope>
+            <optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>com.dianping.cat</groupId>
+					<artifactId>cat-client</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- end of dal-jdbc -->
 	</dependencies>

apollo-client/src/main/java/com/ctrip/framework/apollo/ConfigService.java

@@ -6,7 +6,7 @@ import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
 import com.ctrip.framework.apollo.internals.ConfigManager;
 import com.ctrip.framework.apollo.spi.ConfigFactory;
 import com.ctrip.framework.apollo.spi.ConfigRegistry;
-import com.dianping.cat.Cat;
+import com.ctrip.framework.apollo.tracer.Tracer;
 
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -51,7 +51,7 @@ public class ConfigService {
       return s_instance.m_container.lookup(ConfigManager.class);
     } catch (ComponentLookupException ex) {
       ApolloConfigException exception = new ApolloConfigException("Unable to load ConfigManager!", ex);
-      Cat.logError(exception);
+      Tracer.logError(exception);
       throw exception;
     }
   }
@@ -61,7 +61,7 @@ public class ConfigService {
       return s_instance.m_container.lookup(ConfigRegistry.class);
     } catch (ComponentLookupException ex) {
       ApolloConfigException exception = new ApolloConfigException("Unable to load ConfigRegistry!", ex);
-      Cat.logError(exception);
+      Tracer.logError(exception);
       throw exception;
     }
   }

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfig.java

@@ -11,10 +11,9 @@ import com.ctrip.framework.apollo.enums.PropertyChangeType;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
 import com.ctrip.framework.apollo.model.ConfigChange;
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 import com.ctrip.framework.apollo.util.parser.Parsers;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,7 +62,7 @@ public abstract class AbstractConfig implements Config {
         return Integer.parseInt(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getIntProperty for %s failed, return default value %d", key,
               defaultValue), ex));
     }
@@ -79,7 +78,7 @@ public abstract class AbstractConfig implements Config {
         return Long.parseLong(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getLongProperty for %s failed, return default value %d", key,
               defaultValue), ex));
     }
@@ -95,7 +94,7 @@ public abstract class AbstractConfig implements Config {
         return Short.parseShort(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getShortProperty for %s failed, return default value %d", key,
               defaultValue), ex));
     }
@@ -111,7 +110,7 @@ public abstract class AbstractConfig implements Config {
         return Float.parseFloat(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getFloatProperty for %s failed, return default value %f", key,
               defaultValue), ex));
     }
@@ -127,7 +126,7 @@ public abstract class AbstractConfig implements Config {
         return Double.parseDouble(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getDoubleProperty for %s failed, return default value %f", key,
               defaultValue), ex));
     }
@@ -143,7 +142,7 @@ public abstract class AbstractConfig implements Config {
         return Byte.parseByte(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getByteProperty for %s failed, return default value %d", key,
               defaultValue), ex));
     }
@@ -159,7 +158,7 @@ public abstract class AbstractConfig implements Config {
         return Boolean.parseBoolean(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getBooleanProperty for %s failed, return default value %b", key,
               defaultValue), ex));
     }
@@ -175,7 +174,7 @@ public abstract class AbstractConfig implements Config {
         return value.split(delimiter);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getArrayProperty for %s failed, return default value", key), ex));
     }
     return defaultValue;
@@ -190,7 +189,7 @@ public abstract class AbstractConfig implements Config {
         return Enum.valueOf(enumType, value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getEnumProperty for %s failed, return default value %s", key,
               defaultValue), ex));
     }
@@ -207,7 +206,7 @@ public abstract class AbstractConfig implements Config {
         return Parsers.forDate().parse(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getDateProperty for %s failed, return default value %s", key,
               defaultValue), ex));
     }
@@ -224,7 +223,7 @@ public abstract class AbstractConfig implements Config {
         return Parsers.forDate().parse(value, format);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getDateProperty for %s failed, return default value %s", key,
               defaultValue), ex));
     }
@@ -241,7 +240,7 @@ public abstract class AbstractConfig implements Config {
         return Parsers.forDate().parse(value, format, locale);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getDateProperty for %s failed, return default value %s", key,
               defaultValue), ex));
     }
@@ -258,7 +257,7 @@ public abstract class AbstractConfig implements Config {
         return Parsers.forDuration().parseToMillis(value);
       }
     } catch (Throwable ex) {
-      Cat.logError(new ApolloConfigException(
+      Tracer.logError(new ApolloConfigException(
           String.format("getDurationProperty for %s failed, return default value %d", key,
               defaultValue), ex));
     }
@@ -272,13 +271,13 @@ public abstract class AbstractConfig implements Config {
         @Override
         public void run() {
           String listenerName = listener.getClass().getName();
-          Transaction transaction = Cat.newTransaction("Apollo.ConfigChangeListener", listenerName);
+          Transaction transaction = Tracer.newTransaction("Apollo.ConfigChangeListener", listenerName);
           try {
             listener.onChange(changeEvent);
-            transaction.setStatus(Message.SUCCESS);
+            transaction.setStatus(Transaction.SUCCESS);
           } catch (Throwable ex) {
             transaction.setStatus(ex);
-            Cat.logError(ex);
+            Tracer.logError(ex);
             logger.error("Failed to invoke config change listener {}", listenerName, ex);
           } finally {
             transaction.complete();

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigFile.java

 package com.ctrip.framework.apollo.internals;
 
 import com.ctrip.framework.apollo.ConfigFile;
+import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +30,7 @@ public abstract class AbstractConfigFile implements ConfigFile, RepositoryChange
     try {
       m_configProperties.set(m_configRepository.getConfig());
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger.warn("Init Apollo Config File failed - namespace: {}, reason: {}.",
           m_namespace, ExceptionUtil.getDetailMessage(ex));
     } finally {
@@ -55,7 +55,7 @@ public abstract class AbstractConfigFile implements ConfigFile, RepositoryChange
 
     m_configProperties.set(newConfigProperties);
 
-    Cat.logEvent("Apollo.Client.ConfigChanges", m_namespace);
+    Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
   }
 
 }

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/AbstractConfigRepository.java

@@ -2,8 +2,8 @@ package com.ctrip.framework.apollo.internals;
 
 import com.google.common.collect.Lists;
 
+import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +23,7 @@ public abstract class AbstractConfigRepository implements ConfigRepository {
       sync();
       return true;
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger
           .warn("Sync config failed, will retry. Repository {}, reason: {}", this.getClass(), ExceptionUtil
               .getDetailMessage(ex));
@@ -50,7 +50,7 @@ public abstract class AbstractConfigRepository implements ConfigRepository {
       try {
         listener.onRepositoryChange(namespace, newProperties);
       } catch (Throwable ex) {
-        Cat.logError(ex);
+        Tracer.logError(ex);
         logger.error("Failed to invoke repository change listener {}", listener.getClass(), ex);
       }
     }

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/ConfigServiceLocator.java

@@ -11,13 +11,12 @@ import com.google.gson.reflect.TypeToken;
 import com.ctrip.framework.apollo.core.dto.ServiceDTO;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 import com.ctrip.framework.apollo.util.ConfigUtil;
 import com.ctrip.framework.apollo.util.http.HttpRequest;
 import com.ctrip.framework.apollo.util.http.HttpResponse;
 import com.ctrip.framework.apollo.util.http.HttpUtil;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
 
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -94,7 +93,7 @@ public class ConfigServiceLocator implements Initializable {
           @Override
           public void run() {
             logger.debug("refresh config services");
-            Cat.logEvent("Apollo.MetaService", "periodicRefresh");
+            Tracer.logEvent("Apollo.MetaService", "periodicRefresh");
             tryUpdateConfigServices();
           }
         }, m_configUtil.getRefreshInterval(), m_configUtil.getRefreshInterval(),
@@ -109,11 +108,11 @@ public class ConfigServiceLocator implements Initializable {
     Throwable exception = null;
 
     for (int i = 0; i < maxRetries; i++) {
-      Transaction transaction = Cat.newTransaction("Apollo.MetaService", "getConfigService");
+      Transaction transaction = Tracer.newTransaction("Apollo.MetaService", "getConfigService");
       transaction.addData("Url", url);
       try {
         HttpResponse<List<ServiceDTO>> response = m_httpUtil.doGet(request, m_responseType);
-        transaction.setStatus(Message.SUCCESS);
+        transaction.setStatus(Transaction.SUCCESS);
         List<ServiceDTO> services = response.getBody();
         if (services == null || services.isEmpty()) {
           logConfigServiceToCat("Empty response!");
@@ -123,7 +122,7 @@ public class ConfigServiceLocator implements Initializable {
         logConfigServicesToCat(services);
         return;
       } catch (Throwable ex) {
-        Cat.logError(ex);
+        Tracer.logError(ex);
         transaction.setStatus(ex);
         exception = ex;
       } finally {
@@ -162,6 +161,6 @@ public class ConfigServiceLocator implements Initializable {
   }
 
   private void logConfigServiceToCat(String serviceUrl) {
-    Cat.logEvent("Apollo.Config.Services", serviceUrl);
+    Tracer.logEvent("Apollo.Config.Services", serviceUrl);
   }
 }

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java

@@ -6,8 +6,8 @@ import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
 import com.ctrip.framework.apollo.enums.PropertyChangeType;
 import com.ctrip.framework.apollo.model.ConfigChange;
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,7 +51,7 @@ public class DefaultConfig extends AbstractConfig implements RepositoryChangeLis
     try {
       m_configProperties.set(m_configRepository.getConfig());
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger.warn("Init Apollo Local Config failed - namespace: {}, reason: {}.",
           m_namespace, ExceptionUtil.getDetailMessage(ex));
     } finally {
@@ -119,7 +119,7 @@ public class DefaultConfig extends AbstractConfig implements RepositoryChangeLis
 
     this.fireConfigChange(new ConfigChangeEvent(m_namespace, actualChanges));
 
-    Cat.logEvent("Apollo.Client.ConfigChanges", m_namespace);
+    Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
   }
 
   private Map<String, ConfigChange> updateAndCalcConfigChanges(Properties newConfigProperties) {
@@ -185,7 +185,7 @@ public class DefaultConfig extends AbstractConfig implements RepositoryChangeLis
       try {
         properties.load(in);
       } catch (IOException ex) {
-        Cat.logError(ex);
+        Tracer.logError(ex);
         logger.error("Load resource config for namespace {} failed", namespace, ex);
       } finally {
         try {

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepository.java

@@ -6,11 +6,10 @@ import com.google.common.base.Preconditions;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 import com.ctrip.framework.apollo.util.ConfigUtil;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
 
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -58,7 +57,7 @@ public class LocalFileConfigRepository extends AbstractConfigRepository
     try {
       m_configUtil = m_container.lookup(ConfigUtil.class);
     } catch (ComponentLookupException ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       throw new ApolloConfigException("Unable to load component!", ex);
     }
     this.setLocalCacheDir(findLocalCacheDir(), false);
@@ -135,14 +134,14 @@ public class LocalFileConfigRepository extends AbstractConfigRepository
       return;
     }
 
-    Transaction transaction = Cat.newTransaction("Apollo.ConfigService", "syncLocalConfig");
+    Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "syncLocalConfig");
     Throwable exception = null;
     try {
       transaction.addData("Basedir", m_baseDir.getAbsolutePath());
       m_fileProperties = this.loadFromLocalCacheFile(m_baseDir, m_namespace);
-      transaction.setStatus(Message.SUCCESS);
+      transaction.setStatus(Transaction.SUCCESS);
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       transaction.setStatus(ex);
       exception = ex;
       //ignore
@@ -165,7 +164,7 @@ public class LocalFileConfigRepository extends AbstractConfigRepository
       updateFileProperties(properties);
       return true;
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger
           .warn("Sync config from upstream repository {} failed, reason: {}", m_upstream.getClass(),
               ExceptionUtil.getDetailMessage(ex));
@@ -197,7 +196,7 @@ public class LocalFileConfigRepository extends AbstractConfigRepository
         properties.load(in);
         logger.debug("Loading local config file {} successfully!", file.getAbsolutePath());
       } catch (IOException ex) {
-        Cat.logError(ex);
+        Tracer.logError(ex);
         throw new ApolloConfigException(String
             .format("Loading config from local cache file %s failed", file.getAbsolutePath()), ex);
       } finally {
@@ -225,17 +224,17 @@ public class LocalFileConfigRepository extends AbstractConfigRepository
 
     OutputStream out = null;
 
-    Transaction transaction = Cat.newTransaction("Apollo.ConfigService", "persistLocalConfigFile");
+    Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "persistLocalConfigFile");
     transaction.addData("LocalConfigFile", file.getAbsolutePath());
     try {
       out = new FileOutputStream(file);
       m_fileProperties.store(out, "Persisted by DefaultConfig");
-      transaction.setStatus(Message.SUCCESS);
+      transaction.setStatus(Transaction.SUCCESS);
     } catch (IOException ex) {
       ApolloConfigException exception =
           new ApolloConfigException(
               String.format("Persist local cache file %s failed", file.getAbsolutePath()), ex);
-      Cat.logError(exception);
+      Tracer.logError(exception);
       transaction.setStatus(exception);
       logger.warn("Persist local cache file {} failed, reason: {}.", file.getAbsolutePath(),
           ExceptionUtil.getDetailMessage(ex));
@@ -255,17 +254,17 @@ public class LocalFileConfigRepository extends AbstractConfigRepository
     if (baseDir.exists()) {
       return;
     }
-    Transaction transaction = Cat.newTransaction("Apollo.ConfigService", "createLocalConfigDir");
+    Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "createLocalConfigDir");
     transaction.addData("BaseDir", baseDir.getAbsolutePath());
     try {
       Files.createDirectory(baseDir.toPath());
-      transaction.setStatus(Message.SUCCESS);
+      transaction.setStatus(Transaction.SUCCESS);
     } catch (IOException ex) {
       ApolloConfigException exception =
           new ApolloConfigException(
               String.format("Create local config directory %s failed", baseDir.getAbsolutePath()),
               ex);
-      Cat.logError(exception);
+      Tracer.logError(exception);
       transaction.setStatus(exception);
       logger.warn(
           "Unable to create local config cache directory {}, reason: {}. Will not able to cache config file.",

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java

@@ -3,8 +3,8 @@ package com.ctrip.framework.apollo.internals;
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
 import com.ctrip.framework.apollo.core.utils.PropertiesUtil;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
+import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +45,7 @@ public class PropertiesConfigFile extends AbstractConfigFile {
           new ApolloConfigException(String
               .format("Parse properties file content failed for namespace: %s, cause: %s",
                   m_namespace, ExceptionUtil.getDetailMessage(ex)));
-      Cat.logError(exception);
+      Tracer.logError(exception);
       throw exception;
     }
   }

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigLongPollService.java

@@ -21,14 +21,13 @@ import com.ctrip.framework.apollo.core.schedule.ExponentialSchedulePolicy;
 import com.ctrip.framework.apollo.core.schedule.SchedulePolicy;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 import com.ctrip.framework.apollo.util.ConfigUtil;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
 import com.ctrip.framework.apollo.util.http.HttpRequest;
 import com.ctrip.framework.apollo.util.http.HttpResponse;
 import com.ctrip.framework.apollo.util.http.HttpUtil;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
 
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -123,7 +122,7 @@ public class RemoteConfigLongPollService implements Initializable {
       m_longPollStarted.set(false);
       ApolloConfigException exception =
           new ApolloConfigException("Schedule long polling refresh failed", ex);
-      Cat.logError(exception);
+      Tracer.logError(exception);
       logger.warn(ExceptionUtil.getDetailMessage(exception));
     }
   }
@@ -143,7 +142,7 @@ public class RemoteConfigLongPollService implements Initializable {
         } catch (InterruptedException e) {
         }
       }
-      Transaction transaction = Cat.newTransaction("Apollo.ConfigService", "pollNotification");
+      Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "pollNotification");
       try {
         if (lastServiceDto == null) {
           List<ServiceDTO> configServices = getConfigServices();
@@ -178,10 +177,10 @@ public class RemoteConfigLongPollService implements Initializable {
 
         m_longPollFailSchedulePolicyInSecond.success();
         transaction.addData("StatusCode", response.getStatusCode());
-        transaction.setStatus(Message.SUCCESS);
+        transaction.setStatus(Transaction.SUCCESS);
       } catch (Throwable ex) {
         lastServiceDto = null;
-        Cat.logError(ex);
+        Tracer.logError(ex);
         transaction.setStatus(ex);
         long sleepTimeInSecond = m_longPollFailSchedulePolicyInSecond.fail();
         logger.warn(
@@ -215,7 +214,7 @@ public class RemoteConfigLongPollService implements Initializable {
         try {
           remoteConfigRepository.onLongPollNotified(lastServiceDto);
         } catch (Throwable ex) {
-          Cat.logError(ex);
+          Tracer.logError(ex);
         }
       }
     }

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/RemoteConfigRepository.java

@@ -15,13 +15,12 @@ import com.ctrip.framework.apollo.core.dto.ServiceDTO;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
 import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 import com.ctrip.framework.apollo.util.ConfigUtil;
 import com.ctrip.framework.apollo.util.http.HttpRequest;
 import com.ctrip.framework.apollo.util.http.HttpResponse;
 import com.ctrip.framework.apollo.util.http.HttpUtil;
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
 
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -78,7 +77,7 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
       m_serviceLocator = m_container.lookup(ConfigServiceLocator.class);
       remoteConfigLongPollService = m_container.lookup(RemoteConfigLongPollService.class);
     } catch (ComponentLookupException ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       throw new ApolloConfigException("Unable to load component!", ex);
     }
     m_longPollServiceDto = new AtomicReference<>();
@@ -108,10 +107,10 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
         new Runnable() {
           @Override
           public void run() {
-            Cat.logEvent("Apollo.ConfigService", String.format("periodicRefresh: %s", m_namespace));
+            Tracer.logEvent("Apollo.ConfigService", String.format("periodicRefresh: %s", m_namespace));
             logger.debug("refresh config for namespace: {}", m_namespace);
             trySync();
-            Cat.logEvent("Apollo.Client.Version", Apollo.VERSION);
+            Tracer.logEvent("Apollo.Client.Version", Apollo.VERSION);
           }
         }, m_configUtil.getRefreshInterval(), m_configUtil.getRefreshInterval(),
         m_configUtil.getRefreshIntervalTimeUnit());
@@ -119,7 +118,7 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
 
   @Override
   protected synchronized void sync() {
-    Transaction transaction = Cat.newTransaction("Apollo.ConfigService", "syncRemoteConfig");
+    Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "syncRemoteConfig");
 
     try {
       ApolloConfig previous = m_configCache.get();
@@ -133,11 +132,11 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
       }
 
       if (current != null) {
-        Cat.logEvent(String.format("Apollo.Client.Configs.%s", current.getNamespaceName()),
+        Tracer.logEvent(String.format("Apollo.Client.Configs.%s", current.getNamespaceName()),
             current.getReleaseKey());
       }
 
-      transaction.setStatus(Message.SUCCESS);
+      transaction.setStatus(Transaction.SUCCESS);
     } catch (Throwable ex) {
       transaction.setStatus(ex);
       throw ex;
@@ -163,7 +162,7 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
     String appId = m_configUtil.getAppId();
     String cluster = m_configUtil.getCluster();
     String dataCenter = m_configUtil.getDataCenter();
-    Cat.logEvent("Apollo.Client.ConfigMeta", STRING_JOINER.join(appId, cluster, m_namespace));
+    Tracer.logEvent("Apollo.Client.ConfigMeta", STRING_JOINER.join(appId, cluster, m_namespace));
     int maxRetries = 2;
     Throwable exception = null;
 
@@ -184,14 +183,14 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
         logger.debug("Loading config from {}", url);
         HttpRequest request = new HttpRequest(url);
 
-        Transaction transaction = Cat.newTransaction("Apollo.ConfigService", "queryConfig");
+        Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "queryConfig");
         transaction.addData("Url", url);
         try {
 
           HttpResponse<ApolloConfig> response = m_httpUtil.doGet(request, ApolloConfig.class);
 
           transaction.addData("StatusCode", response.getStatusCode());
-          transaction.setStatus(Message.SUCCESS);
+          transaction.setStatus(Transaction.SUCCESS);
 
           if (response.getStatusCode() == 304) {
             logger.debug("Config server responds with 304 HTTP status code.");
@@ -214,11 +213,11 @@ public class RemoteConfigRepository extends AbstractConfigRepository {
             statusCodeException = new ApolloConfigStatusCodeException(ex.getStatusCode(),
                 message);
           }
-          Cat.logError(statusCodeException);
+          Tracer.logError(statusCodeException);
           transaction.setStatus(statusCodeException);
           exception = statusCodeException;
         } catch (Throwable ex) {
-          Cat.logError(ex);
+          Tracer.logError(ex);
           transaction.setStatus(ex);
           exception = ex;
         } finally {

apollo-client/src/main/java/com/ctrip/framework/apollo/internals/SimpleConfig.java

@@ -5,8 +5,8 @@ import com.google.common.collect.Maps;
 
 import com.ctrip.framework.apollo.model.ConfigChange;
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
+import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.apollo.util.ExceptionUtil;
-import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +42,7 @@ public class SimpleConfig extends AbstractConfig implements RepositoryChangeList
     try {
       m_configProperties = m_configRepository.getConfig();
     } catch (Throwable ex) {
-      Cat.logError(ex);
+      Tracer.logError(ex);
       logger.warn("Init Apollo Simple Config failed - namespace: {}, reason: {}", m_namespace,
           ExceptionUtil.getDetailMessage(ex));
     } finally {
@@ -93,6 +93,6 @@ public class SimpleConfig extends AbstractConfig implements RepositoryChangeList
 
     this.fireConfigChange(new ConfigChangeEvent(m_namespace, changeMap));
 
-    Cat.logEvent("Apollo.Client.ConfigChanges", m_namespace);
+    Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
   }
 }

apollo-client/src/test/java/com/ctrip/framework/apollo/BaseIntegrationTest.java

@@ -5,8 +5,8 @@ import com.google.common.collect.Lists;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 
-import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.dto.ServiceDTO;
+import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
 import com.ctrip.framework.apollo.util.ConfigUtil;
 

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/DefaultConfigManagerTest.java

@@ -5,7 +5,6 @@ import com.ctrip.framework.apollo.ConfigFile;
 import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
 import com.ctrip.framework.apollo.spi.ConfigFactory;
 import com.ctrip.framework.apollo.spi.ConfigFactoryManager;
-import com.ctrip.framework.apollo.spi.ConfigRegistry;
 
 import org.junit.Before;
 import org.junit.Test;

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/SimpleConfigTest.java

@@ -12,7 +12,6 @@ import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
@@ -20,9 +19,6 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/XmlConfigFileTest.java

@@ -11,7 +11,10 @@ import org.mockito.runners.MockitoJUnitRunner;
 
 import java.util.Properties;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 
 /**

apollo-client/src/test/java/com/ctrip/framework/apollo/util/ExceptionUtilTest.java

@@ -2,7 +2,7 @@ package com.ctrip.framework.apollo.util;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Jason Song(song_s@ctrip.com)

apollo-client/src/test/resources/META-INF/plexus/plexus.xml

-<plexus>
-	<components>
-		<component>
-			<role>com.dianping.cat.configuration.ClientConfigManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullClientConfigManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.io.TransportManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullTransportManager
-			</implementation>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.spi.MessageManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageManager
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>com.dianping.cat.message.MessageProducer</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullMessageProducer
-			</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.message.spi.MessageManager</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
-				</requirement>
-			</requirements>
-		</component>
-		<component>
-			<role>org.codehaus.plexus.logging.LoggerManager</role>
-			<implementation>com.ctrip.framework.apollo.cat.NullLoggerManager
-			</implementation>
-		</component>
-	</components>
-</plexus>

apollo-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>0.3.0</version>
+		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

apollo-common/src/main/java/com/ctrip/framework/apollo/common/aop/RepositoryAspect.java

 package com.ctrip.framework.apollo.common.aop;
 
-import com.dianping.cat.Cat;
-import com.dianping.cat.message.Message;
-import com.dianping.cat.message.Transaction;
+import com.ctrip.framework.apollo.tracer.Tracer;
+import com.ctrip.framework.apollo.tracer.spi.Transaction;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -23,10 +22,10 @@ public class RepositoryAspect {
     String name =
         joinPoint.getSignature().getDeclaringType().getSimpleName() + "." + joinPoint.getSignature()
             .getName();
-    Transaction catTransaction = Cat.newTransaction("SQL", name);
+    Transaction catTransaction = Tracer.newTransaction("SQL", name);
     try {
       Object result = joinPoint.proceed();
-      catTransaction.setStatus(Message.SUCCESS);
+      catTransaction.setStatus(Transaction.SUCCESS);
       return result;
     } catch (Throwable ex) {
       catTransaction.setStatus(ex);

apollo-common/src/main/java/com/ctrip/framework/apollo/common/constants/GsonType.java

@@ -2,11 +2,8 @@ package com.ctrip.framework.apollo.common.constants;
 
 import com.google.gson.reflect.TypeToken;
 
-import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
-
 import java.lang.reflect.Type;
 import java.util.Map;
-import java.util.Set;
 
 public interface GsonType {
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/ApolloInfoController.java

 package com.ctrip.framework.apollo.common.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ctrip.framework.apollo.Apollo;
 import com.ctrip.framework.foundation.Foundation;
 
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 @RestController
 @RequestMapping(path = "/apollo")
 public class ApolloInfoController {

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CatConfig.java

-package com.ctrip.framework.apollo.common.controller;
-
-import javax.servlet.DispatcherType;
-
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-
-import com.dianping.cat.servlet.CatFilter;
-
-@Configuration
-public class CatConfig {
-
-  @Bean
-  public FilterRegistrationBean catFilter() {
-    FilterRegistrationBean bean = new FilterRegistrationBean();
-    bean.setFilter(new CatFilter());
-    bean.setName("cat-filter");
-    bean.addUrlPatterns("/*");
-    bean.setDispatcherTypes(DispatcherType.REQUEST, DispatcherType.FORWARD);
-    bean.setOrder(Ordered.HIGHEST_PRECEDENCE);
-    return bean;
-  }
-
-}

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/CharacterEncodingFilterConfiguration.java

 package com.ctrip.framework.apollo.common.controller;
 
-import javax.servlet.DispatcherType;
-
 import org.springframework.boot.context.embedded.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.CharacterEncodingFilter;
 
+import javax.servlet.DispatcherType;
+
 @Configuration
 public class CharacterEncodingFilterConfiguration {
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/GlobalDefaultExceptionHandler.java

@@ -4,7 +4,7 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 import com.ctrip.framework.apollo.common.exception.AbstractApolloHttpException;
-import com.dianping.cat.Cat;
+import com.ctrip.framework.apollo.tracer.Tracer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,7 +82,7 @@ public class GlobalDefaultExceptionHandler {
     String message = ex.getMessage();
 
     logger.error(message, ex);
-    Cat.logError(ex);
+    Tracer.logError(ex);
 
 
     Map<String, Object> errorAttributes = new HashMap<>();

apollo-common/src/main/java/com/ctrip/framework/apollo/common/controller/WebMvcConfig.java

 package com.ctrip.framework.apollo.common.controller;
 
-import java.util.List;
-
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
@@ -10,6 +8,8 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
+import java.util.List;
+
 @Configuration
 public class WebMvcConfig extends WebMvcConfigurerAdapter {
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/customize/LoggingCustomizer.java

@@ -2,8 +2,8 @@ package com.ctrip.framework.apollo.common.customize;
 
 import com.google.common.base.Strings;
 
+import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.foundation.Foundation;
-import com.dianping.cat.Cat;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
-
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.core.Appender;
 
@@ -36,7 +35,7 @@ public abstract class LoggingCustomizer implements InitializingBean {
       tryConfigCLogging();
     } catch (Throwable ex) {
       logger.error("Config CLogging failed", ex);
-      Cat.logError(ex);
+      Tracer.logError(ex);
     }
 
   }

apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java

 package com.ctrip.framework.apollo.common.datasource;
 
+import com.ctrip.framework.apollo.core.utils.StringUtils;
+
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-import com.ctrip.framework.apollo.core.utils.StringUtils;
-
 public class TitanCondition implements Condition {
 
   @Override

apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java

 package com.ctrip.framework.apollo.common.datasource;
 
-import java.lang.reflect.Method;
-
-import javax.sql.DataSource;
+import com.ctrip.framework.apollo.tracer.Tracer;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Component;
 
-import com.dianping.cat.Cat;
+import java.lang.reflect.Method;
+
+import javax.sql.DataSource;
 
 @Component
 @Conditional(TitanCondition.class)
@@ -26,7 +26,7 @@ public class TitanEntityManager {
     Method method = clazz.getMethod("createDataSource", new Class[] {String.class, String.class});
     DataSource ds = ((DataSource) method.invoke(obj,
         new Object[] {settings.getTitanDbname(), settings.getTitanUrl()}));
-    Cat.logEvent("Apollo.Datasource.Titan", settings.getTitanDbname());
+    Tracer.logEvent("Apollo.Datasource.Titan", settings.getTitanDbname());
     return ds;
   }
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanSettings.java

 package com.ctrip.framework.apollo.common.datasource;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.enums.EnvUtils;
 import com.ctrip.framework.foundation.Foundation;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 @Component
 public class TitanSettings {
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/GrayReleaseRuleItemDTO.java

 package com.ctrip.framework.apollo.common.dto;
 
 import com.google.common.collect.Sets;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 
-import java.lang.reflect.Type;
 import java.util.Set;
 
 import static com.google.common.base.MoreObjects.toStringHelper;

apollo-common/src/main/java/com/ctrip/framework/apollo/common/entity/BaseEntity.java

 package com.ctrip.framework.apollo.common.entity;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+
 import java.util.Date;
 
 import javax.persistence.Column;
@@ -12,9 +15,6 @@ import javax.persistence.PrePersist;
 import javax.persistence.PreRemove;
 import javax.persistence.PreUpdate;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-
 @MappedSuperclass
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class BaseEntity {

apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/BeanUtils.java

@@ -2,6 +2,10 @@ package com.ctrip.framework.apollo.common.utils;
 
 import com.ctrip.framework.apollo.common.exception.BeanUtilsException;
 
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.util.CollectionUtils;
+
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -12,10 +16,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.util.CollectionUtils;
-
 
 public class BeanUtils {