dd-trace 5.61.1 → 5.63.0

package/packages/datadog-plugin-prisma/src/client.js

@@ -1,12 +1,10 @@
 'use strict'
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 class PrismaClientPlugin extends DatabasePlugin {
-  static get id () { return 'prisma' }
-  static get operation () { return 'client' }
-  static get system () { return 'prisma' }
-  static get prefix () {
-    return 'tracing:apm:prisma:client'
-  }
+  static id = 'prisma'
+  static operation = 'client'
+  static system = 'prisma'
+  static prefix = 'tracing:apm:prisma:client'
 
   bindStart (ctx) {
     const service = this.serviceName({ pluginConfig: this.config })

package/packages/datadog-plugin-prisma/src/engine.js

@@ -23,9 +23,9 @@ const databaseDriverMapper = {
 }
 
 class PrismaEngine extends DatabasePlugin {
-  static get id () { return 'prisma' }
-  static get operation () { return 'engine' }
-  static get system () { return 'prisma' }
+  static id = 'prisma'
+  static operation = 'engine'
+  static system = 'prisma'
 
   start (ctx) {
     const { engineSpan, allEngineSpans, childOf, dbConfig } = ctx

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

@@ -6,7 +6,7 @@ const PrismaClientPlugin = require('./client')
 const PrismaEnginePlugin = require('./engine')
 
 class PrismaPlugin extends CompositePlugin {
-  static get id () { return 'prisma' }
+  static id = 'prisma'
   static get plugins () {
     return {
       client: PrismaClientPlugin,

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

@@ -4,13 +4,9 @@ const SchemaPlugin = require('../../dd-trace/src/plugins/schema')
 const SchemaExtractor = require('./schema_iterator')
 
 class ProtobufjsPlugin extends SchemaPlugin {
-  static get id () {
-    return 'protobufjs'
-  }
+  static id = 'protobufjs'
 
-  static get schemaExtractor () {
-    return SchemaExtractor
-  }
+  static schemaExtractor = SchemaExtractor
 }
 
 module.exports = ProtobufjsPlugin

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

@@ -5,8 +5,8 @@ const CachePlugin = require('../../dd-trace/src/plugins/cache')
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 
 class RedisPlugin extends CachePlugin {
-  static get id () { return 'redis' }
-  static get system () { return 'redis' }
+  static id = 'redis'
+  static system = 'redis'
 
   constructor (...args) {
     super(...args)

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

@@ -4,9 +4,7 @@ const RouterPlugin = require('../../datadog-plugin-router/src')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class RestifyPlugin extends RouterPlugin {
-  static get id () {
-    return 'restify'
-  }
+  static id = 'restify'
 
   constructor (...args) {
     super(...args)

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

@@ -4,7 +4,7 @@ const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams')
 
 class RheaConsumerPlugin extends ConsumerPlugin {
-  static get id () { return 'rhea' }
+  static id = 'rhea'
 
   constructor (...args) {
     super(...args)

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

@@ -5,7 +5,7 @@ const ConsumerPlugin = require('./consumer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class RheaPlugin extends CompositePlugin {
-  static get id () { return 'rhea' }
+  static id = 'rhea'
   static get plugins () {
     return {
       producer: ProducerPlugin,

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

@@ -5,8 +5,8 @@ const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const { getAmqpMessageSize, DsmPathwayCodec } = require('../../dd-trace/src/datastreams')
 
 class RheaProducerPlugin extends ProducerPlugin {
-  static get id () { return 'rhea' }
-  static get operation () { return 'send' }
+  static id = 'rhea'
+  static operation = 'send'
 
   constructor (...args) {
     super(...args)

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

@@ -7,9 +7,7 @@ const { storage } = require('../../datadog-core')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
 class RouterPlugin extends WebPlugin {
-  static get id () {
-    return 'router'
-  }
+  static id = 'router'
 
   constructor (...args) {
     super(...args)

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

@@ -27,9 +27,7 @@ function getTestSpanFromTrace (trace) {
 }
 
 class SeleniumPlugin extends CiPlugin {
-  static get id () {
-    return 'selenium'
-  }
+  static id = 'selenium'
 
   constructor (...args) {
     super(...args)

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

@@ -3,7 +3,7 @@
 const ServerPlugin = require('../../dd-trace/src/plugins/server')
 
 class SharedbPlugin extends ServerPlugin {
-  static get id () { return 'sharedb' }
+  static id = 'sharedb'
 
   bindStart (ctx) {
     const { actionName, request } = ctx

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

@@ -4,9 +4,9 @@ const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 
 class TediousPlugin extends DatabasePlugin {
-  static get id () { return 'tedious' }
-  static get operation () { return 'request' } // TODO: change to match other database plugins
-  static get system () { return 'mssql' }
+  static id = 'tedious'
+  static operation = 'request' // TODO: change to match other database plugins
+  static system = 'mssql'
 
   bindStart (ctx) {
     const service = this.serviceName({ pluginConfig: this.config, system: this.system })

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

@@ -3,10 +3,8 @@
 const FetchPlugin = require('../../datadog-plugin-fetch/src/index.js')
 
 class UndiciPlugin extends FetchPlugin {
-  static get id () { return 'undici' }
-  static get prefix () {
-    return 'tracing:apm:undici:fetch'
-  }
+  static id = 'undici'
+  static prefix = 'tracing:apm:undici:fetch'
 }
 
 module.exports = UndiciPlugin

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

@@ -47,9 +47,7 @@ const { DD_MAJOR } = require('../../../version')
 const MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION = 5
 
 class VitestPlugin extends CiPlugin {
-  static get id () {
-    return 'vitest'
-  }
+  static id = 'vitest'
 
   constructor (...args) {
     super(...args)

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

@@ -4,9 +4,7 @@ const Plugin = require('../../dd-trace/src/plugins/plugin')
 const web = require('../../dd-trace/src/plugins/util/web')
 
 class WebPlugin extends Plugin {
-  static get id () {
-    return 'web'
-  }
+  static id = 'web'
 
   configure (config) {
     return super.configure(web.normalizeConfig(config))

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

@@ -1,10 +1,8 @@
 'use strict'
 
-const StructuredLogPlugin = require('../../dd-trace/src/plugins/structured_log_plugin')
+const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
 
-class WinstonPlugin extends StructuredLogPlugin {
-  static get id () {
-    return 'winston'
-  }
+class WinstonPlugin extends LogPlugin {
+  static id = 'winston'
 }
 module.exports = WinstonPlugin

package/packages/dd-trace/src/appsec/channels.js

@@ -5,6 +5,7 @@ const dc = require('dc-polyfill')
 // TODO: use TBD naming convention
 module.exports = {
   apolloChannel: dc.tracingChannel('datadog:apollo:request'),
+  apolloHttpServerChannel: dc.tracingChannel('datadog:apollo:httpserver'),
   apolloServerCoreChannel: dc.tracingChannel('datadog:apollo-server-core:request'),
   bodyParser: dc.channel('datadog:body-parser:read:finish'),
   childProcessExecutionTracingChannel: dc.tracingChannel('datadog:child_process:execution'),

package/packages/dd-trace/src/appsec/graphql.js

@@ -14,6 +14,7 @@ const web = require('../plugins/util/web')
 const {
   startGraphqlResolve,
   graphqlMiddlewareChannel,
+  apolloHttpServerChannel,
   apolloChannel,
   apolloServerCoreChannel
 } = require('./channels')
@@ -55,7 +56,6 @@ function enterInApolloMiddleware (data) {
   if (!req) return
 
   graphqlRequestData.set(req, {
-    inApolloMiddleware: true,
     blocked: false
   })
 }
@@ -70,17 +70,13 @@ function enterInApolloServerCoreRequest () {
   })
 }
 
-function exitFromApolloMiddleware (data) {
-  const req = data?.req || storage('legacy').getStore()?.req
-  const requestData = graphqlRequestData.get(req)
-  if (requestData) requestData.inApolloMiddleware = false
-}
-
 function enterInApolloRequest () {
   const req = storage('legacy').getStore()?.req
 
   const requestData = graphqlRequestData.get(req)
-  if (requestData?.inApolloMiddleware) {
+  if (requestData) {
+    // Set isInGraphqlRequest=true since this function only runs for GraphQL requests
+    // This works for both Apollo v4 (middleware) and v5 (HTTP server) contexts
     requestData.isInGraphqlRequest = true
     addSpecificEndpoint(req.method, req.originalUrl || req.url, specificBlockingTypes.GRAPHQL)
   }
@@ -118,8 +114,7 @@ function beforeWriteApolloGraphqlResponse ({ abortController, abortData }) {
 
 function enableApollo () {
   graphqlMiddlewareChannel.subscribe({
-    start: enterInApolloMiddleware,
-    end: exitFromApolloMiddleware
+    start: enterInApolloMiddleware
   })
 
   apolloServerCoreChannel.subscribe({
@@ -131,12 +126,15 @@ function enableApollo () {
     start: enterInApolloRequest,
     asyncEnd: beforeWriteApolloGraphqlResponse
   })
+
+  apolloHttpServerChannel.subscribe({
+    start: enterInApolloMiddleware
+  })
 }
 
 function disableApollo () {
   graphqlMiddlewareChannel.unsubscribe({
-    start: enterInApolloMiddleware,
-    end: exitFromApolloMiddleware
+    start: enterInApolloMiddleware
   })
 
   apolloServerCoreChannel.unsubscribe({
@@ -148,6 +146,10 @@ function disableApollo () {
     start: enterInApolloRequest,
     asyncEnd: beforeWriteApolloGraphqlResponse
   })
+
+  apolloHttpServerChannel.unsubscribe({
+    start: enterInApolloMiddleware
+  })
 }
 
 function enableGraphql () {

package/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js

@@ -16,7 +16,10 @@ class SqlInjectionAnalyzer extends StoredInjectionAnalyzer {
   onConfigure () {
     this.addSub('apm:mysql:query:start', ({ sql }) => this.analyze(sql, undefined, 'MYSQL'))
     this.addSub('datadog:mysql2:outerquery:start', ({ sql }) => this.analyze(sql, undefined, 'MYSQL'))
-    this.addSub('apm:pg:query:start', ({ query }) => this.analyze(query.text, undefined, 'POSTGRES'))
+    this.addSub(
+      'apm:pg:query:start',
+      ({ originalText, query }) => this.analyze(originalText || query.text, undefined, 'POSTGRES')
+    )
 
     this.addBind(
       'datadog:sequelize:query:start',
@@ -24,17 +27,22 @@ class SqlInjectionAnalyzer extends StoredInjectionAnalyzer {
     )
     this.addSub('datadog:sequelize:query:finish', () => this.returnToParentStore())
 
-    this.addSub('datadog:pg:pool:query:start', ({ query }) => this.setStoreAndAnalyze(query.text, 'POSTGRES'))
+    this.addBind('datadog:pg:pool:query:start', ({ query }) => this.getStoreAndAnalyze(query.text, 'POSTGRES'))
     this.addSub('datadog:pg:pool:query:finish', () => this.returnToParentStore())
 
     this.addSub('datadog:mysql:pool:query:start', ({ sql }) => this.setStoreAndAnalyze(sql, 'MYSQL'))
     this.addSub('datadog:mysql:pool:query:finish', () => this.returnToParentStore())
 
-    this.addSub('datadog:knex:raw:start', ({ sql, dialect: knexDialect }) => {
+    this.addBind('datadog:knex:raw:start', (context) => {
+      const { sql, dialect: knexDialect } = context
       const dialect = this.normalizeKnexDialect(knexDialect)
-      this.setStoreAndAnalyze(sql, dialect)
+      const currentStore = this.getStoreAndAnalyze(sql, dialect)
+      context.currentStore = currentStore
+      return currentStore
     })
-    this.addSub('datadog:knex:raw:finish', () => this.returnToParentStore())
+
+    this.addBind('datadog:knex:raw:subscribes', ({ currentStore }) => currentStore)
+    this.addBind('datadog:knex:raw:finish', ({ currentStore }) => currentStore?.sqlParentStore)
   }
 
   setStoreAndAnalyze (query, dialect) {
@@ -54,8 +62,7 @@ class SqlInjectionAnalyzer extends StoredInjectionAnalyzer {
     }
   }
 
-  returnToParentStore () {
-    const store = storage('legacy').getStore()
+  returnToParentStore (store = storage('legacy').getStore()) {
     if (store && store.sqlParentStore) {
       storage('legacy').enterWith(store.sqlParentStore)
     }

package/packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js

@@ -139,12 +139,12 @@ class TaintTrackingPlugin extends SourceIastPlugin {
   addDatabaseSubscriptions () {
     this.addSub(
       { channelName: 'datadog:sequelize:query:finish', tag: SQL_ROW_VALUE },
-      ({ result }) => this._taintDatabaseResult(result, 'sequelize')
+      ({ result }) => this._taintDatabaseResult(result, 'sequelize', getIastContext(storage('legacy').getStore()))
     )
 
     this.addSub(
       { channelName: 'apm:pg:query:finish', tag: SQL_ROW_VALUE },
-      ({ result }) => this._taintDatabaseResult(result, 'pg')
+      ({ result, currentStore }) => this._taintDatabaseResult(result, 'pg', getIastContext(currentStore))
     )
   }
 
@@ -180,7 +180,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
       { channelName: 'apm:graphql:resolve:start', tag: HTTP_REQUEST_BODY },
       (data) => {
         const iastContext = getIastContext(storage('legacy').getStore())
-        const source = data.context?.source
+        const source = data.rootCtx?.source
         const ranges = source && getRanges(iastContext, source)
         if (ranges?.length) {
           this._taintTrackingHandler(ranges[0].iinfo.type, data.args, null, iastContext)
@@ -263,7 +263,7 @@ class TaintTrackingPlugin extends SourceIastPlugin {
     this.taintUrl(req, iastContext)
   }
 
-  _taintDatabaseResult (result, dbOrigin, iastContext = getIastContext(storage('legacy').getStore()), name) {
+  _taintDatabaseResult (result, dbOrigin, iastContext, name) {
     if (!iastContext) return result
 
     if (this._rowsToTaint === 0) return result