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 39a02c744..3a8b50e9a 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 @@ -102,27 +102,32 @@ public class SaveToHBaseChain implements IStorageChain { for (Span span : spans) { put = new Put(Bytes.toBytes(span.getTraceId()), getTSBySpanTraceId(span)); - if (StringUtils.isEmpty(span.getParentLevel().trim())) { - columnName = span.getLevelId() + ""; - if (span.isReceiver()) { - columnName = span.getLevelId() + "-S"; + try { + if (StringUtils.isEmpty(span.getParentLevel().trim())) { + columnName = span.getLevelId() + ""; + if (span.isReceiver()) { + columnName = span.getLevelId() + "-S"; + } + put.addColumn( + Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME), + Bytes.toBytes(columnName), + Bytes.toBytes(span.getOriginData())); + } else { + columnName = span.getParentLevel() + "." + span.getLevelId(); + if (span.isReceiver()) { + columnName = span.getParentLevel() + "." + + span.getLevelId() + "-S"; + } + put.addColumn( + Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME), + Bytes.toBytes(columnName), + Bytes.toBytes(span.getOriginData())); } - put.addColumn( - Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME), - Bytes.toBytes(columnName), - Bytes.toBytes(span.getOriginData())); - } else { - columnName = span.getParentLevel() + "." + span.getLevelId(); - if (span.isReceiver()) { - columnName = span.getParentLevel() + "." - + span.getLevelId() + "-S"; - } - put.addColumn( - Bytes.toBytes(Config.HBaseConfig.FAMILY_COLUMN_NAME), - Bytes.toBytes(columnName), - Bytes.toBytes(span.getOriginData())); + puts.add(put); + }catch (Throwable e){ + logger.error("Failed to save to Span[{}] to hbase", span.toString()); + throw e; } - puts.add(put); } bulkInsertBuriedPointData(Config.HBaseConfig.TABLE_NAME, puts); diff --git a/skywalking-server/src/main/resources/log4j.xml b/skywalking-server/src/main/resources/log4j.xml index e28023547..22859c554 100644 --- a/skywalking-server/src/main/resources/log4j.xml +++ b/skywalking-server/src/main/resources/log4j.xml @@ -1,19 +1,26 @@ - + - - - + + - + + + + + + + + + + + - - + + - - + \ No newline at end of file diff --git a/skywalking-server/src/main/resources/log4j2.xml b/skywalking-server/src/main/resources/log4j2.xml index 4559d6d69..0da420637 100644 --- a/skywalking-server/src/main/resources/log4j2.xml +++ b/skywalking-server/src/main/resources/log4j2.xml @@ -1,13 +1,23 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file