Merge branch 'master' into juan-fernandez/add-vitest-support

DataDog · Jun 24, 2024 · cb580df · cb580df
2 parents 482db61 + f29f416
commit cb580df
Show file tree

Hide file tree

Showing 13 changed files with 818 additions and 869 deletions.
diff --git a/.github/workflows/datadog-static-analysis.yml b/.github/workflows/datadog-static-analysis.yml
@@ -1,5 +1,10 @@
 name: Datadog Static Analysis
 
+on:
+  pull_request:
+  push:
+    branches: [master]
+
 jobs:
   static-analysis:
     runs-on: ubuntu-latest

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "test:integration:cypress": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/cypress/*.spec.js\"",
     "test:integration:playwright": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/playwright/*.spec.js\"",
     "test:integration:selenium": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/selenium/*.spec.js\"",
-    "test:integration:profiler": "mocha --colors --timeout 90000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/profiler/*.spec.js\"",
+    "test:integration:profiler": "mocha --colors --timeout 180000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/profiler/*.spec.js\"",
     "test:integration:serverless": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/serverless/*.spec.js\"",
     "test:integration:vitest": "mocha --colors --timeout 30000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/vitest/*.spec.js\"",
     "test:integration:plugins": "mocha --colors --exit -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/integration-test/**/*.spec.js\"",

diff --git a/packages/datadog-plugin-aws-sdk/test/integration-test/client.spec.js b/packages/datadog-plugin-aws-sdk/test/integration-test/client.spec.js
@@ -15,7 +15,7 @@ describe('esm', () => {
 
   withVersions('aws-sdk', ['aws-sdk'], version => {
     before(async function () {
-      this.timeout(20000)
+      this.timeout(60000)
       sandbox = await createSandbox([`'aws-sdk@${version}'`], false, [
         './packages/datadog-plugin-aws-sdk/test/integration-test/*'])
     })

diff --git a/packages/datadog-plugin-child_process/src/index.js b/packages/datadog-plugin-child_process/src/index.js
@@ -54,7 +54,7 @@ class ChildProcessPlugin extends TracingPlugin {
     }
 
     this.startSpan('command_execution', {
-      service: this.config.service,
+      service: this.config.service || this._tracerConfig.service,
       resource: (shell === true) ? 'sh' : cmdFields[0],
       type: 'system',
       meta

diff --git a/packages/datadog-plugin-child_process/test/index.spec.js b/packages/datadog-plugin-child_process/test/index.spec.js
@@ -34,6 +34,10 @@ describe('Child process plugin', () => {
       tracerStub = {
         startSpan: sinon.stub()
       }
+
+      configStub = {
+        service: 'test-service'
+      }
     })
 
     afterEach(() => {
@@ -52,7 +56,7 @@ describe('Child process plugin', () => {
             childOf: undefined,
             tags: {
               component: 'subprocess',
-              'service.name': undefined,
+              'service.name': 'test-service',
               'resource.name': 'ls',
               'span.kind': undefined,
               'span.type': 'system',
@@ -74,7 +78,7 @@ describe('Child process plugin', () => {
             childOf: undefined,
             tags: {
               component: 'subprocess',
-              'service.name': undefined,
+              'service.name': 'test-service',
               'resource.name': 'sh',
               'span.kind': undefined,
               'span.type': 'system',
@@ -98,7 +102,7 @@ describe('Child process plugin', () => {
             childOf: undefined,
             tags: {
               component: 'subprocess',
-              'service.name': undefined,
+              'service.name': 'test-service',
               'resource.name': 'echo',
               'span.kind': undefined,
               'span.type': 'system',
@@ -123,7 +127,7 @@ describe('Child process plugin', () => {
             childOf: undefined,
             tags: {
               component: 'subprocess',
-              'service.name': undefined,
+              'service.name': 'test-service',
               'resource.name': 'sh',
               'span.kind': undefined,
               'span.type': 'system',
@@ -149,7 +153,7 @@ describe('Child process plugin', () => {
             childOf: undefined,
             tags: {
               component: 'subprocess',
-              'service.name': undefined,
+              'service.name': 'test-service',
               'resource.name': 'ls',
               'span.kind': undefined,
               'span.type': 'system',
@@ -175,7 +179,7 @@ describe('Child process plugin', () => {
             childOf: undefined,
             tags: {
               component: 'subprocess',
-              'service.name': undefined,
+              'service.name': 'test-service',
               'resource.name': 'sh',
               'span.kind': undefined,
               'span.type': 'system',