Merge branch 'master' of https://github.com/wu-sheng/sky-walking

samples/skywalking-auth/src/main/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

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

@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
 sender.retry_get_sender_wait_interval=2000
 buffer.pool_size=5
 senderchecker.check_polling_time=200
-sender.is_off=false
+
 sender.max_send_length=20000
 consumer.max_consumer=2
 consumer.max_wait_time=5

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

@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
 sender.retry_get_sender_wait_interval=2000
 buffer.pool_size=5
 senderchecker.check_polling_time=200
-sender.is_off=false
+
 sender.max_send_length=20000
 consumer.max_consumer=2
 consumer.max_wait_time=5

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

@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
 sender.retry_get_sender_wait_interval=2000
 buffer.pool_size=5
 senderchecker.check_polling_time=200
-sender.is_off=false
+
 sender.max_send_length=20000
 consumer.max_consumer=2
 consumer.max_wait_time=5

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

@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
 sender.retry_get_sender_wait_interval=2000
 buffer.pool_size=5
 senderchecker.check_polling_time=200
-sender.is_off=false
+
 sender.max_send_length=20000
 consumer.max_consumer=2
 consumer.max_wait_time=5

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

@@ -4,7 +4,7 @@ buriedpoint.businesskey_max_length=300
 sender.retry_get_sender_wait_interval=2000
 buffer.pool_size=5
 senderchecker.check_polling_time=200
-sender.is_off=false
+
 sender.max_send_length=20000
 consumer.max_consumer=2
 consumer.max_wait_time=5

skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/LocalBuriedPointSender.java

@@ -59,10 +59,7 @@ public class LocalBuriedPointSender extends ApplicationExceptionHandler
 						+ "\tbusinessKey:" + spanData.getBusinessKey());
 			}
 
-			// 存放到本地发送进程中
-			if (!Config.Sender.IS_OFF) {
 			ContextBuffer.save(spanData);
-			}
 		} catch (Throwable t) {
 			logger.error(t.getMessage(), t);
 		}

skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java

@@ -22,8 +22,10 @@ import com.ai.cloud.skywalking.util.TraceIdGenerator;
  *
  */
 @Deprecated
-public class ThreadBuriedPointSender extends ApplicationExceptionHandler implements IBuriedPointSender {
-	private static Logger logger = LogManager.getLogger(ThreadBuriedPointSender.class);
+public class ThreadBuriedPointSender extends ApplicationExceptionHandler
+		implements IBuriedPointSender {
+	private static Logger logger = LogManager
+			.getLogger(ThreadBuriedPointSender.class);
 
 	private Span span;
 
@@ -34,13 +36,16 @@ public class ThreadBuriedPointSender extends ApplicationExceptionHandler impleme
 		// 从ThreadLocal中取出上下文
 		final Span parentSpanData = Context.getLastSpan();
 		if (parentSpanData == null) {
-            spanData = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE,
+			spanData = new Span(TraceIdGenerator.generate(),
+					Config.SkyWalking.APPLICATION_CODE,
 					Config.SkyWalking.USER_ID);
 		} else {
 			// 如果不为空，则将当前的Context存放到上下文
-            spanData = new Span(parentSpanData.getTraceId(), Config.SkyWalking.APPLICATION_CODE,
+			spanData = new Span(parentSpanData.getTraceId(),
+					Config.SkyWalking.APPLICATION_CODE,
 					Config.SkyWalking.USER_ID);
-            spanData.setParentLevel(parentSpanData.getParentLevel() + "." + parentSpanData.getLevelId());
+			spanData.setParentLevel(parentSpanData.getParentLevel() + "."
+					+ parentSpanData.getLevelId());
 			spanData.setLevelId(threadSeqId);
 		}
 		this.span = spanData;
@@ -68,13 +73,11 @@ public class ThreadBuriedPointSender extends ApplicationExceptionHandler impleme
 		// 填上必要信息
 		span.setCost(System.currentTimeMillis() - span.getStartDate());
 		if (Config.BuriedPoint.PRINTF) {
-            logger.debug("viewpointId:" + span.getViewPointId() + "\tParentLevelId:" + span.
-                    getParentLevel() + "\tLevelId:" + span.getLevelId());
+			logger.debug("viewpointId:" + span.getViewPointId()
+					+ "\tParentLevelId:" + span.getParentLevel() + "\tLevelId:"
+					+ span.getLevelId());
 		}
-        // 存放到本地发送进程中
-        if (!Config.Sender.IS_OFF) {
 		ContextBuffer.save(span);
 	}
-    }
 
 }

skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadFactoryBuriedPointSender.java

@@ -21,8 +21,10 @@ import com.ai.cloud.skywalking.util.ContextGenerator;
  *
  */
 @Deprecated
-public class ThreadFactoryBuriedPointSender extends ApplicationExceptionHandler implements IBuriedPointSender {
-	private static Logger logger = LogManager.getLogger(ThreadBuriedPointSender.class);
+public class ThreadFactoryBuriedPointSender extends ApplicationExceptionHandler
+		implements IBuriedPointSender {
+	private static Logger logger = LogManager
+			.getLogger(ThreadBuriedPointSender.class);
 
 	public ContextData beforeSend(Identification id) {
 		if (!AuthDesc.isAuth())
@@ -47,12 +49,10 @@ public class ThreadFactoryBuriedPointSender extends ApplicationExceptionHandler
 		// 填上必要信息
 		spanData.setCost(System.currentTimeMillis() - spanData.getStartDate());
 		if (Config.BuriedPoint.PRINTF) {
-            logger.debug("viewpointId:" + spanData.getViewPointId() + "\tParentLevelId:" + spanData.
-                    getParentLevel() + "\tLevelId:" + spanData.getLevelId());
+			logger.debug("viewpointId:" + spanData.getViewPointId()
+					+ "\tParentLevelId:" + spanData.getParentLevel()
+					+ "\tLevelId:" + spanData.getLevelId());
 		}
-        // 存放到本地发送进程中
-        if (!Config.Sender.IS_OFF) {
 		ContextBuffer.save(spanData);
 	}
-    }
 }

skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java

@@ -52,9 +52,6 @@ public class Config {
         // 发送服务端配置
         public static String SERVERS_ADDR = "127.0.0.1:34000";
 
-        // 是否开启发送
-        public static boolean IS_OFF = false;
-
         // 最大发送副本数量
         public static int MAX_COPY_NUM = 2;
 

skywalking-api/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

skywalking-sdk-plugin/dubbo-plugin/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

skywalking-sdk-plugin/mysql-plugin/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数

skywalking-sdk-plugin/spring-plugin/src/test/resources/sky-walking.auth

@@ -26,8 +26,8 @@ sender.max_copy_num=2
 sender.max_send_length=20000
 #当没有Sender时,尝试获取sender的等待周期
 sender.retry_get_sender_wait_interval=2000
-#是否开启发送消息
-sender.is_off=false
+
+
 
 
 #最大消费线程数