From 1727832f78b60de920bc95057589f1c0d468b56c Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 25 Feb 2016 16:41:44 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?TID=EF=BC=8C=E9=80=A0=E6=88=90=E5=85=A5=E5=BA=93=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=AD=BB=E5=BE=AA=E7=8E=AF=E9=94=81=E6=AD=BB=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=202.=E6=9B=B4=E6=96=B0=E4=B8=80?= =?UTF-8?q?=E4=B8=AAhealth=20report=E7=9A=84=E8=AF=B4=E6=98=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/cloud/skywalking/reciever/storage/Chain.java | 2 +- .../reciever/storage/chain/SaveToHBaseChain.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/Chain.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/Chain.java index 02a66e4b1..0061bb3bb 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/Chain.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/Chain.java @@ -23,7 +23,7 @@ public class Chain { break; } catch (Throwable e) { ServerHealthCollector.getCurrentHeathReading("storage-chain").updateData(ServerHeathReading.ERROR, - "Failed to do chain action.Cause:" + e.getMessage()); + "Failed to do chain action. spans list hash code:" + spans.hashCode() + ",Cause:" + e.getMessage()); } } } diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java index a3d36abb1..fbe54abca 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java @@ -7,6 +7,7 @@ import com.ai.cloud.skywalking.reciever.selfexamination.ServerHeathReading; import com.ai.cloud.skywalking.reciever.storage.Chain; import com.ai.cloud.skywalking.reciever.storage.ChainException; import com.ai.cloud.skywalking.reciever.storage.IStorageChain; + import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; @@ -14,6 +15,7 @@ import org.apache.hadoop.hbase.client.*; import org.apache.hadoop.hbase.util.Bytes; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.mortbay.log.Log; import java.io.IOException; import java.util.ArrayList; @@ -101,7 +103,12 @@ public class SaveToHBaseChain implements IStorageChain { } private static long getTSBySpanTraceId(Span span) { - return Long.parseLong(span.getTraceId().split("\\.")[2]); + try{ + return Long.parseLong(span.getTraceId().split("\\.")[2]); + }catch(Throwable t){ + Log.warn("can't get timestamp from trace id:" + span.getTraceId() + ", going to use current timestamp."); + return System.currentTimeMillis(); + } } private static void bulkInsertBuriedPointData(String tableName, List data) {