dd-trace 5.52.0 → 5.54.0

package/packages/datadog-plugin-kafkajs/src/utils.js

@@ -4,7 +4,7 @@ function convertToTextMap (bufferMap) {
   if (!bufferMap) return null
 
   // rdKafka returns an array of header maps
-  if (bufferMap instanceof Array) {
+  if (Array.isArray(bufferMap)) {
     const headers = {}
     for (const headerMap of bufferMap) {
       for (const key of Object.keys(headerMap)) {

package/packages/datadog-plugin-langchain/src/handlers/chain.js

@@ -3,35 +3,35 @@
 const LangChainHandler = require('./default')
 
 class LangChainChainHandler extends LangChainHandler {
-  getSpanStartTags (ctx) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
-    if (!this.isPromptCompletionSampled()) return tags
+    if (!this.isPromptCompletionSampled(span)) return tags
 
     let inputs = ctx.args?.[0]
     inputs = Array.isArray(inputs) ? inputs : [inputs]
 
     for (const idx in inputs) {
       const input = inputs[idx]
-      if (typeof input !== 'object') {
-        tags[`langchain.request.inputs.${idx}`] = this.normalize(input)
-      } else {
+      if (typeof input === 'object') {
         for (const [key, value] of Object.entries(input)) {
         // these are mappings to the python client names, ie lc_kwargs
         // only present on BaseMessage types
           if (key.includes('lc_')) continue
           tags[`langchain.request.inputs.${idx}.${key}`] = this.normalize(value)
         }
+      } else {
+        tags[`langchain.request.inputs.${idx}`] = this.normalize(input)
       }
     }
 
     return tags
   }
 
-  getSpanEndTags (ctx) {
+  getSpanEndTags (ctx, span) {
     const tags = {}
 
-    if (!this.isPromptCompletionSampled()) return tags
+    if (!this.isPromptCompletionSampled(span)) return tags
 
     let outputs = ctx.result
     outputs = Array.isArray(outputs) ? outputs : [outputs]

package/packages/datadog-plugin-langchain/src/handlers/embedding.js

@@ -3,12 +3,12 @@
 const LangChainHandler = require('./default')
 
 class LangChainEmbeddingHandler extends LangChainHandler {
-  getSpanStartTags (ctx) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
     const inputTexts = ctx.args?.[0]
 
-    const sampled = this.isPromptCompletionSampled()
+    const sampled = this.isPromptCompletionSampled(span)
     if (typeof inputTexts === 'string') {
       // embed query
       if (sampled) {

package/packages/datadog-plugin-langchain/src/handlers/language_models/chat_model.js

@@ -5,7 +5,7 @@ const LangChainLanguageModelHandler = require('.')
 const COMPLETIONS = 'langchain.response.completions'
 
 class LangChainChatModelHandler extends LangChainLanguageModelHandler {
-  getSpanStartTags (ctx, provider) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
     const inputs = ctx.args?.[0]
@@ -15,7 +15,7 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
 
       for (const messageIndex in messageSet) {
         const message = messageSet[messageIndex]
-        if (this.isPromptCompletionSampled()) {
+        if (this.isPromptCompletionSampled(span)) {
           tags[`langchain.request.messages.${messageSetIndex}.${messageIndex}.content`] =
             this.normalize(message.content) || ''
         }
@@ -39,11 +39,13 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
     return tags
   }
 
-  getSpanEndTags (ctx) {
+  getSpanEndTags (ctx, span) {
     const { result } = ctx
 
     const tags = {}
 
+    const sampled = this.isPromptCompletionSampled(span)
+
     this.extractTokenMetrics(ctx.currentStore?.span, result)
 
     for (const messageSetIdx in result?.generations) {
@@ -56,7 +58,7 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
         const message = chatCompletion.message
         let toolCalls = message.tool_calls
 
-        if (text && this.isPromptCompletionSampled()) {
+        if (text && sampled) {
           tags[
           `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.content`
           ] = this.normalize(text)

package/packages/datadog-plugin-langchain/src/handlers/language_models/llm.js

@@ -3,12 +3,12 @@
 const LangChainLanguageModelHandler = require('.')
 
 class LangChainLLMHandler extends LangChainLanguageModelHandler {
-  getSpanStartTags (ctx, provider) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
     const prompts = ctx.args?.[0]
     for (const promptIdx in prompts) {
-      if (!this.isPromptCompletionSampled()) continue
+      if (!this.isPromptCompletionSampled(span)) continue
 
       const prompt = prompts[promptIdx]
       tags[`langchain.request.prompts.${promptIdx}.content`] = this.normalize(prompt) || ''
@@ -30,16 +30,17 @@ class LangChainLLMHandler extends LangChainLanguageModelHandler {
     return tags
   }
 
-  getSpanEndTags (ctx) {
+  getSpanEndTags (ctx, span) {
     const { result } = ctx
 
     const tags = {}
+    const sampled = this.isPromptCompletionSampled(span)
 
     this.extractTokenMetrics(ctx.currentStore?.span, result)
 
     for (const completionIdx in result?.generations) {
       const completion = result.generations[completionIdx]
-      if (this.isPromptCompletionSampled()) {
+      if (sampled) {
         tags[`langchain.response.completions.${completionIdx}.text`] = this.normalize(completion[0].text) || ''
       }
 

package/packages/datadog-plugin-langchain/src/tracing.js

@@ -49,23 +49,24 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
     const provider = handler.extractProvider(instance)
     const model = handler.extractModel(instance)
 
-    const tags = handler.getSpanStartTags(ctx, provider) || []
-
-    if (apiKey) tags[API_KEY] = apiKey
-    if (provider) tags[PROVIDER] = provider
-    if (model) tags[MODEL] = model
-    if (type) tags[TYPE] = type
-
     const span = this.startSpan('langchain.request', {
       service: this.config.service,
       resource,
       kind: 'client',
       meta: {
-        [MEASURED]: 1,
-        ...tags
+        [MEASURED]: 1
       }
     }, false)
 
+    const tags = handler.getSpanStartTags(ctx, provider, span) || []
+
+    if (apiKey) tags[API_KEY] = apiKey
+    if (provider) tags[PROVIDER] = provider
+    if (model) tags[MODEL] = model
+    if (type) tags[TYPE] = type
+
+    span.addTags(tags)
+
     const store = storage('legacy').getStore() || {}
     ctx.currentStore = { ...store, span }
 
@@ -78,7 +79,7 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
     const { type } = ctx
 
     const handler = this.handlers[type]
-    const tags = handler.getSpanEndTags(ctx) || {}
+    const tags = handler.getSpanEndTags(ctx, span) || {}
 
     span.addTags(tags)
 

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

@@ -3,8 +3,6 @@
 const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
-let skippedStore
-
 class MariadbPlugin extends MySQLPlugin {
   static get id () { return 'mariadb' }
   static get system () { return 'mariadb' }
@@ -12,14 +10,10 @@ class MariadbPlugin extends MySQLPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addSub(`apm:${this.component}:pool:skip`, () => {
-      skippedStore = storage('legacy').getStore()
-      storage('legacy').enterWith({ noop: true })
-    })
+    this.addBind(`apm:${this.component}:pool:skip`, () => ({ noop: true }))
 
-    this.addSub(`apm:${this.component}:pool:unskip`, () => {
-      storage('legacy').enterWith(skippedStore)
-      skippedStore = undefined
+    this.addSub(`apm:${this.component}:command:add`, ctx => {
+      ctx.parentStore = storage('legacy').getStore()
     })
   }
 }

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

@@ -37,7 +37,9 @@ const {
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED,
+  isModifiedTest
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -109,12 +111,9 @@ class MochaPlugin extends CiPlugin {
       this.telemetry.distribution(TELEMETRY_CODE_COVERAGE_NUM_FILES, {}, relativeCoverageFiles.length)
     })
 
-    this.addSub('ci:mocha:test-suite:start', ({
-      testSuiteAbsolutePath,
-      isUnskippable,
-      isForcedToRun,
-      itrCorrelationId
-    }) => {
+    this.addBind('ci:mocha:test-suite:start', (ctx) => {
+      const { testSuiteAbsolutePath, isUnskippable, isForcedToRun, itrCorrelationId } = ctx
+
       // If the test module span is undefined, the plugin has not been initialized correctly and we bail out
       if (!this.testModuleSpan) {
         return
@@ -134,11 +133,9 @@ class MochaPlugin extends CiPlugin {
         testSuiteMetadata[TEST_ITR_FORCED_RUN] = 'true'
         this.telemetry.count(TELEMETRY_ITR_FORCED_TO_RUN, { testLevel: 'suite' })
       }
-      if (this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot) {
-        testSuiteMetadata[TEST_SOURCE_FILE] = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      } else {
-        testSuiteMetadata[TEST_SOURCE_FILE] = testSuite
-      }
+      testSuiteMetadata[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
+        ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+        : testSuite
       if (testSuiteMetadata[TEST_SOURCE_FILE]) {
         testSuiteMetadata[TEST_SOURCE_START] = 1
       }
@@ -164,38 +161,64 @@ class MochaPlugin extends CiPlugin {
         testSuiteSpan.setTag(ITR_CORRELATION_ID, itrCorrelationId)
       }
       const store = storage('legacy').getStore()
-      this.enter(testSuiteSpan, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, testSuiteSpan }
       this._testSuites.set(testSuite, testSuiteSpan)
     })
 
-    this.addSub('ci:mocha:test-suite:finish', (status) => {
-      const store = storage('legacy').getStore()
-      if (store && store.span) {
-        const span = store.span
+    this.addSub('ci:mocha:test-suite:finish', ({ testSuiteSpan, status }) => {
+      if (testSuiteSpan) {
         // the test status of the suite may have been set in ci:mocha:test-suite:error already
-        if (!span.context()._tags[TEST_STATUS]) {
-          span.setTag(TEST_STATUS, status)
+        if (!testSuiteSpan.context()._tags[TEST_STATUS]) {
+          testSuiteSpan.setTag(TEST_STATUS, status)
         }
-        span.finish()
+        testSuiteSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
       }
     })
 
-    this.addSub('ci:mocha:test-suite:error', (err) => {
-      const store = storage('legacy').getStore()
-      if (store && store.span) {
-        const span = store.span
-        span.setTag('error', err)
-        span.setTag(TEST_STATUS, 'fail')
+    this.addBind('ci:mocha:test-suite:error', (ctx) => {
+      const { error } = ctx
+      const testSuiteSpan = ctx.currentStore?.testSuiteSpan
+
+      if (testSuiteSpan) {
+        testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, testSuiteSpan }
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:start', (testInfo) => {
+    this.addSub('ci:mocha:test:is-modified', ({ modifiedTests, file, onDone }) => {
+      const testPath = getTestSuitePath(file, this.repositoryRoot)
+      const isModified = isModifiedTest(
+        testPath,
+        null,
+        null,
+        modifiedTests,
+        this.constructor.id
+      )
+
+      onDone(isModified)
+    })
+
+    this.addBind('ci:mocha:test:fn', (ctx) => {
+      return ctx.currentStore
+    })
+
+    this.addBind('ci:mocha:test:start', (ctx) => {
       const store = storage('legacy').getStore()
-      const span = this.startTestSpan(testInfo)
+      const span = this.startTestSpan(ctx)
+
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
 
-      this.enter(span, store)
       this.activeTestSpan = span
+
+      return ctx.currentStore
     })
 
     this.addSub('ci:mocha:worker:finish', () => {
@@ -203,6 +226,7 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addSub('ci:mocha:test:finish', ({
+      span,
       status,
       hasBeenRetried,
       isLastRetry,
@@ -212,9 +236,6 @@ class MochaPlugin extends CiPlugin {
       isAttemptToFixRetry,
       isAtrRetry
     }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-
       if (span) {
         span.setTag(TEST_STATUS, status)
         if (hasBeenRetried) {
@@ -260,19 +281,26 @@ class MochaPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:mocha:test:skip', (testInfo) => {
+    this.addBind('ci:mocha:test:skip', (ctx) => {
       const store = storage('legacy').getStore()
       // skipped through it.skip, so the span is not created yet
       // for this test
       if (!store) {
-        const testSpan = this.startTestSpan(testInfo)
-        this.enter(testSpan, store)
+        const span = this.startTestSpan(ctx)
+
+        ctx.parentStore = store
+        ctx.currentStore = { ...store, span }
+
+        this.activeTestSpan = span
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:error', (err) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
+    this.addBind('ci:mocha:test:error', (ctx) => {
+      const { err } = ctx
+      const span = ctx.currentStore?.span
+
       if (err && span) {
         if (err.constructor.name === 'Pending' && !this.forbidPending) {
           span.setTag(TEST_STATUS, 'skip')
@@ -280,12 +308,17 @@ class MochaPlugin extends CiPlugin {
           span.setTag(TEST_STATUS, 'fail')
           span.setTag('error', err)
         }
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, span }
+
+        this.activeTestSpan = span
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:retry', ({ isFirstAttempt, willBeRetried, err, test, isAtrRetry }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
+    this.addSub('ci:mocha:test:retry', ({ span, isFirstAttempt, willBeRetried, err, test, isAtrRetry }) => {
       if (span) {
         span.setTag(TEST_STATUS, 'fail')
         if (!isFirstAttempt) {
@@ -446,7 +479,8 @@ class MochaPlugin extends CiPlugin {
       isParallel,
       isAttemptToFix,
       isDisabled,
-      isQuarantined
+      isQuarantined,
+      isModified
     } = testInfo
 
     const extraTags = {}
@@ -475,20 +509,26 @@ class MochaPlugin extends CiPlugin {
       extraTags[TEST_MANAGEMENT_IS_QUARANTINED] = 'true'
     }
 
+    if (isModified) {
+      extraTags[TEST_IS_MODIFIED] = 'true'
+      if (isEfdRetry) {
+        extraTags[TEST_IS_RETRY] = 'true'
+        extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.efd
+      }
+    }
+
     const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
     const testSuiteSpan = this._testSuites.get(testSuite)
 
-    if (this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot) {
-      extraTags[TEST_SOURCE_FILE] = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-    } else {
-      extraTags[TEST_SOURCE_FILE] = testSuite
-    }
+    extraTags[TEST_SOURCE_FILE] = this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot
+      ? getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      : testSuite
 
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'
       if (isEfdRetry) {
         extraTags[TEST_IS_RETRY] = 'true'
-        extraTags[TEST_RETRY_REASON] = 'early_flake_detection'
+        extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.efd
       }
     }
 

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -103,7 +103,7 @@ function getResource (plugin, ns, query, operationName) {
 }
 
 function truncate (input) {
-  return input.slice(0, Math.min(input.length, 10000))
+  return input.slice(0, Math.min(input.length, 10_000))
 }
 
 function shouldSimplify (input) {

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

@@ -7,22 +7,24 @@ class MySQLPlugin extends DatabasePlugin {
   static get id () { return 'mysql' }
   static get system () { return 'mysql' }
 
-  start (payload) {
-    const service = this.serviceName({ pluginConfig: this.config, dbConfig: payload.conf, system: this.system })
+  bindStart (ctx) {
+    const service = this.serviceName({ pluginConfig: this.config, dbConfig: ctx.conf, system: this.system })
     const span = this.startSpan(this.operationName(), {
       service,
-      resource: payload.sql,
+      resource: ctx.sql,
       type: 'sql',
       kind: 'client',
       meta: {
         'db.type': this.system,
-        'db.user': payload.conf.user,
-        'db.name': payload.conf.database,
-        'out.host': payload.conf.host,
-        [CLIENT_PORT_KEY]: payload.conf.port
+        'db.user': ctx.conf.user,
+        'db.name': ctx.conf.database,
+        'out.host': ctx.conf.host,
+        [CLIENT_PORT_KEY]: ctx.conf.port
       }
-    })
-    payload.sql = this.injectDbmQuery(span, payload.sql, service)
+    }, ctx)
+    ctx.sql = this.injectDbmQuery(span, ctx.sql, service)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -1,9 +1,25 @@
 'use strict'
 
+const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
 class MySQL2Plugin extends MySQLPlugin {
   static get id () { return 'mysql2' }
+
+  constructor () {
+    super(...arguments)
+
+    this.addSub(`apm:${this.component}:command:add`, ctx => {
+      ctx.parentStore = storage('legacy').getStore()
+    })
+
+    this.addBind(`apm:${this.component}:command:start`, ctx => ctx.parentStore)
+    this.addBind(`apm:${this.component}:command:finish`, ctx => ctx.parentStore)
+  }
+
+  bindStart (ctx) {
+    return storage('legacy').run(ctx.parentStore, () => super.bindStart(ctx))
+  }
 }
 
 module.exports = MySQL2Plugin

package/packages/datadog-plugin-net/src/tcp.js

@@ -31,7 +31,7 @@ class NetTCPPlugin extends ClientPlugin {
 
     this.startSpan('tcp.connect', {
       service: this.config.service,
-      resource: [host, port].filter(val => val).join(':'),
+      resource: [host, port].filter(Boolean).join(':'),
       kind: 'client',
       meta: {
         'tcp.remote.host': host,

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

@@ -6,7 +6,7 @@ const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const web = require('../../dd-trace/src/plugins/util/web')
 
-const errorPages = ['/404', '/500', '/_error', '/_not-found', '/_not-found/page']
+const errorPages = new Set(['/404', '/500', '/_error', '/_not-found', '/_not-found/page'])
 
 class NextPlugin extends ServerPlugin {
   static get id () {
@@ -97,7 +97,7 @@ class NextPlugin extends ServerPlugin {
 
     // Only use error page names if there's not already a name
     const current = span.context()._tags['next.page']
-    const isErrorPage = errorPages.includes(page)
+    const isErrorPage = errorPages.has(page)
 
     if (current && isErrorPage) {
       return
@@ -106,7 +106,7 @@ class NextPlugin extends ServerPlugin {
     // remove ending /route or /page for appDir projects
     // need to check if not an error page too, as those are marked as app directory
     // in newer versions
-    if (isAppPath && !isErrorPage) page = page.substring(0, page.lastIndexOf('/'))
+    if (isAppPath && !isErrorPage) page = page.slice(0, Math.max(0, page.lastIndexOf('/')))
 
     // handle static resource
     if (isStatic) {
@@ -137,9 +137,10 @@ function normalizeConfig (config) {
   return Object.assign({}, config, { hooks, validateStatus })
 }
 
+const noop = () => {}
+
 function getHooks (config) {
-  const noop = () => {}
-  const request = (config.hooks && config.hooks.request) || noop
+  const request = config.hooks?.request ?? noop
 
   return { request }
 }

package/packages/datadog-plugin-openai/src/services.js

@@ -11,8 +11,8 @@ let logger = null
 let interval = null
 
 module.exports.init = function (tracerConfig) {
-  if (tracerConfig && tracerConfig.dogstatsd) {
-    metrics = new DogStatsDClient({
+  metrics = tracerConfig && tracerConfig.dogstatsd
+    ? new DogStatsDClient({
       host: tracerConfig.dogstatsd.hostname,
       port: tracerConfig.dogstatsd.port,
       tags: [
@@ -21,21 +21,17 @@ module.exports.init = function (tracerConfig) {
         `version:${tracerConfig.tags.version}`
       ]
     })
-  } else {
-    metrics = new NoopDogStatsDClient()
-  }
+    : new NoopDogStatsDClient()
 
-  if (tracerConfig && tracerConfig.apiKey) {
-    logger = new ExternalLogger({
+  logger = tracerConfig && tracerConfig.apiKey
+    ? new ExternalLogger({
       ddsource: 'openai',
       hostname: tracerConfig.hostname,
       service: tracerConfig.service,
       apiKey: tracerConfig.apiKey,
       interval: FLUSH_INTERVAL
     })
-  } else {
-    logger = new NoopExternalLogger()
-  }
+    : new NoopExternalLogger()
 
   interval = setInterval(() => {
     metrics.flush()

package/packages/datadog-plugin-openai/src/tracing.js

@@ -261,9 +261,11 @@ class OpenAiTracingPlugin extends TracingPlugin {
     if (error) {
       this.metrics.increment('openai.request.error', 1, tags)
     } else {
-      tags.push(`org:${headers['openai-organization']}`)
-      tags.push(`endpoint:${endpoint}`) // just "/v1/models", no method
-      tags.push(`model:${headers['openai-model'] || body.model}`)
+      tags.push(
+        `org:${headers['openai-organization']}`,
+        `endpoint:${endpoint}`,
+        `model:${headers['openai-model'] || body.model}`
+      )
     }
 
     this.metrics.distribution('openai.request.duration', duration * 1000, tags)
@@ -329,7 +331,7 @@ class OpenAiTracingPlugin extends TracingPlugin {
   sendLog (methodName, span, tags, openaiStore, error) {
     if (!openaiStore) return
     if (!Object.keys(openaiStore).length) return
-    if (!this.sampler.isSampled()) return
+    if (!this.sampler.isSampled(span)) return
 
     const log = {
       status: error ? 'error' : 'info',
@@ -725,7 +727,7 @@ function commonCreateResponseExtraction (tags, body, openaiStore, methodName) {
     const choice = body.choices[choiceIdx]
 
     // logprobs can be null and we still want to tag it as 'returned' even when set to 'null'
-    const specifiesLogProb = Object.keys(choice).indexOf('logprobs') !== -1
+    const specifiesLogProb = Object.keys(choice).includes('logprobs')
 
     tags[`openai.response.choices.${choiceIdx}.finish_reason`] = choice.finish_reason
     tags[`openai.response.choices.${choiceIdx}.logprobs`] = specifiesLogProb ? 'returned' : undefined
@@ -790,7 +792,7 @@ function usageExtraction (tags, body, methodName, openaiStore) {
 }
 
 function truncateApiKey (apiKey) {
-  return apiKey && `sk-...${apiKey.substr(apiKey.length - 4)}`
+  return apiKey && `sk-...${apiKey.slice(-4)}`
 }
 
 function tagChatCompletionRequestContent (contents, messageIdx, tags) {
@@ -989,15 +991,9 @@ function normalizeStringOrTokenArray (input, truncate) {
 
 function defensiveArrayLength (maybeArray) {
   if (maybeArray) {
-    if (Array.isArray(maybeArray)) {
-      return maybeArray.length
-    } else {
-      // case of a singular item (ie body.training_file vs body.training_files)
-      return 1
-    }
+    // Detect singular item (ie body.training_file vs body.training_files)
+    return Array.isArray(maybeArray) ? maybeArray.length : 1
   }
-
-  return undefined
 }
 
 module.exports = OpenAiTracingPlugin