com.typesafe.akka
akka-testkit_2.11
diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java
index 85447a89c..e37feafa9 100644
--- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java
+++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigInitializer.java
@@ -1,9 +1,9 @@
package com.a.eye.skywalking.collector.cluster;
-import com.a.eye.skywalking.api.logging.api.ILog;
-import com.a.eye.skywalking.api.logging.api.LogManager;
import com.a.eye.skywalking.api.util.ConfigInitializer;
import com.a.eye.skywalking.api.util.StringUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import java.io.InputStream;
import java.util.Properties;
@@ -21,7 +21,7 @@ import java.util.Properties;
*/
public class ClusterConfigInitializer {
- private static ILog logger = LogManager.getLogger(ClusterConfigInitializer.class);
+ private static Logger logger = LogManager.getFormatterLogger(ClusterConfigInitializer.class);
public static final String ConfigFileName = "collector.config";
diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMember.java
index d2222f016..9eaac07d2 100644
--- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMember.java
+++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/application/ApplicationMember.java
@@ -86,7 +86,7 @@ public class ApplicationMember extends AbstractMember {
String code = traceSegment.getApplicationCode();
long startTime = -1;
long endTime = -1;
- boolean isError = false;
+ Boolean isError = false;
for (Span span : traceSegment.getSpans()) {
if (span.getParentSpanId() == -1) {
diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java
index c4e2d4207..ae80ad977 100644
--- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java
+++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/receiver/TraceSegmentReceiver.java
@@ -19,8 +19,8 @@ public class TraceSegmentReceiver extends AbstractWorker {
@Override
public void preStart() throws Exception {
- ApplicationMember.Factory factory = new ApplicationMember.Factory();
- factory.createWorker(memberContext(), getSelf());
+ new ApplicationMember.Factory().createWorker(memberContext(), getSelf());
+ new ApplicationRefMember.Factory().createWorker(memberContext(), getSelf());
super.preStart();
}
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/BooleanTag.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/BooleanTag.java
index ac3db515e..9f3a780f2 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/BooleanTag.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/BooleanTag.java
@@ -4,12 +4,16 @@ import com.a.eye.skywalking.trace.Span;
/**
* Do the same thing as {@link StringTag}, just with a {@link Boolean} value.
- *
+ *
* Created by wusheng on 2017/2/17.
*/
public class BooleanTag extends AbstractTag {
- public BooleanTag(String key) {
+
+ private boolean defaultValue;
+
+ public BooleanTag(String key, boolean defaultValue) {
super(key);
+ this.defaultValue = defaultValue;
}
@Override
@@ -28,9 +32,9 @@ public class BooleanTag extends AbstractTag {
public Boolean get(Span span) {
Object tagValue = span.getTag(super.key);
if (tagValue == null) {
- return null;
+ return defaultValue;
} else if (tagValue instanceof Boolean) {
- return (Boolean)tagValue;
+ return (Boolean) tagValue;
} else {
return Boolean.valueOf(tagValue.toString());
}
diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java
index 6f80d42c2..c534db86c 100644
--- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java
+++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java
@@ -5,7 +5,7 @@ import com.a.eye.skywalking.trace.Span;
/**
* The span tags are supported by sky-walking engine.
* As default, all tags will be stored, but these ones have particular meanings.
- *
+ *
* Created by wusheng on 2017/2/17.
*/
public final class Tags {
@@ -39,7 +39,7 @@ public final class Tags {
/**
* SPAN_LAYER represents the kind of span.
- *
+ *
* e.g.
* db=database;
* rpc=Remote Procedure Call Framework, like motan, thift;
@@ -91,7 +91,7 @@ public final class Tags {
/**
* ERROR indicates whether a Span ended in an error state.
*/
- public static final BooleanTag ERROR = new BooleanTag("error");
+ public static final BooleanTag ERROR = new BooleanTag("error", false);
/**
* PEER_HOST records host address (ip:port, or ip1:port1,ip2:port2) of the peer, maybe IPV4, IPV6 or hostname.
diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/ThrowableFormatterTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/ThrowableFormatterTest.java
index 048b2ae5f..f3c19f4bf 100644
--- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/ThrowableFormatterTest.java
+++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/ThrowableFormatterTest.java
@@ -8,10 +8,10 @@ import org.junit.Test;
*/
public class ThrowableFormatterTest {
@Test
- public void testFormat(){
+ public void testFormat() {
NullPointerException exception = new NullPointerException();
String formatLines = ThrowableFormatter.format(exception);
- String[] lines = formatLines.split("\n");
+ String[] lines = formatLines.split(System.lineSeparator());
Assert.assertEquals("java.lang.NullPointerException", lines[0]);
Assert.assertEquals("\tat com.a.eye.skywalking.api.logging.ThrowableFormatterTest.testFormat(ThrowableFormatterTest.java:12)", lines[1]);
}