HTRACE-57. Fix LocalFileSpanReceiver to avoid adding irrelevant wrapper object (cmccabe)
diff --git a/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java b/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java
index 09cbb01..7fe039f 100644
--- a/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java
+++ b/htrace-core/src/main/java/org/apache/htrace/impl/LocalFileSpanReceiver.java
@@ -29,6 +29,7 @@
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.InputStreamReader;
import java.io.IOException;
@@ -99,7 +100,7 @@
@Override
public void run() {
try {
- JSON_WRITER.writeValue(writer, this);
+ JSON_WRITER.writeValue(writer, span);
writer.write("%n");
} catch (IOException e) {
LOG.error("Error when writing to file: " + file, e);
diff --git a/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java b/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
index b34df64..be5521a 100644
--- a/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
+++ b/htrace-core/src/main/java/org/apache/htrace/impl/MilliSpan.java
@@ -305,12 +305,12 @@
throws IOException, JsonProcessingException {
JsonNode root = jp.getCodec().readTree(jp);
Builder builder = new Builder();
- builder.begin(root.get("b").asLong()).
- end(root.get("e").asLong()).
- description(root.get("d").asText()).
- traceId(parseUnsignedHexLong(root.get("i").asText())).
- spanId(parseUnsignedHexLong(root.get("s").asText())).
- processId(root.get("r").asText());
+ builder.begin(root.get("b").asLong());
+ builder.end(root.get("e").asLong());
+ builder.description(root.get("d").asText());
+ builder.traceId(parseUnsignedHexLong(root.get("i").asText()));
+ builder.spanId(parseUnsignedHexLong(root.get("s").asText()));
+ builder.processId(root.get("r").asText());
JsonNode parentsNode = root.get("p");
LinkedList<Long> parents = new LinkedList<Long>();
for (Iterator<JsonNode> iter = parentsNode.elements();
diff --git a/htrace-core/src/test/java/org/apache/htrace/impl/TestLocalFileSpanReceiver.java b/htrace-core/src/test/java/org/apache/htrace/impl/TestLocalFileSpanReceiver.java
index 98dd951..60b5430 100644
--- a/htrace-core/src/test/java/org/apache/htrace/impl/TestLocalFileSpanReceiver.java
+++ b/htrace-core/src/test/java/org/apache/htrace/impl/TestLocalFileSpanReceiver.java
@@ -33,7 +33,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
-@Ignore
public class TestLocalFileSpanReceiver {
@Test
public void testUniqueLocalTraceFileName() {
