From 44980a0c03640ee3686e936da31416097bc3fc5d Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 19 Feb 2016 10:40:11 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=94=B1=E4=BA=8ESDK=E5=BC=95=E5=85=A5log4j2?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E6=94=B6=E9=9B=86=E6=9C=BA=E5=88=B6=E3=80=82=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/skywalking/buffer/BufferGroup.java | 9 --- .../selfexamination/HealthCollector.java | 34 --------- .../selfexamination/HeathReading.java | 74 ------------------- 3 files changed, 117 deletions(-) delete mode 100644 skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HealthCollector.java delete mode 100644 skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java index 7e8730333..cf6cc4182 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java @@ -13,8 +13,6 @@ import org.apache.logging.log4j.Logger; import com.ai.cloud.skywalking.conf.Config; import com.ai.cloud.skywalking.conf.Constants; import com.ai.cloud.skywalking.protocol.Span; -import com.ai.cloud.skywalking.selfexamination.HealthCollector; -import com.ai.cloud.skywalking.selfexamination.HeathReading; import com.ai.cloud.skywalking.sender.DataSenderFactoryWithBalance; public class BufferGroup { @@ -45,10 +43,6 @@ public class BufferGroup { logger.warn( "Group[{}] index[{}] data collision, discard old data.", groupName, i); - HealthCollector.getCurrentHeathReading(null).updateData( - HeathReading.WARNING, - "Group[" + groupName + "] index[" + i - + "] data collision, discard old data."); } dataBuffer[i] = span; } @@ -83,9 +77,6 @@ public class BufferGroup { logger.error("Sleep Failure"); } } - HealthCollector.getCurrentHeathReading(null) - .updateData(HeathReading.INFO, - "send buried-point data."); logger.debug("send buried-point data, size:{}", data.length()); data = new StringBuilder(); } diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HealthCollector.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HealthCollector.java deleted file mode 100644 index 9655c0192..000000000 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HealthCollector.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ai.cloud.skywalking.selfexamination; - -import java.util.HashMap; -import java.util.Map; - -import static com.ai.cloud.skywalking.conf.Config.SkyWalking.USER_ID; -import com.ai.cloud.skywalking.util.BuriedPointMachineUtil; - -public class HealthCollector extends Thread{ - private static Map heathReadings = new HashMap(); - - public static HeathReading getCurrentHeathReading(String extraId){ - String id = getId(extraId); - if(!heathReadings.containsKey(id)){ - synchronized (heathReadings) { - if(!heathReadings.containsKey(id)){ - heathReadings.put(id, new HeathReading(id)); - } - } - } - return heathReadings.get(id); - } - - private static String getId(String extraId){ - return "SDK,U:" + USER_ID + ",M:" + BuriedPointMachineUtil.getHostDesc() +",P:" + BuriedPointMachineUtil.getProcessNo() + ",T:" - + Thread.currentThread().getName() + "(" - + Thread.currentThread().getId() + ")" + (extraId == null? "" : ",extra:" + extraId); - } - - @Override - public void run(){ - //TODO: 使用专有的端口，将数据上报给服务端，定时上报，默认应为分钟级别，降低服务端压力 - } -} diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java deleted file mode 100644 index 1d7a89476..000000000 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/HeathReading.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.ai.cloud.skywalking.selfexamination; - -import java.util.HashMap; -import java.util.Map; - -import com.ai.cloud.skywalking.conf.Constants; - -public class HeathReading { - public static final String ERROR = "ERROR"; - public static final String WARNING = "WARNING"; - public static final String INFO = "INFO"; - - private String id; - - private Map datas = new HashMap(); - - /** - * 健康读数，只应该在工作线程中创建 - * - */ - public HeathReading(String id) { - this.id = id; - } - - public void updateData(String key, String newData){ - if(datas.containsKey(key)){ - datas.get(key).updateData(newData); - }else{ - datas.put(key, new HeathDetailData(newData)); - } - } - - @Override - public String toString(){ - StringBuilder sb = new StringBuilder(this.id); - sb.append(Constants.HEALTH_DATA_SPILT_PATTERN); - for(Map.Entry data : datas.entrySet()){ - sb.append(data.getKey()).append(Constants.HEALTH_DATA_SPILT_PATTERN).append(data.getValue().toString()).append(Constants.HEALTH_DATA_SPILT_PATTERN); - } - - //reset data - datas = new HashMap(); - return sb.toString(); - } - - class HeathDetailData{ - private String data; - - private long statusTime; - - HeathDetailData(String initialData){ - data = initialData; - statusTime = System.currentTimeMillis(); - } - - void updateData(String newData){ - data = newData; - statusTime = System.currentTimeMillis(); - } - - String getData() { - return data; - } - - long getStatusTime() { - return statusTime; - } - - @Override - public String toString(){ - return "d:" + data + Constants.HEALTH_DATA_SPILT_PATTERN + "t:" + statusTime; - } - } -}