dd-trace 3.14.0 → 3.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.14.0",
+  "version": "3.14.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/datadog-plugin-hapi/src/index.js

@@ -26,7 +26,11 @@ class HapiPlugin extends RouterPlugin {
       web.setRoute(req, route)
     })
 
-    this.addSub(`apm:hapi:request:error`, this.addError)
+    this.addSub('apm:hapi:request:error', error => {
+      if (!error || !error.isBoom || !this.config.validateStatus(error.output.statusCode)) {
+        this.addError(error)
+      }
+    })
 
     this.addSub('apm:hapi:extension:enter', ({ req }) => {
       this.enter(this._requestSpans.get(req))

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -302,6 +302,7 @@ class TextMapPropagator {
     const matches = headerValue.trim().match(traceparentExpr)
     if (matches.length) {
       const [ version, traceId, spanId, flags, tail ] = matches.slice(1)
+      const traceparent = { version }
       const tracestate = TraceState.fromString(carrier.tracestate)
       if (invalidSegment.test(traceId)) return null
       if (invalidSegment.test(spanId)) return null
@@ -316,6 +317,7 @@ class TextMapPropagator {
         traceId: id(traceId, 16),
         spanId: id(spanId, 16),
         sampling: { priority: parseInt(flags, 10) & 1 ? 1 : 0 },
+        traceparent,
         tracestate
       })
 

package/packages/dd-trace/src/opentracing/span_context.js

@@ -14,6 +14,7 @@ class DatadogSpanContext {
     this._tags = props.tags || {}
     this._sampling = props.sampling || {}
     this._baggageItems = props.baggageItems || {}
+    this._traceparent = props.traceparent
     this._tracestate = props.tracestate
     this._noop = props.noop || null
     this._trace = props.trace || {
@@ -32,10 +33,11 @@ class DatadogSpanContext {
   }
 
   toTraceparent () {
-    const sampling = this._sampling.priority >= AUTO_KEEP ? '01' : '00'
+    const flags = this._sampling.priority >= AUTO_KEEP ? '01' : '00'
     const traceId = this._traceId.toString(16).padStart(32, '0')
     const spanId = this._spanId.toString(16).padStart(16, '0')
-    return `01-${traceId}-${spanId}-${sampling}`
+    const version = (this._traceparent && this._traceparent.version) || '00'
+    return `${version}-${traceId}-${spanId}-${flags}`
   }
 }