Don't confuse trace root with top levels

Author: amarziali

dd-trace-core/src/main/java/datadog/trace/common/metrics/ConflatingMetricsAggregator.java

@@ -311,7 +311,7 @@ private boolean publish(CoreSpan<?> span, boolean isTopLevel) {
             span.getType(),
             span.getHttpStatusCode(),
             isSynthetic(span),
-            span.isTopLevel(),
+            span.getParentId() == 0,
             SPAN_KINDS.computeIfAbsent(
                 spanKind, UTF8BytesString::create), // save repeated utf8 conversions
             getPeerTags(span, spanKind.toString()));

dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy

@@ -126,7 +126,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
       "type",
       HTTP_OK,
       false,
-      true,
+      false,
       "baz",
       []
       ), _) >> { MetricKey key, AggregateMetric value ->
@@ -197,7 +197,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
     features.supportsMetrics() >> true
     features.peerTags() >>> [["country"], ["country", "georegion"],]
     ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty,
-      features, sink, writer, 10, queueSize, reportingInterval, SECONDS)
+      features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS)
     aggregator.start()
 
     when:
@@ -256,7 +256,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
     features.supportsMetrics() >> true
     features.peerTags() >> ["peer.hostname", "_dd.base_service"]
     ConflatingMetricsAggregator aggregator = new ConflatingMetricsAggregator(empty,
-      features, sink, writer, 10, queueSize, reportingInterval, SECONDS)
+      features, HealthMetrics.NO_OP, sink, writer, 10, queueSize, reportingInterval, SECONDS)
     aggregator.start()
 
     when:
@@ -327,7 +327,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
       "type",
       HTTP_OK,
       false,
-      topLevel,
+      false,
       "baz",
       []
       ), { AggregateMetric value ->
@@ -444,7 +444,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
         "type",
         HTTP_OK,
         false,
-        true,
+        false,
         "baz",
         []
         ), _) >> { MetricKey key, AggregateMetric value ->
@@ -458,7 +458,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
       "type",
       HTTP_OK,
       false,
-      true,
+      false,
       "baz",
       []
       ), _)
@@ -503,7 +503,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
         "type",
         HTTP_OK,
         false,
-        true,
+        false,
         "baz",
         []
         ), { AggregateMetric value ->
@@ -534,7 +534,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
         "type",
         HTTP_OK,
         false,
-        true,
+        false,
         "baz",
         []
         ), { AggregateMetric value ->
@@ -548,7 +548,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
       "type",
       HTTP_OK,
       false,
-      true,
+      false,
       "baz",
       []
       ), _)
@@ -593,7 +593,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
         "type",
         HTTP_OK,
         false,
-        true,
+        false,
         "quux",
         []
         ), { AggregateMetric value ->
@@ -631,7 +631,7 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
     CountDownLatch latch = new CountDownLatch(1)
     for (int i = 0; i < 5; ++i) {
       aggregator.publish([
-        new SimpleSpan("service" + i, "operation", "resource", "type", false, true, false, 0, duration, HTTP_OK)
+        new SimpleSpan("service" + i, "operation", "resource", "type", false, true, false, 0, duration, HTTP_OK, true)
         .setTag(SPAN_KIND, "garply")
       ])
     }

dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SimpleSpan.groovy

@@ -13,6 +13,7 @@ class SimpleSpan implements CoreSpan<SimpleSpan> {
   private final String type
   private final boolean measured
   private final boolean topLevel
+  private final boolean traceRoot
   private final boolean error
   private final short statusCode
 
@@ -31,14 +32,16 @@ class SimpleSpan implements CoreSpan<SimpleSpan> {
   boolean error,
   long startTime,
   long duration,
-  int statusCode
+  int statusCode,
+  boolean traceRoot = false
   ) {
     this.serviceName = serviceName
     this.operationName = operationName
     this.resourceName = resourceName
     this.type = type
     this.measured = measured
     this.topLevel = topLevel
+    this.traceRoot = traceRoot
     this.error = error
     this.startTime = startTime
     this.duration = duration
@@ -77,7 +80,7 @@ class SimpleSpan implements CoreSpan<SimpleSpan> {
 
   @Override
   long getParentId() {
-    return DDSpanId.ZERO
+    return traceRoot ? DDSpanId.ZERO : 1L
   }
 
   @Override