refactor(stats): pass trace-root flag directly

Author: mabdinur

packages/dd-trace/src/span_stats.js

@@ -155,10 +155,9 @@ class SpanBuckets extends Map {
   #includeTraceRoot
 
   /**
-   * @param {object} [options]
-   * @param {boolean} [options.includeTraceRoot]
+   * @param {boolean} [includeTraceRoot]
    */
-  constructor ({ includeTraceRoot = false } = {}) {
+  constructor (includeTraceRoot = false) {
     super()
     this.#includeTraceRoot = includeTraceRoot
   }
@@ -181,20 +180,19 @@ class SpanBuckets extends Map {
 }
 
 class TimeBuckets extends Map {
-  #spanBucketOptions
+  #includeTraceRoot
 
   /**
-   * @param {object} [spanBucketOptions]
-   * @param {boolean} [spanBucketOptions.includeTraceRoot]
+   * @param {boolean} [includeTraceRoot]
    */
-  constructor (spanBucketOptions) {
+  constructor (includeTraceRoot = false) {
     super()
-    this.#spanBucketOptions = spanBucketOptions
+    this.#includeTraceRoot = includeTraceRoot
   }
 
   forTime (time) {
     if (!this.has(time)) {
-      this.set(time, new SpanBuckets(this.#spanBucketOptions))
+      this.set(time, new SpanBuckets(this.#includeTraceRoot))
     }
 
     return this.get(time)
@@ -221,7 +219,7 @@ class SpanStatsProcessor {
     const intervalMs = otlpExporter ? (flushIntervalMs ?? 10_000) : interval * 1e3
     this.interval = intervalMs / 1e3
     this.bucketSizeNs = intervalMs * 1e6
-    this.buckets = new TimeBuckets({ includeTraceRoot: Boolean(otlpExporter) })
+    this.buckets = new TimeBuckets(Boolean(otlpExporter))
     this.hostname = os.hostname()
     this.enabled = enabled
     this.otlpExporter = otlpExporter || null

packages/dd-trace/test/opentelemetry/metrics/otlp_span_stats_transformer.spec.js

@@ -41,16 +41,16 @@ function makeTopLevelSpan (overrides = {}) {
   return makeSpan({ metrics: { [TOP_LEVEL_KEY]: 1 }, ...overrides })
 }
 
-function makeBucket (spans, options) {
-  const bucket = new SpanBuckets(options)
+function makeBucket (spans, includeTraceRoot) {
+  const bucket = new SpanBuckets(includeTraceRoot)
   for (const span of spans) {
     bucket.forSpan(span).record(span)
   }
   return bucket
 }
 
-function makeDrained (timeNs, spans, options) {
-  return [{ timeNs, bucket: makeBucket(spans, options) }]
+function makeDrained (timeNs, spans, includeTraceRoot) {
+  return [{ timeNs, bucket: makeBucket(spans, includeTraceRoot) }]
 }
 
 /**
@@ -108,7 +108,7 @@ describe('OtlpStatsTransformer', () => {
         },
       })
       const payload = JSON.parse(transformer.transform(
-        makeDrained(12340000000000, [span], { includeTraceRoot: true }),
+        makeDrained(12340000000000, [span], true),
         BUCKET_SIZE_NS
       ))
       const dataPoint = dataPointsOf(payload)[0]
@@ -179,7 +179,7 @@ describe('OtlpStatsTransformer', () => {
         makeSpan({ parent_id: { equals: () => false } }),
       ]
       const payload = JSON.parse(transformer.transform(
-        makeDrained(12340000000000, spans, { includeTraceRoot: true }),
+        makeDrained(12340000000000, spans, true),
         BUCKET_SIZE_NS
       ))
       const points = dataPointsOf(payload)
@@ -191,7 +191,7 @@ describe('OtlpStatsTransformer', () => {
     })
 
     it('omits datadog.is_trace_root when its value is unknown', () => {
-      const drained = makeDrained(12340000000000, [makeSpan()], { includeTraceRoot: true })
+      const drained = makeDrained(12340000000000, [makeSpan()], true)
 
       const payload = JSON.parse(transformer.transform(drained, BUCKET_SIZE_NS))
 

packages/dd-trace/test/span_stats.spec.js

@@ -371,7 +371,7 @@ describe('SpanBuckets', () => {
     const rootSpan = { ...basicSpan, parent_id: { equals: rootIdEquals } }
     const childSpan = { ...basicSpan, parent_id: { equals: childIdEquals } }
     const legacyBuckets = new SpanBuckets()
-    const otlpBuckets = new SpanBuckets({ includeTraceRoot: true })
+    const otlpBuckets = new SpanBuckets(true)
 
     legacyBuckets.forSpan(rootSpan)
     legacyBuckets.forSpan(childSpan)
@@ -391,7 +391,7 @@ describe('SpanBuckets', () => {
 
   it('should leave trace-root unknown when parent_id is missing or null', () => {
     for (const parentId of [undefined, null]) {
-      const otlpBuckets = new SpanBuckets({ includeTraceRoot: true })
+      const otlpBuckets = new SpanBuckets(true)
 
       otlpBuckets.forSpan({ ...basicSpan, parent_id: parentId })