dd-trace 5.43.0 → 5.44.0

package/packages/datadog-plugin-google-cloud-vertexai/src/index.js

@@ -1,195 +1,17 @@
 'use strict'
 
-const { MEASURED } = require('../../../ext/tags')
-const { storage } = require('../../datadog-core')
-const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
-const makeUtilities = require('../../dd-trace/src/plugins/util/llm')
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+const GoogleVertexAITracingPlugin = require('./tracing')
+const VertexAILLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/vertexai')
 
-class GoogleCloudVertexAIPlugin extends TracingPlugin {
+class GoogleCloudVertexAIPlugin extends CompositePlugin {
   static get id () { return 'google-cloud-vertexai' }
-  static get prefix () {
-    return 'tracing:apm:vertexai:request'
-  }
-
-  constructor () {
-    super(...arguments)
-
-    Object.assign(this, makeUtilities('vertexai', this._tracerConfig))
-  }
-
-  bindStart (ctx) {
-    const { instance, request, resource, stream } = ctx
-
-    const tags = this.tagRequest(request, instance, stream)
-
-    const span = this.startSpan('vertexai.request', {
-      service: this.config.service,
-      resource,
-      kind: 'client',
-      meta: {
-        [MEASURED]: 1,
-        ...tags
-      }
-    }, false)
-
-    const store = storage('legacy').getStore() || {}
-    ctx.currentStore = { ...store, span }
-
-    return ctx.currentStore
-  }
-
-  asyncEnd (ctx) {
-    const span = ctx.currentStore?.span
-    if (!span) return
-
-    const { result } = ctx
-
-    const response = result?.response
-    if (response) {
-      const tags = this.tagResponse(response)
-      span.addTags(tags)
-    }
-
-    span.finish()
-  }
-
-  tagRequest (request, instance, stream) {
-    const model = extractModel(instance)
-    const tags = {
-      'vertexai.request.model': model
-    }
-
-    const history = instance.historyInternal
-    let contents = typeof request === 'string' || Array.isArray(request) ? request : request.contents
-    if (history) {
-      contents = [...history, ...(Array.isArray(contents) ? contents : [contents])]
-    }
-
-    const generationConfig = instance.generationConfig || {}
-    for (const key of Object.keys(generationConfig)) {
-      const transformedKey = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
-      tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
-    }
-
-    if (stream) {
-      tags['vertexai.request.stream'] = true
-    }
-
-    if (!this.isPromptCompletionSampled()) return tags
-
-    const systemInstructions = extractSystemInstructions(instance)
-
-    for (const [idx, systemInstruction] of systemInstructions.entries()) {
-      tags[`vertexai.request.system_instruction.${idx}.text`] = systemInstruction
-    }
-
-    if (typeof contents === 'string') {
-      tags['vertexai.request.contents.0.text'] = contents
-      return tags
-    }
-
-    for (const [contentIdx, content] of contents.entries()) {
-      this.tagRequestContent(tags, content, contentIdx)
+  static get plugins () {
+    return {
+      llmobs: VertexAILLMObsPlugin,
+      tracing: GoogleVertexAITracingPlugin
     }
-
-    return tags
   }
-
-  tagRequestPart (part, tags, partIdx, contentIdx) {
-    tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.text`] = this.normalize(part.text)
-
-    const functionCall = part.functionCall
-    const functionResponse = part.functionResponse
-
-    if (functionCall) {
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.name`] = functionCall.name
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.args`] =
-              this.normalize(JSON.stringify(functionCall.args))
-    }
-    if (functionResponse) {
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.name`] =
-              functionResponse.name
-      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.response`] =
-              this.normalize(JSON.stringify(functionResponse.response))
-    }
-  }
-
-  tagRequestContent (tags, content, contentIdx) {
-    if (typeof content === 'string') {
-      tags[`vertexai.request.contents.${contentIdx}.text`] = this.normalize(content)
-      return
-    }
-
-    if (content.text || content.functionCall || content.functionResponse) {
-      this.tagRequestPart(content, tags, 0, contentIdx)
-      return
-    }
-
-    const { role, parts } = content
-    if (role) {
-      tags[`vertexai.request.contents.${contentIdx}.role`] = role
-    }
-
-    for (const [partIdx, part] of parts.entries()) {
-      this.tagRequestPart(part, tags, partIdx, contentIdx)
-    }
-  }
-
-  tagResponse (response) {
-    const tags = {}
-
-    const candidates = response.candidates
-    for (const [candidateIdx, candidate] of candidates.entries()) {
-      const finishReason = candidate.finishReason
-      if (finishReason) {
-        tags[`vertexai.response.candidates.${candidateIdx}.finish_reason`] = finishReason
-      }
-      const candidateContent = candidate.content
-      const role = candidateContent.role
-      tags[`vertexai.response.candidates.${candidateIdx}.content.role`] = role
-
-      if (!this.isPromptCompletionSampled()) continue
-
-      const parts = candidateContent.parts
-      for (const [partIdx, part] of parts.entries()) {
-        const text = part.text
-        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.text`] =
-          this.normalize(String(text))
-
-        const functionCall = part.functionCall
-        if (!functionCall) continue
-
-        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.name`] =
-          functionCall.name
-        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.args`] =
-          this.normalize(JSON.stringify(functionCall.args))
-      }
-    }
-
-    const tokenCounts = response.usageMetadata
-    if (tokenCounts) {
-      tags['vertexai.response.usage.prompt_tokens'] = tokenCounts.promptTokenCount
-      tags['vertexai.response.usage.completion_tokens'] = tokenCounts.candidatesTokenCount
-      tags['vertexai.response.usage.total_tokens'] = tokenCounts.totalTokenCount
-    }
-
-    return tags
-  }
-}
-
-function extractModel (instance) {
-  const model = instance.model || instance.resourcePath || instance.publisherModelEndpoint
-  return model?.split('/').pop()
-}
-
-function extractSystemInstructions (instance) {
-  // systemInstruction is either a string or a Content object
-  // Content objects have parts (Part[]) and a role
-  const systemInstruction = instance.systemInstruction
-  if (!systemInstruction) return []
-  if (typeof systemInstruction === 'string') return [systemInstruction]
-
-  return systemInstruction.parts?.map(part => part.text)
 }
 
 module.exports = GoogleCloudVertexAIPlugin

package/packages/datadog-plugin-google-cloud-vertexai/src/tracing.js

@@ -0,0 +1,186 @@
+'use strict'
+
+const { MEASURED } = require('../../../ext/tags')
+const { storage } = require('../../datadog-core')
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
+const makeUtilities = require('../../dd-trace/src/plugins/util/llm')
+
+const {
+  extractModel,
+  extractSystemInstructions
+} = require('./utils')
+
+class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
+  static get id () { return 'google-cloud-vertexai' }
+  static get prefix () {
+    return 'tracing:apm:vertexai:request'
+  }
+
+  constructor () {
+    super(...arguments)
+
+    Object.assign(this, makeUtilities('vertexai', this._tracerConfig))
+  }
+
+  bindStart (ctx) {
+    const { instance, request, resource, stream } = ctx
+
+    const tags = this.tagRequest(request, instance, stream)
+
+    const span = this.startSpan('vertexai.request', {
+      service: this.config.service,
+      resource,
+      kind: 'client',
+      meta: {
+        [MEASURED]: 1,
+        ...tags
+      }
+    }, false)
+
+    const store = storage('legacy').getStore() || {}
+    ctx.currentStore = { ...store, span }
+
+    return ctx.currentStore
+  }
+
+  asyncEnd (ctx) {
+    const span = ctx.currentStore?.span
+    if (!span) return
+
+    const { result } = ctx
+
+    const response = result?.response
+    if (response) {
+      const tags = this.tagResponse(response)
+      span.addTags(tags)
+    }
+
+    span.finish()
+  }
+
+  tagRequest (request, instance, stream) {
+    const model = extractModel(instance)
+    const tags = {
+      'vertexai.request.model': model
+    }
+
+    const history = instance.historyInternal
+
+    let contents = typeof request === 'string' || Array.isArray(request) ? request : request.contents
+    if (history) {
+      contents = [...history, ...(Array.isArray(contents) ? contents : [contents])]
+    }
+
+    const generationConfig = instance.generationConfig || {}
+    for (const key of Object.keys(generationConfig)) {
+      const transformedKey = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
+      tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
+    }
+
+    if (stream) {
+      tags['vertexai.request.stream'] = true
+    }
+
+    if (!this.isPromptCompletionSampled()) return tags
+
+    const systemInstructions = extractSystemInstructions(instance)
+
+    for (const [idx, systemInstruction] of systemInstructions.entries()) {
+      tags[`vertexai.request.system_instruction.${idx}.text`] = systemInstruction
+    }
+
+    if (typeof contents === 'string') {
+      tags['vertexai.request.contents.0.text'] = contents
+      return tags
+    }
+
+    for (const [contentIdx, content] of contents.entries()) {
+      this.tagRequestContent(tags, content, contentIdx)
+    }
+
+    return tags
+  }
+
+  tagRequestPart (part, tags, partIdx, contentIdx) {
+    tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.text`] = this.normalize(part.text)
+
+    const functionCall = part.functionCall
+    const functionResponse = part.functionResponse
+
+    if (functionCall) {
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.name`] = functionCall.name
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_call.args`] =
+              this.normalize(JSON.stringify(functionCall.args))
+    }
+    if (functionResponse) {
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.name`] =
+              functionResponse.name
+      tags[`vertexai.request.contents.${contentIdx}.parts.${partIdx}.function_response.response`] =
+              this.normalize(JSON.stringify(functionResponse.response))
+    }
+  }
+
+  tagRequestContent (tags, content, contentIdx) {
+    if (typeof content === 'string') {
+      tags[`vertexai.request.contents.${contentIdx}.text`] = this.normalize(content)
+      return
+    }
+
+    if (content.text || content.functionCall || content.functionResponse) {
+      this.tagRequestPart(content, tags, 0, contentIdx)
+      return
+    }
+
+    const { role, parts } = content
+    if (role) {
+      tags[`vertexai.request.contents.${contentIdx}.role`] = role
+    }
+
+    for (const [partIdx, part] of parts.entries()) {
+      this.tagRequestPart(part, tags, partIdx, contentIdx)
+    }
+  }
+
+  tagResponse (response) {
+    const tags = {}
+
+    const candidates = response.candidates
+    for (const [candidateIdx, candidate] of candidates.entries()) {
+      const finishReason = candidate.finishReason
+      if (finishReason) {
+        tags[`vertexai.response.candidates.${candidateIdx}.finish_reason`] = finishReason
+      }
+      const candidateContent = candidate.content
+      const role = candidateContent.role
+      tags[`vertexai.response.candidates.${candidateIdx}.content.role`] = role
+
+      if (!this.isPromptCompletionSampled()) continue
+
+      const parts = candidateContent.parts
+      for (const [partIdx, part] of parts.entries()) {
+        const text = part.text
+        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.text`] =
+          this.normalize(String(text))
+
+        const functionCall = part.functionCall
+        if (!functionCall) continue
+
+        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.name`] =
+          functionCall.name
+        tags[`vertexai.response.candidates.${candidateIdx}.content.parts.${partIdx}.function_call.args`] =
+          this.normalize(JSON.stringify(functionCall.args))
+      }
+    }
+
+    const tokenCounts = response.usageMetadata
+    if (tokenCounts) {
+      tags['vertexai.response.usage.prompt_tokens'] = tokenCounts.promptTokenCount
+      tags['vertexai.response.usage.completion_tokens'] = tokenCounts.candidatesTokenCount
+      tags['vertexai.response.usage.total_tokens'] = tokenCounts.totalTokenCount
+    }
+
+    return tags
+  }
+}
+
+module.exports = GoogleCloudVertexAITracingPlugin

package/packages/datadog-plugin-google-cloud-vertexai/src/utils.js

@@ -0,0 +1,19 @@
+function extractModel (instance) {
+  const model = instance.model || instance.resourcePath || instance.publisherModelEndpoint
+  return model?.split('/').pop()
+}
+
+function extractSystemInstructions (instance) {
+  // systemInstruction is either a string or a Content object
+  // Content objects have parts (Part[]) and a role
+  const systemInstruction = instance.systemInstruction
+  if (!systemInstruction) return []
+  if (typeof systemInstruction === 'string') return [systemInstruction]
+
+  return systemInstruction.parts?.map(part => part.text)
+}
+
+module.exports = {
+  extractModel,
+  extractSystemInstructions
+}

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

@@ -27,7 +27,10 @@ const {
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
   TEST_MANAGEMENT_IS_QUARANTINED,
-  TEST_MANAGEMENT_IS_DISABLED
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_HAS_FAILED_ALL_RETRIES
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -177,6 +180,7 @@ class JestPlugin extends CiPlugin {
         config._ddRepositoryRoot = this.repositoryRoot
         config._ddIsFlakyTestRetriesEnabled = this.libraryConfig?.isFlakyTestRetriesEnabled ?? false
         config._ddIsTestManagementTestsEnabled = this.libraryConfig?.isTestManagementEnabled ?? false
+        config._ddTestManagementAttemptToFixRetries = this.libraryConfig?.testManagementAttemptToFixRetries ?? 0
         config._ddFlakyTestRetriesCount = this.libraryConfig?.flakyTestRetriesCount
         config._ddIsDiEnabled = this.libraryConfig?.isDiEnabled ?? false
         config._ddIsKnownTestsEnabled = this.libraryConfig?.isKnownTestsEnabled ?? false
@@ -336,14 +340,22 @@ class JestPlugin extends CiPlugin {
       this.activeTestSpan = span
     })
 
-    this.addSub('ci:jest:test:finish', ({ status, testStartLine, isQuarantined }) => {
+    this.addSub('ci:jest:test:finish', ({
+      status,
+      testStartLine,
+      attemptToFixPassed,
+      failedAllTests
+    }) => {
       const span = storage('legacy').getStore().span
       span.setTag(TEST_STATUS, status)
       if (testStartLine) {
         span.setTag(TEST_SOURCE_START, testStartLine)
       }
-      if (isQuarantined) {
-        span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
+      if (attemptToFixPassed) {
+        span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+      }
+      if (failedAllTests) {
+        span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
       }
 
       const spanTags = span.context()._tags
@@ -407,7 +419,11 @@ class JestPlugin extends CiPlugin {
       testSourceFile,
       isNew,
       isEfdRetry,
-      isJestRetry
+      isAttemptToFix,
+      isAttemptToFixRetry,
+      isJestRetry,
+      isDisabled,
+      isQuarantined
     } = test
 
     const extraTags = {
@@ -425,6 +441,23 @@ class JestPlugin extends CiPlugin {
       extraTags[JEST_DISPLAY_NAME] = displayName
     }
 
+    if (isAttemptToFix) {
+      extraTags[TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX] = 'true'
+    }
+
+    if (isAttemptToFixRetry) {
+      extraTags[TEST_IS_RETRY] = 'true'
+      extraTags[TEST_RETRY_REASON] = 'attempt_to_fix'
+    }
+
+    if (isDisabled) {
+      extraTags[TEST_MANAGEMENT_IS_DISABLED] = 'true'
+    }
+
+    if (isQuarantined) {
+      extraTags[TEST_MANAGEMENT_IS_QUARANTINED] = 'true'
+    }
+
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'
       if (isEfdRetry) {

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

@@ -17,7 +17,6 @@ const {
   TEST_CODE_OWNERS,
   ITR_CORRELATION_ID,
   TEST_SOURCE_FILE,
-  removeEfdStringFromTestName,
   TEST_IS_NEW,
   TEST_IS_RETRY,
   TEST_EARLY_FLAKE_ENABLED,
@@ -34,7 +33,10 @@ const {
   TEST_RETRY_REASON,
   TEST_MANAGEMENT_ENABLED,
   TEST_MANAGEMENT_IS_QUARANTINED,
-  TEST_MANAGEMENT_IS_DISABLED
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -199,7 +201,14 @@ class MochaPlugin extends CiPlugin {
       this.tracer._exporter.flush()
     })
 
-    this.addSub('ci:mocha:test:finish', ({ status, hasBeenRetried, isLastRetry }) => {
+    this.addSub('ci:mocha:test:finish', ({
+      status,
+      hasBeenRetried,
+      isLastRetry,
+      hasFailedAllRetries,
+      attemptToFixPassed,
+      isAttemptToFixRetry
+    }) => {
       const store = storage('legacy').getStore()
       const span = store?.span
 
@@ -208,6 +217,16 @@ class MochaPlugin extends CiPlugin {
         if (hasBeenRetried) {
           span.setTag(TEST_IS_RETRY, 'true')
         }
+        if (hasFailedAllRetries) {
+          span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+        }
+        if (attemptToFixPassed) {
+          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+        }
+        if (isAttemptToFixRetry) {
+          span.setTag(TEST_IS_RETRY, 'true')
+          span.setTag(TEST_RETRY_REASON, 'attempt_to_fix')
+        }
 
         const spanTags = span.context()._tags
         this.telemetry.ciVisEvent(
@@ -403,18 +422,18 @@ class MochaPlugin extends CiPlugin {
 
   startTestSpan (testInfo) {
     const {
+      testName,
       testSuiteAbsolutePath,
       title,
       isNew,
       isEfdRetry,
       testStartLine,
       isParallel,
+      isAttemptToFix,
       isDisabled,
       isQuarantined
     } = testInfo
 
-    const testName = removeEfdStringFromTestName(testInfo.testName)
-
     const extraTags = {}
     const testParametersString = getTestParametersString(this._testTitleToParams, title)
     if (testParametersString) {
@@ -429,6 +448,10 @@ class MochaPlugin extends CiPlugin {
       extraTags[MOCHA_IS_PARALLEL] = 'true'
     }
 
+    if (isAttemptToFix) {
+      extraTags[TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX] = 'true'
+    }
+
     if (isDisabled) {
       extraTags[TEST_MANAGEMENT_IS_DISABLED] = 'true'
     }

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

@@ -20,7 +20,10 @@ const {
   TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_MANAGEMENT_ENABLED,
   TEST_BROWSER_NAME,
-  TEST_MANAGEMENT_IS_DISABLED
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -162,7 +165,11 @@ class PlaywrightPlugin extends CiPlugin {
       isNew,
       isEfdRetry,
       isRetry,
-      isQuarantined
+      isAttemptToFix,
+      isQuarantined,
+      isAttemptToFixRetry,
+      hasFailedAllRetries,
+      hasPassedAttemptToFixRetries
     }) => {
       const store = storage('legacy').getStore()
       const span = store && store.span
@@ -186,6 +193,19 @@ class PlaywrightPlugin extends CiPlugin {
       if (isRetry) {
         span.setTag(TEST_IS_RETRY, 'true')
       }
+      if (hasFailedAllRetries) {
+        span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
+      }
+      if (isAttemptToFix) {
+        span.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
+      }
+      if (isAttemptToFixRetry) {
+        span.setTag(TEST_IS_RETRY, 'true')
+        span.setTag(TEST_RETRY_REASON, 'attempt_to_fix')
+      }
+      if (hasPassedAttemptToFixRetries) {
+        span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+      }
       if (isQuarantined) {
         span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }

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

@@ -8,22 +8,27 @@ class TediousPlugin extends DatabasePlugin {
   static get operation () { return 'request' } // TODO: change to match other database plugins
   static get system () { return 'mssql' }
 
-  start ({ queryOrProcedure, connectionConfig }) {
-    this.startSpan(this.operationName(), {
-      service: this.serviceName({ pluginConfig: this.config, system: this.system }),
-      resource: queryOrProcedure,
+  start (payload) {
+    const service = this.serviceName({ pluginConfig: this.config, system: this.system })
+    const span = this.startSpan(this.operationName(), {
+      service,
+      resource: payload.queryOrProcedure,
       type: 'sql',
       kind: 'client',
       meta: {
         'db.type': 'mssql',
         component: 'tedious',
-        'out.host': connectionConfig.server,
-        [CLIENT_PORT_KEY]: connectionConfig.options.port,
-        'db.user': connectionConfig.userName || connectionConfig.authentication.options.userName,
-        'db.name': connectionConfig.options.database,
-        'db.instance': connectionConfig.options.instanceName
+        'out.host': payload.connectionConfig.server,
+        [CLIENT_PORT_KEY]: payload.connectionConfig.options.port,
+        'db.user': payload.connectionConfig.userName || payload.connectionConfig.authentication.options.userName,
+        'db.name': payload.connectionConfig.options.database,
+        'db.instance': payload.connectionConfig.options.instanceName
       }
     })
+
+    // SQL Server includes comments when caching queries
+    // For that reason we allow service mode but not full mode
+    payload.sql = this.injectDbmQuery(span, payload.queryOrProcedure, service, true)
   }
 }