dd-trace 5.84.0 → 5.86.0

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -47,7 +47,7 @@ const {
   getPullRequestDiff,
   getModifiedFilesFromDiff,
   TEST_IS_MODIFIED,
-  getPullRequestBaseBranch
+  getPullRequestBaseBranch,
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -65,7 +65,7 @@ const {
   incrementCountMetric,
   distributionMetric,
   TELEMETRY_ITR_SKIPPED,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
 const {
@@ -79,14 +79,14 @@ const {
   GIT_PULL_REQUEST_BASE_BRANCH_SHA,
   GIT_COMMIT_HEAD_SHA,
   GIT_PULL_REQUEST_BASE_BRANCH,
-  GIT_COMMIT_HEAD_MESSAGE
+  GIT_COMMIT_HEAD_MESSAGE,
 } = require('../../dd-trace/src/plugins/util/tags')
 const {
   OS_VERSION,
   OS_PLATFORM,
   OS_ARCHITECTURE,
   RUNTIME_NAME,
-  RUNTIME_VERSION
+  RUNTIME_VERSION,
 } = require('../../dd-trace/src/plugins/util/env')
 const { DD_MAJOR } = require('../../../version')
 
@@ -96,7 +96,7 @@ const CYPRESS_STATUS_TO_TEST_STATUS = {
   passed: 'pass',
   failed: 'fail',
   pending: 'skip',
-  skipped: 'skip'
+  skipped: 'skip',
 }
 
 function getSessionStatus (summary) {
@@ -162,7 +162,7 @@ function getSkippableTests (tracer, testConfiguration) {
       resolve({
         err,
         skippableTests,
-        correlationId
+        correlationId,
       })
     })
   })
@@ -176,7 +176,7 @@ function getKnownTests (tracer, testConfiguration) {
     tracer._tracer._exporter.getKnownTests(testConfiguration, (err, knownTests) => {
       resolve({
         err,
-        knownTests
+        knownTests,
       })
     })
   })
@@ -190,7 +190,7 @@ function getTestManagementTests (tracer, testConfiguration) {
     tracer._tracer._exporter.getTestManagementTests(testConfiguration, (err, testManagementTests) => {
       resolve({
         err,
-        testManagementTests
+        testManagementTests,
       })
     })
   })
@@ -200,7 +200,7 @@ function getModifiedFiles (testEnvironmentMetadata) {
   const {
     [GIT_PULL_REQUEST_BASE_BRANCH]: pullRequestBaseBranch,
     [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseBranchSha,
-    [GIT_COMMIT_HEAD_SHA]: commitHeadSha
+    [GIT_COMMIT_HEAD_SHA]: commitHeadSha,
   } = testEnvironmentMetadata
 
   const baseBranchSha = pullRequestBaseBranchSha || getPullRequestBaseBranch(pullRequestBaseBranch)
@@ -271,7 +271,7 @@ class CypressPlugin {
       [GIT_TAG]: tag,
       [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
       [GIT_COMMIT_HEAD_SHA]: commitHeadSha,
-      [GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage
+      [GIT_COMMIT_HEAD_MESSAGE]: commitHeadMessage,
     } = this.testEnvironmentMetadata
 
     this.repositoryRoot = repositoryRoot || process.cwd()
@@ -292,7 +292,7 @@ class CypressPlugin {
       tag,
       pullRequestBaseSha,
       commitHeadSha,
-      commitHeadMessage
+      commitHeadMessage,
     }
   }
 
@@ -330,8 +330,8 @@ class CypressPlugin {
               isKnownTestsEnabled,
               isTestManagementEnabled,
               testManagementAttemptToFixRetries,
-              isImpactedTestsEnabled
-            }
+              isImpactedTestsEnabled,
+            },
           } = libraryConfigurationResponse
           this.isSuitesSkippingEnabled = isSuitesSkippingEnabled
           this.isCodeCoverageEnabled = isCodeCoverageEnabled
@@ -395,16 +395,16 @@ class CypressPlugin {
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
-        ...testSuiteSpanMetadata
+        ...testSuiteSpanMetadata,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
   }
 
   getTestSpan ({ testName, testSuite, isUnskippable, isForcedToRun, testSourceFile, isDisabled, isQuarantined }) {
     const testSuiteTags = {
       [TEST_COMMAND]: this.command,
-      [TEST_MODULE]: TEST_FRAMEWORK_NAME
+      [TEST_MODULE]: TEST_FRAMEWORK_NAME,
     }
     if (this.testSuiteSpan) {
       testSuiteTags[TEST_SUITE_ID] = this.testSuiteSpan.context().toSpanId()
@@ -462,9 +462,9 @@ class CypressPlugin {
         [ORIGIN_KEY]: CI_APP_ORIGIN,
         ...testSpanMetadata,
         ...this.testEnvironmentMetadata,
-        ...testSuiteTags
+        ...testSuiteTags,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
   }
 
@@ -473,7 +473,7 @@ class CypressPlugin {
       testLevel,
       testFramework: 'cypress',
       isUnsupportedCIProvider: !this.ciProviderName,
-      ...tags
+      ...tags,
     })
   }
 
@@ -543,12 +543,14 @@ class CypressPlugin {
     }
 
     // `details.specs` are test files
-    details.specs?.forEach(({ absolute, relative }) => {
-      const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
-      if (isUnskippableSuite) {
-        this.unskippableSuites.push(relative)
+    if (details.specs) {
+      for (const { absolute, relative } of details.specs) {
+        const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
+        if (isUnskippableSuite) {
+          this.unskippableSuites.push(relative)
+        }
       }
-    })
+    }
 
     const childOf = getTestParentSpan(this.tracer)
 
@@ -573,13 +575,13 @@ class CypressPlugin {
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
         metadataTags[testLevel] = {
-          [TEST_SESSION_NAME]: testSessionName
+          [TEST_SESSION_NAME]: testSessionName,
         }
       }
       const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, false, this.frameworkVersion)
       metadataTags.test = {
         ...metadataTags.test,
-        ...libraryCapabilitiesTags
+        ...libraryCapabilitiesTags,
       }
 
       this.tracer._tracer._exporter.addMetadataTags(metadataTags)
@@ -590,9 +592,9 @@ class CypressPlugin {
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
-        ...testSessionSpanMetadata
+        ...testSessionSpanMetadata,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
 
@@ -601,9 +603,9 @@ class CypressPlugin {
       tags: {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
-        ...testModuleSpanMetadata
+        ...testModuleSpanMetadata,
       },
-      integrationName: TEST_FRAMEWORK_NAME
+      integrationName: TEST_FRAMEWORK_NAME,
     })
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'module')
 
@@ -630,7 +632,7 @@ class CypressPlugin {
           skippingType: 'test',
           skippingCount: this.skippedTests.length,
           hasForcedToRunSuites: this.hasForcedToRunSuites,
-          hasUnskippableSuites: this.hasUnskippableSuites
+          hasUnskippableSuites: this.hasUnskippableSuites,
         }
       )
 
@@ -644,7 +646,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
 
       finishAllTraceSpans(this.testSessionSpan)
@@ -680,19 +682,20 @@ class CypressPlugin {
       log.warn('There was an error creating the test suite event.')
       this.testSuiteSpan = this.getTestSuiteSpan({
         testSuite: spec.relative,
-        testSuiteAbsolutePath: spec.absolute
+        testSuiteAbsolutePath: spec.absolute,
       })
     }
 
     // Get tests that didn't go through `dd:afterEach`
     // and create a skipped test span for each of them
-    cypressTests.filter(({ title }) => {
+    for (const { title } of cypressTests) {
       const cypressTestName = title.join(' ')
       const isTestFinished = finishedTests.find(({ testName }) => cypressTestName === testName)
 
-      return !isTestFinished
-    }).forEach(({ title }) => {
-      const cypressTestName = title.join(' ')
+      if (isTestFinished) {
+        continue
+      }
+
       const isSkippedByItr = this.testsToSkip.find(test =>
         cypressTestName === test.name && spec.relative === test.suite
       )
@@ -719,7 +722,7 @@ class CypressPlugin {
       }
 
       skippedTestSpan.finish()
-    })
+    }
 
     // Make sure that reported test statuses are the same as Cypress reports.
     // This is not always the case, such as when an `after` hook fails:
@@ -734,13 +737,13 @@ class CypressPlugin {
       return acc
     }, {})
 
-    Object.entries(finishedTestsByTestName).forEach(([testName, finishedTestAttempts]) => {
-      finishedTestAttempts.forEach((finishedTest, attemptIndex) => {
+    for (const [testName, finishedTestAttempts] of Object.entries(finishedTestsByTestName)) {
+      for (const [attemptIndex, finishedTest] of finishedTestAttempts.entries()) {
         // TODO: there could be multiple if there have been retries!
         // potentially we need to match the test status!
         const cypressTest = cypressTests.find(test => test.title.join(' ') === testName)
         if (!cypressTest) {
-          return
+          continue
         }
         // finishedTests can include multiple tests with the same name if they have been retried
         // by early flake detection. Cypress is unaware of this so .attempts does not necessarily have
@@ -766,8 +769,10 @@ class CypressPlugin {
         if (cypressTest.displayError) {
           latestError = new Error(cypressTest.displayError)
         }
-        // Update test status
-        if (cypressTestStatus !== finishedTest.testStatus) {
+        // Update test status - but NOT for quarantined tests where we intentionally
+        // report 'fail' to Datadog even though Cypress sees it as 'pass'
+        const isQuarantinedTest = finishedTest.testSpan?.context()?._tags?.[TEST_MANAGEMENT_IS_QUARANTINED] === 'true'
+        if (cypressTestStatus !== finishedTest.testStatus && !isQuarantinedTest) {
           finishedTest.testSpan.setTag(TEST_STATUS, cypressTestStatus)
           finishedTest.testSpan.setTag('error', latestError)
         }
@@ -787,8 +792,8 @@ class CypressPlugin {
         }
 
         finishedTest.testSpan.finish(finishedTest.finishTime)
-      })
-    })
+      }
+    }
 
     if (this.testSuiteSpan) {
       const status = getSuiteStatus(stats)
@@ -817,7 +822,7 @@ class CypressPlugin {
           isImpactedTestsEnabled: this.isImpactedTestsEnabled,
           isModifiedTest: this.getIsTestModified(testSuiteAbsolutePath),
           repositoryRoot: this.repositoryRoot,
-          isTestIsolationEnabled: this.isTestIsolationEnabled
+          isTestIsolationEnabled: this.isTestIsolationEnabled,
         }
 
         if (this.testSuiteSpan) {
@@ -841,11 +846,12 @@ class CypressPlugin {
           return { shouldSkip: true }
         }
 
-        // TODO: I haven't found a way to trick cypress into ignoring a test
-        // The way we'll implement quarantine in cypress is by skipping the test altogether
-        if (!isAttemptToFix && (isDisabled || isQuarantined)) {
+        // For disabled tests (not attemptToFix), skip them
+        if (!isAttemptToFix && isDisabled) {
           return { shouldSkip: true }
         }
+        // Quarantined tests (not attemptToFix) run normally but their failures are caught
+        // by Cypress.on('fail') in support.js and suppressed, so Cypress sees them as passed
 
         if (!this.activeTestSpan) {
           this.activeTestSpan = this.getTestSpan({
@@ -854,7 +860,7 @@ class CypressPlugin {
             isUnskippable,
             isForcedToRun,
             isDisabled,
-            isQuarantined
+            isQuarantined,
           })
         }
 
@@ -876,7 +882,8 @@ class CypressPlugin {
           isNew,
           isEfdRetry,
           isAttemptToFix,
-          isModified
+          isModified,
+          isQuarantined: isQuarantinedFromSupport,
         } = test
         if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
           const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -892,7 +899,7 @@ class CypressPlugin {
             sessionId: _traceId,
             suiteId: _spanId,
             testId: this.activeTestSpan.context()._spanId,
-            files: relativeCoverageFiles
+            files: relativeCoverageFiles,
           }
           this.tracer._tracer._exporter.exportCoverage(formattedCoverage)
         }
@@ -949,13 +956,19 @@ class CypressPlugin {
           }
         }
 
+        // Ensure quarantined tests reported from support.js are tagged
+        // (This catches cases where the test ran but failed, but Cypress saw it as passed)
+        if (isQuarantinedFromSupport) {
+          this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
+        }
+
         const finishedTest = {
           testName,
           testStatus,
           finishTime: this.activeTestSpan._getTime(), // we store the finish time here
           testSpan: this.activeTestSpan,
           isEfdRetry,
-          isAttemptToFix
+          isAttemptToFix,
         }
         if (this.finishedTestsByFile[testSuite]) {
           this.finishedTestsByFile[testSuite].push(finishedTest)
@@ -963,11 +976,15 @@ class CypressPlugin {
           this.finishedTestsByFile[testSuite] = [finishedTest]
         }
         // test spans are finished at after:spec
+        const activeSpanTags = this.activeTestSpan.context()._tags
         this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-          hasCodeOwners: !!this.activeTestSpan.context()._tags[TEST_CODE_OWNERS],
+          hasCodeOwners: !!activeSpanTags[TEST_CODE_OWNERS],
           isNew,
           isRum: isRUMActive,
-          browserDriver: 'cypress'
+          browserDriver: 'cypress',
+          isQuarantined: isQuarantinedFromSupport,
+          isModified,
+          isDisabled: activeSpanTags[TEST_MANAGEMENT_IS_DISABLED] === 'true',
         })
         this.activeTestSpan = null
 
@@ -983,7 +1000,7 @@ class CypressPlugin {
         // eslint-disable-next-line no-console
         console.log(`[datadog] ${message}`)
         return null
-      }
+      },
     }
   }
 

package/packages/datadog-plugin-cypress/src/plugin.js

@@ -17,7 +17,7 @@ const noopTask = {
   },
   'dd:addTags': () => {
     return null
-  }
+  },
 }
 
 module.exports = function CypressPlugin (on, config) {

package/packages/datadog-plugin-cypress/src/support.js

@@ -12,6 +12,8 @@ let isModifiedTest = false
 let isTestIsolationEnabled = false
 // Array of test names that have been retried and the reason
 const retryReasonsByTestName = new Map()
+// Track quarantined test errors - we catch them in Cypress.on('fail') but need to report to Datadog
+const quarantinedTestErrors = new Map()
 
 // We need to grab the original window as soon as possible,
 // in case the test changes the origin. If the test does change the origin,
@@ -46,17 +48,41 @@ function getTestProperties (testName) {
   return { isAttemptToFix, isDisabled, isQuarantined }
 }
 
+// Catch test failures for quarantined tests and suppress them
+// By not re-throwing the error, Cypress marks the test as passed
+// This allows quarantined tests to run but not affect the exit code
+Cypress.on('fail', (err, runnable) => {
+  if (!isTestManagementEnabled) {
+    throw err
+  }
+
+  const testName = runnable.fullTitle()
+  const { isQuarantined, isAttemptToFix } = getTestProperties(testName)
+
+  // For pure quarantined tests (not attemptToFix), suppress the failure
+  // This makes the test "pass" from Cypress's perspective while we still track the error
+  if (isQuarantined && !isAttemptToFix) {
+    // Store the error so we can report it to Datadog in afterEach
+    quarantinedTestErrors.set(testName, err)
+    // Don't re-throw - this prevents Cypress from marking the test as failed
+    return
+  }
+
+  // For all other tests (including attemptToFix), let the error propagate normally
+  throw err
+})
+
 function getRetriedTests (test, numRetries, tags) {
   const retriedTests = []
   for (let retryIndex = 0; retryIndex < numRetries; retryIndex++) {
     // TODO: signal in framework logs that this is a retry.
     // TODO: Change it so these tests are allowed to fail.
     const clonedTest = test.clone()
-    tags.forEach(tag => {
+    for (const tag of tags) {
       if (tag) {
         clonedTest[tag] = true
       }
-    })
+    }
     retriedTests.push(clonedTest)
   }
   return retriedTests
@@ -108,7 +134,7 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
       retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, [
         '_ddIsModified',
         '_ddIsEfdRetry',
-        isKnownTestsEnabled && isNewTest(test) && '_ddIsNew'
+        isKnownTestsEnabled && isNewTest(test) && '_ddIsNew',
       ])
     } else if (isNew && isEarlyFlakeDetectionEnabled) {
       retryMessage = 'to detect flakes because it is new'
@@ -141,7 +167,7 @@ beforeEach(function () {
 
   cy.task('dd:beforeEach', {
     testName,
-    testSuite: Cypress.mocha.getRootSuite().file
+    testSuite: Cypress.mocha.getRootSuite().file,
   }).then(({ traceId, shouldSkip }) => {
     Cypress.env('traceId', traceId)
     if (shouldSkip) {
@@ -156,7 +182,7 @@ beforeEach(function () {
 before(function () {
   cy.task('dd:testSuiteStart', {
     testSuite: Cypress.mocha.getRootSuite().file,
-    testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute
+    testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute,
   }).then((suiteConfig) => {
     if (suiteConfig) {
       isEarlyFlakeDetectionEnabled = suiteConfig.isEarlyFlakeDetectionEnabled
@@ -185,16 +211,31 @@ after(() => {
 
 afterEach(function () {
   const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
+  const testName = currentTest.fullTitle()
+
+  // Check if this was a quarantined test that we suppressed the failure for
+  const quarantinedError = quarantinedTestErrors.get(testName)
+  const isQuarantinedTestThatFailed = !!quarantinedError
+
+  // For quarantined tests, convert Error to a serializable format for cy.task
+  const errorToReport = isQuarantinedTestThatFailed
+    ? { message: quarantinedError.message, stack: quarantinedError.stack }
+    : currentTest.err
+
   const testInfo = {
-    testName: currentTest.fullTitle(),
+    testName,
     testSuite: Cypress.mocha.getRootSuite().file,
     testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute,
-    state: currentTest.state,
-    error: currentTest.err,
+    // For quarantined tests, report the actual state (failed) to Datadog, not what Cypress thinks (passed)
+    state: isQuarantinedTestThatFailed ? 'failed' : currentTest.state,
+    // For quarantined tests, include the actual error that was suppressed
+    error: errorToReport,
     isNew: currentTest._ddIsNew,
     isEfdRetry: currentTest._ddIsEfdRetry,
     isAttemptToFix: currentTest._ddIsAttemptToFix,
-    isModified: currentTest._ddIsModified
+    isModified: currentTest._ddIsModified,
+    // Mark quarantined tests that failed so the plugin knows to tag them appropriately
+    isQuarantined: isQuarantinedTestThatFailed,
   }
   try {
     testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
@@ -209,5 +250,11 @@ afterEach(function () {
   } catch {
     // ignore error and continue
   }
+
+  // Clean up the quarantined error tracking
+  if (isQuarantinedTestThatFailed) {
+    quarantinedTestErrors.delete(testName)
+  }
+
   cy.task('dd:afterEach', { test: testInfo, coverage })
 })

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -30,7 +30,7 @@ module.exports = class DdTraceApiPlugin extends Plugin {
       const counter = apiMetrics.count('public_api.called', [
         `name:${name.replaceAll(':', '.')}`,
         'api_version:v1',
-        injectionEnabledTag
+        injectionEnabledTag,
       ])
 
       // For v1, APIs are 1:1 with their internal equivalents, so we can just

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

@@ -15,7 +15,7 @@ class DNSPlugin extends CompositePlugin {
       lookup: DNSLookupPlugin,
       lookup_service: DNSLookupServicePlugin,
       resolve: DNSResolvePlugin,
-      reverse: DNSReversePlugin
+      reverse: DNSReversePlugin,
     }
   }
 }

package/packages/datadog-plugin-dns/src/lookup.js

@@ -16,8 +16,8 @@ class DNSLookupPlugin extends ClientPlugin {
       meta: {
         'dns.hostname': hostname,
         'dns.address': '',
-        'dns.addresses': ''
-      }
+        'dns.addresses': '',
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-dns/src/lookup_service.js

@@ -14,11 +14,11 @@ class DNSLookupServicePlugin extends ClientPlugin {
       resource: `${address}:${port}`,
       kind: 'client',
       meta: {
-        'dns.address': address
+        'dns.address': address,
       },
       metrics: {
-        'dns.port': port
-      }
+        'dns.port': port,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-dns/src/resolve.js

@@ -16,8 +16,8 @@ class DNSResolvePlugin extends ClientPlugin {
       kind: 'client',
       meta: {
         'dns.hostname': hostname,
-        'dns.rrtype': rrtype
-      }
+        'dns.rrtype': rrtype,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-dns/src/reverse.js

@@ -14,8 +14,8 @@ class DNSReversePlugin extends ClientPlugin {
       resource: ip,
       kind: 'client',
       meta: {
-        'dns.ip': ip
-      }
+        'dns.ip': ip,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -20,8 +20,8 @@ class ElasticsearchPlugin extends DatabasePlugin {
         [`${this.system}.url`]: params.path,
         [`${this.system}.method`]: params.method,
         [`${this.system}.body`]: body,
-        [`${this.system}.params`]: JSON.stringify(params.querystring || params.query)
-      }
+        [`${this.system}.params`]: JSON.stringify(params.querystring || params.query),
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -9,7 +9,7 @@ class ExpressPlugin extends CompositePlugin {
   static get plugins () {
     return {
       tracing: ExpressTracingPlugin,
-      codeOriginForSpans: ExpressCodeOriginForSpansPlugin
+      codeOriginForSpans: ExpressCodeOriginForSpansPlugin,
     }
   }
 }

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

@@ -9,7 +9,7 @@ class FastifyPlugin extends CompositePlugin {
   static get plugins () {
     return {
       tracing: FastifyTracingPlugin,
-      codeOriginForSpans: FastifyCodeOriginForSpansPlugin
+      codeOriginForSpans: FastifyCodeOriginForSpansPlugin,
     }
   }
 }

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

@@ -37,8 +37,8 @@ class FsPlugin extends TracingPlugin {
         'file.mode': mode,
         'file.path': path || '',
         'file.src': params.src || params.oldPath || params.existingPath || params.target,
-        'file.uid': uid || ''
-      }
+        'file.uid': uid || '',
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-google-cloud-pubsub/src/client.js

@@ -18,8 +18,8 @@ class GoogleCloudPubsubClientPlugin extends ClientPlugin {
       kind: this.constructor.kind,
       meta: {
         'pubsub.method': api,
-        'gcloud.project_id': projectId
-      }
+        'gcloud.project_id': projectId,
+      },
     }
 
     /**