dd-trace - npm Package Compare versions

Comparing version 6.0.0-pre-c879030 to 6.0.0-pre-ce51217

package.json

 {
   "name": "dd-trace",
-  "version": "6.0.0-pre-c879030",
+  "version": "6.0.0-pre-ce51217",
   "description": "Datadog APM tracing client for JavaScript",
@@ -39,2 +39,3 @@ "main": "index.js",
     "test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
+    "test:integration:selenium": "mocha --colors --timeout 30000 \"integration-tests/selenium/*.spec.js\"",
     "test:integration:profiler": "mocha --colors --timeout 90000 \"integration-tests/profiler/*.spec.js\"",
@@ -41,0 +42,0 @@ "test:integration:serverless": "mocha --colors --timeout 30000 \"integration-tests/serverless/*.spec.js\"",

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

@@ -61,2 +61,3 @@ 'use strict'
   'jest-jasmine2': () => require('../jest'),
+  'jest-runtime': () => require('../jest'),
   'jest-worker': () => require('../jest'),
@@ -107,4 +108,5 @@ knex: () => require('../knex'),
   router: () => require('../router'),
+  'selenium-webdriver': () => require('../selenium'),
+  sequelize: () => require('../sequelize'),
   sharedb: () => require('../sharedb'),
-  sequelize: () => require('../sequelize'),
   tedious: () => require('../tedious'),
@@ -111,0 +113,0 @@ when: () => require('../when'),

packages/datadog-instrumentations/src/jest.js

@@ -879,3 +879,31 @@ 'use strict'
 
+const LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE = [
+  'selenium-webdriver'
+]
+
+function shouldBypassJestRequireEngine (moduleName) {
+  return (
+    LIBRARIES_BYPASSING_JEST_REQUIRE_ENGINE.some(library => moduleName.includes(library))
+  )
+}
+
 addHook({
+  name: 'jest-runtime',
+  versions: ['>=24.8.0']
+}, (runtimePackage) => {
+  const Runtime = runtimePackage.default ? runtimePackage.default : runtimePackage
+
+  shimmer.wrap(Runtime.prototype, 'requireModuleOrMock', requireModuleOrMock => function (from, moduleName) {
+    // TODO: do this for every library that we instrument
+    if (shouldBypassJestRequireEngine(moduleName)) {
+      // To bypass jest's own require engine
+      return this._requireCoreModule(moduleName)
+    }
+    return requireModuleOrMock.apply(this, arguments)
+  })
+
+  return runtimePackage
+})
+
+addHook({
   name: 'jest-worker',
@@ -882,0 +910,0 @@ versions: ['>=24.9.0'],

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

@@ -147,6 +147,5 @@ 'use strict'
       const store = storage.getStore()
+      const span = store?.span
 
-      if (store && store.span) {
-        const span = store.span
-
+      if (span) {
         span.setTag(TEST_STATUS, status)
@@ -153,0 +152,0 @@

packages/dd-trace/src/plugins/index.js

@@ -48,2 +48,3 @@ 'use strict'
   get 'jest-jasmine2' () { return require('../../../datadog-plugin-jest/src') },
+  get 'jest-runtime' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-worker' () { return require('../../../datadog-plugin-jest/src') },
@@ -81,2 +82,3 @@ get koa () { return require('../../../datadog-plugin-koa/src') },
   get router () { return require('../../../datadog-plugin-router/src') },
+  get 'selenium-webdriver' () { return require('../../../datadog-plugin-selenium/src') },
   get sharedb () { return require('../../../datadog-plugin-sharedb/src') },
@@ -83,0 +85,0 @@ get tedious () { return require('../../../datadog-plugin-tedious/src') },

packages/dd-trace/src/plugins/util/test.js

@@ -75,2 +75,8 @@ const path = require('path')
 
+// selenium tags
+const TEST_BROWSER_DRIVER = 'test.browser.driver'
+const TEST_BROWSER_DRIVER_VERSION = 'test.browser.driver_version'
+const TEST_BROWSER_NAME = 'test.browser.name'
+const TEST_BROWSER_VERSION = 'test.browser.version'
+
 // jest worker variables
@@ -148,3 +154,7 @@ const JEST_WORKER_TRACE_PAYLOAD_CODE = 60
   addEfdStringToTestName,
-  getIsFaultyEarlyFlakeDetection
+  getIsFaultyEarlyFlakeDetection,
+  TEST_BROWSER_DRIVER,
+  TEST_BROWSER_DRIVER_VERSION,
+  TEST_BROWSER_NAME,
+  TEST_BROWSER_VERSION
 }
@@ -151,0 +161,0 @@

No alert changes

Improved metrics

Total package byte prevSize

1749370

increased by0.32%

Number of package files

530

increased by0.38%

Lines of code

50664

increased by0.32%

No dependency changes