dd-trace 6.0.0-pre-ac0fc13 → 6.0.0-pre-a99e5ea

package/index.d.ts

@@ -137,8 +137,10 @@ interface Tracer extends opentracing.Tracer {
 // is doesn't need to be exported for Tracer
 /** @hidden */
 interface Plugins {
+  "aerospike": tracer.plugins.aerospike;
   "amqp10": tracer.plugins.amqp10;
   "amqplib": tracer.plugins.amqplib;
+  "apollo": tracer.plugins.apollo;
   "aws-sdk": tracer.plugins.aws_sdk;
   "bunyan": tracer.plugins.bunyan;
   "cassandra-driver": tracer.plugins.cassandra_driver;
@@ -1098,6 +1100,12 @@ declare namespace tracer {
       meta?: boolean;
     }
 
+    /**
+     * This plugin automatically instruments the
+     * [aerospike](https://github.com/aerospike/aerospike-client-nodejs) for module versions >= v3.16.2.
+     */
+    interface aerospike extends Instrumentation {}
+
     /**
      * This plugin automatically instruments the
      * [amqp10](https://github.com/noodlefrenzy/node-amqp10) module.
@@ -1110,6 +1118,14 @@ declare namespace tracer {
      */
     interface amqplib extends Instrumentation {}
 
+    /**
+     * Currently this plugin automatically instruments
+     * [@apollo/gateway](https://github.com/apollographql/federation) for module versions >= v2.3.0.
+     * This module uses graphql operations to service requests & thus generates graphql spans.
+     * We recommend disabling the graphql plugin if you only want to trace @apollo/gateway
+     */
+    interface apollo extends Instrumentation {}
+
     /**
      * This plugin automatically instruments the
      * [aws-sdk](https://github.com/aws/aws-sdk-js) module.
@@ -1624,6 +1640,10 @@ declare namespace tracer {
        * The service name to be used for this plugin. If a function is used, it will be passed the connection parameters and its return value will be used as the service name.
        */
       service?: string | ((params: any) => string);
+      /**
+       * The database monitoring propagation mode to be used for this plugin.
+       */
+      dbmPropagationMode?: string;
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "6.0.0-pre-ac0fc13",
+  "version": "6.0.0-pre-a99e5ea",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -70,10 +70,10 @@
   },
   "dependencies": {
     "@datadog/native-appsec": "7.1.0",
-    "@datadog/native-iast-rewriter": "2.2.3",
+    "@datadog/native-iast-rewriter": "2.3.0",
     "@datadog/native-iast-taint-tracking": "1.7.0",
     "@datadog/native-metrics": "^2.0.0",
-    "@datadog/pprof": "5.0.0",
+    "@datadog/pprof": "5.1.0",
     "@datadog/sketches-js": "^2.1.0",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^1.14.0",

package/packages/datadog-instrumentations/src/apollo.js

@@ -0,0 +1,101 @@
+const {
+  addHook,
+  channel
+} = require('./helpers/instrument')
+const shimmer = require('../../datadog-shimmer')
+const tracingChannel = require('dc-polyfill').tracingChannel
+
+const CHANNELS = {
+  'gateway.request': tracingChannel('apm:apollo:gateway:request'),
+  'gateway.plan': tracingChannel('apm:apollo:gateway:plan'),
+  'gateway.validate': tracingChannel('apm:apollo:gateway:validate'),
+  'gateway.execute': tracingChannel('apm:apollo:gateway:execute'),
+  'gateway.fetch': tracingChannel('apm:apollo:gateway:fetch'),
+  'gateway.postprocessing': tracingChannel('apm:apollo:gateway:postprocessing')
+}
+
+const executorCh = channel('apm:apollo:gateway:request:executor')
+const generalErrorCh = channel('apm:apollo:gateway:general:error')
+
+function wrapExecutor (executor) {
+  return function (...args) {
+    const ctx = { requestContext: args[0], gateway: this }
+    executorCh.publish(ctx)
+    return executor.apply(this, args)
+  }
+}
+
+function wrapApolloGateway (ApolloGateway) {
+  class ApolloGatewayWrapper extends ApolloGateway {
+    constructor (...args) {
+      super(...args)
+      shimmer.wrap(this, 'executor', wrapExecutor)
+    }
+  }
+  return ApolloGatewayWrapper
+}
+
+function wrapRecordExceptions (recordExceptions) {
+  return function wrappedRecordExceptions (...args) {
+    const errors = args[1]
+    // only the last exception in the array of exceptions will be reported on the span,
+    // this is mimicking apollo-gateways internal instrumentation
+    // TODO: should we consider a mechanism to report all exceptions? since this method aggregates all exceptions
+    // where as a span can only have one exception set on it at a time
+    generalErrorCh.publish({ error: errors[errors.length - 1] })
+    return recordExceptions.apply(this, args)
+  }
+}
+
+function wrapStartActiveSpan (startActiveSpan) {
+  return function (...args) {
+    const firstArg = args[0]
+    const cb = args[args.length - 1]
+    if (typeof firstArg !== 'string' || typeof cb !== 'function') return startActiveSpan.apply(this, args)
+
+    const method = CHANNELS[firstArg]
+    let ctx = {}
+    if (firstArg === 'gateway.fetch') {
+      ctx = { attributes: args[1].attributes }
+    }
+
+    switch (firstArg) {
+      case 'gateway.plan' :
+      case 'gateway.validate': {
+        args[args.length - 1] = function (...callbackArgs) {
+          return method.traceSync(cb, ctx, this, ...callbackArgs)
+        }
+        break
+      }
+      case 'gateway.request':
+      case 'gateway.execute':
+      case 'gateway.postprocessing' :
+      case 'gateway.fetch': {
+        args[args.length - 1] = function (...callbackArgs) {
+          return method.tracePromise(cb, ctx, this, ...callbackArgs)
+        }
+        break
+      }
+    }
+    return startActiveSpan.apply(this, args)
+  }
+}
+
+addHook({ name: '@apollo/gateway', file: 'dist/utilities/opentelemetry.js', versions: ['>=2.3.0'] },
+  (obj) => {
+    const newTracerObj = Object.create(obj.tracer)
+    shimmer.wrap(newTracerObj, 'startActiveSpan', wrapStartActiveSpan)
+    obj.tracer = newTracerObj
+    return obj
+  })
+
+addHook({ name: '@apollo/gateway', file: 'dist/utilities/opentelemetry.js', versions: ['>=2.6.0'] },
+  (obj) => {
+    shimmer.wrap(obj, 'recordExceptions', wrapRecordExceptions)
+    return obj
+  })
+
+addHook({ name: '@apollo/gateway', versions: ['>=2.3.0'] }, (gateway) => {
+  shimmer.wrap(gateway, 'ApolloGateway', wrapApolloGateway)
+  return gateway
+})

package/packages/datadog-instrumentations/src/cucumber.js

@@ -92,7 +92,8 @@ function getStatusFromResultLatest (result) {
 }
 
 function isNewTest (testSuite, testName) {
-  return !knownTests.includes(`cucumber.${testSuite}.${testName}`)
+  const testsForSuite = knownTests.cucumber?.[testSuite] || []
+  return !testsForSuite.includes(testName)
 }
 
 function getTestStatusFromRetries (testStatuses) {

package/packages/datadog-instrumentations/src/grpc/server.js

@@ -92,7 +92,9 @@ function createWrapEmit (call, ctx, onCancel) {
           finishChannel.publish(ctx)
           call.removeListener('cancelled', onCancel)
           break
-        case 'finish':
+        // Streams are always cancelled before `finish` since 1.10.0 so we have
+        // to use `prefinish` instead to avoid cancellation false positives.
+        case 'prefinish':
           if (call.status) {
             updateChannel.publish(call.status)
           }

package/packages/datadog-instrumentations/src/helpers/hooks.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   '@apollo/server': () => require('../apollo-server'),
+  '@apollo/gateway': () => require('../apollo'),
   'apollo-server-core': () => require('../apollo-server-core'),
   '@aws-sdk/smithy-client': () => require('../aws-sdk'),
   '@cucumber/cucumber': () => require('../cucumber'),

package/packages/datadog-instrumentations/src/jest.js

@@ -140,14 +140,16 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
     // Function that receives a list of known tests for a test service and
     // returns the ones that belong to the current suite
     getKnownTestsForSuite (knownTests) {
+      if (this.knownTestsForThisSuite) {
+        return this.knownTestsForThisSuite
+      }
       let knownTestsForSuite = knownTests
-      // If jest runs in band, the known tests are not serialized, so they're an array.
-      if (!Array.isArray(knownTests)) {
+      // If jest is using workers, known tests are serialized to json.
+      // If jest runs in band, they are not.
+      if (typeof knownTestsForSuite === 'string') {
         knownTestsForSuite = JSON.parse(knownTestsForSuite)
       }
-      return knownTestsForSuite
-        .filter(test => test.includes(this.testSuite))
-        .map(test => test.replace(`jest.${this.testSuite}.`, '').trim())
+      return knownTestsForSuite.jest?.[this.testSuite] || []
     }
 
     // Add the `add_test` event we don't have the test object yet, so

package/packages/datadog-instrumentations/src/mocha.js

@@ -106,7 +106,10 @@ function getTestFullName (test) {
 }
 
 function isNewTest (test) {
-  return !knownTests.includes(getTestFullName(test))
+  const testSuite = getTestSuitePath(test.file, process.cwd())
+  const testName = removeEfdStringFromTestName(test.fullTitle())
+  const testsForSuite = knownTests.mocha?.[testSuite] || []
+  return !testsForSuite.includes(testName)
 }
 
 function retryTest (test) {

package/packages/datadog-plugin-amqplib/src/consumer.js

@@ -2,7 +2,8 @@
 
 const { TEXT_MAP } = require('../../../ext/formats')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const { getAmqpMessageSize, CONTEXT_PROPAGATION_KEY } = require('../../dd-trace/src/datastreams/processor')
+const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
 const { getResourceName } = require('./util')
 
 class AmqplibConsumerPlugin extends ConsumerPlugin {
@@ -29,12 +30,12 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
     })
 
     if (
-      this.config.dsmEnabled &&
-      message?.properties?.headers?.[CONTEXT_PROPAGATION_KEY]
+      this.config.dsmEnabled && message?.properties?.headers &&
+      DsmPathwayCodec.contextExists(message.properties.headers)
     ) {
       const payloadSize = getAmqpMessageSize({ headers: message.properties.headers, content: message.content })
       const queue = fields.queue ? fields.queue : fields.routingKey
-      this.tracer.decodeDataStreamsContext(message.properties.headers[CONTEXT_PROPAGATION_KEY])
+      this.tracer.decodeDataStreamsContext(message.properties.headers)
       this.tracer
         .setCheckpoint(['direction:in', `topic:${queue}`, 'type:rabbitmq'], span, payloadSize)
     }

package/packages/datadog-plugin-amqplib/src/producer.js

@@ -3,8 +3,8 @@
 const { TEXT_MAP } = require('../../../ext/formats')
 const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
-const { encodePathwayContext } = require('../../dd-trace/src/datastreams/pathway')
-const { getAmqpMessageSize, CONTEXT_PROPAGATION_KEY } = require('../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
+const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams/processor')
 const { getResourceName } = require('./util')
 
 class AmqplibProducerPlugin extends ProducerPlugin {
@@ -40,8 +40,7 @@ class AmqplibProducerPlugin extends ProducerPlugin {
         .setCheckpoint(
           ['direction:out', `exchange:${fields.exchange}`, `has_routing_key:${hasRoutingKey}`, 'type:rabbitmq']
           , span, payloadSize)
-      const pathwayCtx = encodePathwayContext(dataStreamsContext)
-      fields.headers[CONTEXT_PROPAGATION_KEY] = pathwayCtx
+      DsmPathwayCodec.encode(dataStreamsContext, fields.headers)
     }
   }
 }

package/packages/datadog-plugin-apollo/src/gateway/execute.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
+
+class ApolloGatewayExecutePlugin extends ApolloBasePlugin {
+  static get operation () { return 'execute' }
+  static get prefix () {
+    return 'tracing:apm:apollo:gateway:execute'
+  }
+}
+
+module.exports = ApolloGatewayExecutePlugin

package/packages/datadog-plugin-apollo/src/gateway/fetch.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const { storage } = require('../../../datadog-core')
+const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
+
+class ApolloGatewayFetchPlugin extends ApolloBasePlugin {
+  static get operation () { return 'fetch' }
+  static get prefix () {
+    return 'tracing:apm:apollo:gateway:fetch'
+  }
+
+  bindStart (ctx) {
+    const store = storage.getStore()
+    const childOf = store ? store.span : null
+
+    const spanData = {
+      childOf,
+      service: this.getServiceName(),
+      type: this.constructor.type,
+      meta: {}
+    }
+
+    const serviceName = ctx?.attributes?.service
+
+    if (serviceName) { spanData.meta['serviceName'] = serviceName }
+
+    const span = this.startSpan(this.getOperationName(), spanData, false)
+
+    ctx.parentStore = store
+    ctx.currentStore = { ...store, span }
+
+    return ctx.currentStore
+  }
+}
+
+module.exports = ApolloGatewayFetchPlugin

package/packages/datadog-plugin-apollo/src/gateway/index.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const { storage } = require('../../../datadog-core')
+const CompositePlugin = require('../../../dd-trace/src/plugins/composite')
+const ApolloGatewayExecutePlugin = require('./execute')
+const ApolloGatewayPostProcessingPlugin = require('./postprocessing')
+const ApolloGatewayRequestPlugin = require('./request')
+const ApolloGatewayPlanPlugin = require('./plan')
+const ApolloGatewayValidatePlugin = require('./validate')
+const ApolloGatewayFetchPlugin = require('./fetch')
+
+class ApolloGatewayPlugin extends CompositePlugin {
+  static get id () { return 'gateway' }
+  static get plugins () {
+    return {
+      execute: ApolloGatewayExecutePlugin,
+      postprocessing: ApolloGatewayPostProcessingPlugin,
+      request: ApolloGatewayRequestPlugin,
+      plan: ApolloGatewayPlanPlugin,
+      fetch: ApolloGatewayFetchPlugin,
+      validate: ApolloGatewayValidatePlugin
+    }
+  }
+
+  constructor (...args) {
+    super(...args)
+    this.addSub('apm:apollo:gateway:general:error', (ctx) => {
+      const store = storage.getStore()
+      const span = store?.span
+      if (!span) return
+      span.setTag('error', ctx.error)
+    })
+  }
+}
+
+module.exports = ApolloGatewayPlugin

package/packages/datadog-plugin-apollo/src/gateway/plan.js

@@ -0,0 +1,13 @@
+
+'use strict'
+
+const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
+
+class ApolloGatewayPlanPlugin extends ApolloBasePlugin {
+  static get operation () { return 'plan' }
+  static get prefix () {
+    return 'tracing:apm:apollo:gateway:plan'
+  }
+}
+
+module.exports = ApolloGatewayPlanPlugin

package/packages/datadog-plugin-apollo/src/gateway/postprocessing.js

@@ -0,0 +1,12 @@
+'use strict'
+
+const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
+
+class ApolloGatewayPostProcessingPlugin extends ApolloBasePlugin {
+  static get operation () { return 'postprocessing' }
+  static get prefix () {
+    return 'tracing:apm:apollo:gateway:postprocessing'
+  }
+}
+
+module.exports = ApolloGatewayPostProcessingPlugin

package/packages/datadog-plugin-apollo/src/gateway/request.js

@@ -0,0 +1,139 @@
+'use strict'
+
+const { storage } = require('../../../datadog-core')
+const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
+
+let tools
+
+const OPERATION_DEFINITION = 'OperationDefinition'
+const FRAGMENT_DEFINITION = 'FragmentDefinition'
+
+class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
+  static get operation () { return 'request' }
+  static get prefix () {
+    return 'tracing:apm:apollo:gateway:request'
+  }
+
+  constructor (...args) {
+    super(...args)
+    this.addSub('apm:apollo:gateway:request:executor', (ctx) => {
+      if (ctx.requestContext || ctx.gateway) {
+        this.requestContext = ctx
+      } else {
+        this.requestContext = {}
+      }
+    })
+  }
+
+  bindStart (ctx) {
+    const store = storage.getStore()
+    const childOf = store ? store.span : null
+    const spanData = {
+      childOf,
+      service: this.serviceName(
+        { id: `${this.constructor.id}.${this.constructor.operation}`, pluginConfig: this.config }),
+      type: this.constructor.type,
+      kind: this.constructor.kind,
+      meta: {}
+    }
+
+    const { requestContext, gateway } = this.requestContext
+
+    if (requestContext?.operationName) {
+      spanData.meta['graphql.operation.name'] = requestContext.operationName
+    }
+    if (gateway?.config?.telemetry?.includeDocument !== false && requestContext?.source) {
+      spanData.meta['graphql.source'] = requestContext.source
+    }
+
+    const operationContext =
+    buildOperationContext(gateway.schema, requestContext.document, requestContext.request.operationName)
+
+    if (operationContext?.operation?.operation) {
+      const document = requestContext?.document
+      const type = operationContext?.operation?.operation
+      const name = operationContext?.operation?.name && operationContext?.operation?.name?.value
+
+      spanData['resource'] = getSignature(document, name, type, this?.config?.signature)
+      spanData.meta['graphql.operation.type'] = type
+    }
+    const span = this.startSpan(this.operationName({ id: `${this.constructor.id}.${this.constructor.operation}` }),
+      spanData, false)
+
+    ctx.parentStore = store
+    ctx.currentStore = { ...store, span }
+    return ctx.currentStore
+  }
+
+  asyncStart (ctx) {
+    const errors = ctx?.result?.errors
+    // apollo gateway catches certain errors and returns them in the result object
+    // we want to capture these errors as spans
+    if (errors instanceof Array &&
+      errors[errors.length - 1] && errors[errors.length - 1].stack && errors[errors.length - 1].message) {
+      ctx.currentStore.span.setTag('error', errors[errors.length - 1])
+    }
+    ctx.currentStore.span.finish()
+    return ctx.parentStore
+  }
+
+  end () {
+    // do nothing to avoid ApolloBasePlugin's end method
+  }
+}
+
+function buildOperationContext (schema, operationDocument, operationName) {
+  let operation
+  let operationCount = 0
+  const fragments = Object.create(null)
+  try {
+    operationDocument.definitions.forEach(definition => {
+      switch (definition.kind) {
+        case OPERATION_DEFINITION:
+          operationCount++
+          if (!operationName && operationCount > 1) {
+            return
+          }
+          if (
+            !operationName ||
+            (definition.name && definition.name.value === operationName)
+          ) {
+            operation = definition
+          }
+          break
+        case FRAGMENT_DEFINITION:
+          fragments[definition.name.value] = definition
+          break
+      }
+    })
+  } catch (e) {
+    // safety net
+  }
+
+  return {
+    schema,
+    operation,
+    fragments
+  }
+}
+
+function getSignature (document, operationName, operationType, calculate) {
+  if (calculate !== false && tools !== false) {
+    try {
+      try {
+        tools = tools || require('./tools')
+      } catch (e) {
+        tools = false
+        throw e
+      }
+
+      return tools.defaultEngineReportingSignature(document, operationName)
+    } catch (e) {
+      // safety net
+    }
+  }
+
+  return [operationType, operationName].filter(val => val).join(' ')
+}
+
+module.exports = ApolloGatewayRequestPlugin

package/packages/datadog-plugin-apollo/src/gateway/validate.js

@@ -0,0 +1,21 @@
+'use strict'
+
+const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
+
+class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
+  static get operation () { return 'validate' }
+  static get prefix () {
+    return 'tracing:apm:apollo:gateway:validate'
+  }
+
+  end (ctx) {
+    const result = ctx.result
+    if (result instanceof Array &&
+      result[result.length - 1] && result[result.length - 1].stack && result[result.length - 1].message) {
+      ctx.currentStore.span.setTag('error', result[result.length - 1])
+    }
+    ctx.currentStore.span.finish()
+  }
+}
+
+module.exports = ApolloGatewayValidatePlugin

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

@@ -0,0 +1,15 @@
+'use strict'
+
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const ApolloGatewayPlugin = require('./gateway')
+
+class ApolloPlugin extends CompositePlugin {
+  static get id () { return 'apollo' }
+  static get plugins () {
+    return {
+      gateway: ApolloGatewayPlugin
+    }
+  }
+}
+
+module.exports = ApolloPlugin

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -1,9 +1,8 @@
 'use strict'
 const {
-  CONTEXT_PROPAGATION_KEY,
   getSizeOrZero
 } = require('../../../dd-trace/src/datastreams/processor')
-const { encodePathwayContext } = require('../../../dd-trace/src/datastreams/pathway')
+const { DsmPathwayCodec } = require('../../../dd-trace/src/datastreams/pathway')
 const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 const { storage } = require('../../../datadog-core')
@@ -113,13 +112,10 @@ class Kinesis extends BaseAwsSdkPlugin {
       const parsedAttributes = JSON.parse(Buffer.from(record.Data).toString())
 
       if (
-        parsedAttributes &&
-        parsedAttributes._datadog &&
-        parsedAttributes._datadog[CONTEXT_PROPAGATION_KEY] &&
-        streamName
+        parsedAttributes?._datadog && streamName && DsmPathwayCodec.contextExists(parsedAttributes._datadog)
       ) {
         const payloadSize = getSizeOrZero(record.Data)
-        this.tracer.decodeDataStreamsContext(Buffer.from(parsedAttributes._datadog[CONTEXT_PROPAGATION_KEY]))
+        this.tracer.decodeDataStreamsContext(parsedAttributes._datadog)
         this.tracer
           .setCheckpoint(['direction:in', `topic:${streamName}`, 'type:kinesis'], span, payloadSize)
       }
@@ -182,10 +178,7 @@ class Kinesis extends BaseAwsSdkPlugin {
     if (this.config.dsmEnabled) {
       parsedData._datadog = ddInfo
       const dataStreamsContext = this.setDSMCheckpoint(span, parsedData, stream)
-      if (dataStreamsContext) {
-        const pathwayCtx = encodePathwayContext(dataStreamsContext)
-        ddInfo[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
-      }
+      DsmPathwayCodec.encode(dataStreamsContext, ddInfo)
     }
 
     if (Object.keys(ddInfo).length !== 0) {

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -1,6 +1,6 @@
 'use strict'
-const { CONTEXT_PROPAGATION_KEY, getHeadersSize } = require('../../../dd-trace/src/datastreams/processor')
-const { encodePathwayContext } = require('../../../dd-trace/src/datastreams/pathway')
+const { getHeadersSize } = require('../../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../../dd-trace/src/datastreams/pathway')
 const log = require('../../../dd-trace/src/log')
 const BaseAwsSdkPlugin = require('../base')
 
@@ -94,10 +94,7 @@ class Sns extends BaseAwsSdkPlugin {
       }
 
       const dataStreamsContext = this.setDSMCheckpoint(span, params, topicArn)
-      if (dataStreamsContext) {
-        const pathwayCtx = encodePathwayContext(dataStreamsContext)
-        ddInfo[CONTEXT_PROPAGATION_KEY] = pathwayCtx.toJSON()
-      }
+      DsmPathwayCodec.encode(dataStreamsContext, ddInfo)
     }
 
     if (Object.keys(ddInfo).length !== 0) {