Merge branch 'master' into conti/support-protobuf-schemas

.github/workflows/appsec.yml

@@ -209,6 +209,7 @@ jobs:
         version:
           - 18
           - latest
+        range: ['9.5.0', '11.1.4', '13.2.0', '14.2.6']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next

.github/workflows/plugins.yml

@@ -656,6 +656,7 @@ jobs:
         version:
           - 18
           - latest
+        range: ['9.5.0', '11.1.4', '13.2.0', '14.2.6']
     runs-on: ubuntu-latest
     env:
       PLUGINS: next
@@ -868,7 +869,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mssql:
-        image: mcr.microsoft.com/mssql/server:2017-latest-ubuntu
+        image: mcr.microsoft.com/mssql/server:2019-latest
         env:
           ACCEPT_EULA: 'Y'
           SA_PASSWORD: DD_HUNTER2

integration-tests/ci-visibility/test-api-manual/test.fake.js

@@ -31,7 +31,7 @@ describe('can run tests', () => {
   })
   test('integration test', () => {
     // Just for testing purposes, so we don't create a custom span
-    if (!process.env.DD_CIVISIBILITY_MANUAL_API_ENABLED) {
+    if (process.env.DD_CIVISIBILITY_MANUAL_API_ENABLED === 'false') {
       return Promise.resolve()
     }
     const testSpan = tracer.scope().active()

integration-tests/cucumber/cucumber.spec.js

@@ -38,6 +38,7 @@ const {
   TEST_SESSION_NAME,
   TEST_LEVEL_EVENT_TYPES
 } = require('../../packages/dd-trace/src/plugins/util/test')
+const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
 
 const isOldNode = semver.satisfies(process.version, '<=16')
 const versions = ['7.0.0', isOldNode ? '9' : 'latest']
@@ -181,6 +182,7 @@ versions.forEach(version => {
                     assert.equal(testSessionId.toString(10), testSessionEventContent.test_session_id.toString(10))
                     assert.isTrue(meta[TEST_SOURCE_FILE].startsWith(featuresPath))
                     assert.equal(metrics[TEST_SOURCE_START], 1)
+                    assert.exists(metrics[DD_HOST_CPU_COUNT])
                   })
 
                   assert.includeMembers(testEvents.map(test => test.content.resource), [
@@ -201,6 +203,7 @@ versions.forEach(version => {
                   testEvents.forEach(({
                     content: {
                       meta,
+                      metrics,
                       test_suite_id: testSuiteId,
                       test_module_id: testModuleId,
                       test_session_id: testSessionId
@@ -218,6 +221,7 @@ versions.forEach(version => {
                     if (runMode === 'parallel') {
                       assert.propertyVal(meta, CUCUMBER_IS_PARALLEL, 'true')
                     }
+                    assert.exists(metrics[DD_HOST_CPU_COUNT])
                   })
 
                   stepEvents.forEach(stepEvent => {
@@ -233,7 +237,7 @@ versions.forEach(version => {
                   env: {
                     ...envVars,
                     DD_TAGS: 'test.customtag:customvalue,test.customtag2:customvalue2',
-                    DD_SESSION_NAME: 'my-test-session'
+                    DD_TEST_SESSION_NAME: 'my-test-session'
                   },
                   stdio: 'pipe'
                 }

integration-tests/cypress/cypress.spec.js

@@ -37,6 +37,7 @@ const {
   TEST_SESSION_NAME,
   TEST_LEVEL_EVENT_TYPES
 } = require('../../packages/dd-trace/src/plugins/util/test')
+const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
 const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 const { NODE_MAJOR } = require('../../version')
 
@@ -289,6 +290,7 @@ moduleTypes.forEach(({
             assert.equal(testSessionId.toString(10), testSessionEventContent.test_session_id.toString(10))
             assert.isTrue(meta[TEST_SOURCE_FILE].startsWith('cypress/e2e/'))
             assert.equal(metrics[TEST_SOURCE_START], 1)
+            assert.exists(metrics[DD_HOST_CPU_COUNT])
           })
 
           assert.includeMembers(testEvents.map(test => test.content.resource), [
@@ -306,6 +308,7 @@ moduleTypes.forEach(({
           testEvents.forEach(({
             content: {
               meta,
+              metrics,
               test_suite_id: testSuiteId,
               test_module_id: testModuleId,
               test_session_id: testSessionId
@@ -320,6 +323,7 @@ moduleTypes.forEach(({
             // Can read DD_TAGS
             assert.propertyVal(meta, 'test.customtag', 'customvalue')
             assert.propertyVal(meta, 'test.customtag2', 'customvalue2')
+            assert.exists(metrics[DD_HOST_CPU_COUNT])
           })
         }, 25000)
 
@@ -336,7 +340,7 @@ moduleTypes.forEach(({
             ...restEnvVars,
             CYPRESS_BASE_URL: `http://localhost:${webAppPort}`,
             DD_TAGS: 'test.customtag:customvalue,test.customtag2:customvalue2',
-            DD_SESSION_NAME: 'my-test-session'
+            DD_TEST_SESSION_NAME: 'my-test-session'
           },
           stdio: 'pipe'
         }

integration-tests/jest/jest.spec.js

@@ -35,6 +35,7 @@ const {
   TEST_SESSION_NAME,
   TEST_LEVEL_EVENT_TYPES
 } = require('../../packages/dd-trace/src/plugins/util/test')
+const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
 const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 
 const testFile = 'ci-visibility/run-jest.js'
@@ -169,11 +170,13 @@ describe('jest CommonJS', () => {
           // Can read DD_TAGS
           assert.propertyVal(testEvent.meta, 'test.customtag', 'customvalue')
           assert.propertyVal(testEvent.meta, 'test.customtag2', 'customvalue2')
+          assert.exists(testEvent.metrics[DD_HOST_CPU_COUNT])
         })
 
         suites.forEach(testSuite => {
           assert.isTrue(testSuite.meta[TEST_SOURCE_FILE].startsWith('ci-visibility/test/ci-visibility-test'))
           assert.equal(testSuite.metrics[TEST_SOURCE_START], 1)
+          assert.exists(testSuite.metrics[DD_HOST_CPU_COUNT])
         })
 
         done()
@@ -184,7 +187,7 @@ describe('jest CommonJS', () => {
         env: {
           ...envVars,
           DD_TAGS: 'test.customtag:customvalue,test.customtag2:customvalue2',
-          DD_SESSION_NAME: 'my-test-session'
+          DD_TEST_SESSION_NAME: 'my-test-session'
         },
         stdio: 'pipe'
       })
@@ -444,7 +447,7 @@ describe('jest CommonJS', () => {
         env: {
           ...getCiVisAgentlessConfig(receiver.port),
           RUN_IN_PARALLEL: true,
-          DD_SESSION_NAME: 'my-test-session'
+          DD_TEST_SESSION_NAME: 'my-test-session'
         },
         stdio: 'pipe'
       })

integration-tests/mocha/mocha.spec.js

@@ -36,6 +36,7 @@ const {
   TEST_SESSION_NAME,
   TEST_LEVEL_EVENT_TYPES
 } = require('../../packages/dd-trace/src/plugins/util/test')
+const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
 const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 
 const runTestsWithCoverageCommand = './node_modules/nyc/bin/nyc.js -r=text-summary node ./ci-visibility/run-mocha.js'
@@ -169,11 +170,13 @@ describe('mocha CommonJS', function () {
           // Can read DD_TAGS
           assert.propertyVal(testEvent.meta, 'test.customtag', 'customvalue')
           assert.propertyVal(testEvent.meta, 'test.customtag2', 'customvalue2')
+          assert.exists(testEvent.metrics[DD_HOST_CPU_COUNT])
         })
 
         suites.forEach(testSuite => {
           assert.isTrue(testSuite.meta[TEST_SOURCE_FILE].startsWith('ci-visibility/test/ci-visibility-test'))
           assert.equal(testSuite.metrics[TEST_SOURCE_START], 1)
+          assert.exists(testSuite.metrics[DD_HOST_CPU_COUNT])
         })
 
         done()
@@ -184,7 +187,7 @@ describe('mocha CommonJS', function () {
         env: {
           ...envVars,
           DD_TAGS: 'test.customtag:customvalue,test.customtag2:customvalue2',
-          DD_SESSION_NAME: 'my-test-session'
+          DD_TEST_SESSION_NAME: 'my-test-session'
         },
         stdio: 'pipe'
       })
@@ -378,7 +381,7 @@ describe('mocha CommonJS', function () {
         RUN_IN_PARALLEL: true,
         DD_TRACE_DEBUG: 1,
         DD_TRACE_LOG_LEVEL: 'warn',
-        DD_SESSION_NAME: 'my-test-session'
+        DD_TEST_SESSION_NAME: 'my-test-session'
       },
       stdio: 'pipe'
     })

integration-tests/playwright/playwright.spec.js

@@ -26,6 +26,7 @@ const {
   TEST_SESSION_NAME,
   TEST_LEVEL_EVENT_TYPES
 } = require('../../packages/dd-trace/src/plugins/util/test')
+const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
 const { ERROR_MESSAGE } = require('../../packages/dd-trace/src/constants')
 
 const NUM_RETRIES_EFD = 3
@@ -118,6 +119,7 @@ versions.forEach((version) => {
               }
               assert.isTrue(testSuiteEvent.content.meta[TEST_SOURCE_FILE].endsWith('-test.js'))
               assert.equal(testSuiteEvent.content.metrics[TEST_SOURCE_START], 1)
+              assert.exists(testSuiteEvent.content.metrics[DD_HOST_CPU_COUNT])
             })
 
             assert.includeMembers(testEvents.map(test => test.content.resource), [
@@ -145,6 +147,7 @@ versions.forEach((version) => {
               assert.propertyVal(testEvent.content.meta, 'test.customtag2', 'customvalue2')
               // Adds the browser used
               assert.propertyVal(testEvent.content.meta, TEST_CONFIGURATION_BROWSER_NAME, 'chromium')
+              assert.exists(testEvent.content.metrics[DD_HOST_CPU_COUNT])
             })
 
             stepEvents.forEach(stepEvent => {
@@ -168,7 +171,7 @@ versions.forEach((version) => {
                 ...envVars,
                 PW_BASE_URL: `http://localhost:${webAppPort}`,
                 DD_TAGS: 'test.customtag:customvalue,test.customtag2:customvalue2',
-                DD_SESSION_NAME: 'my-test-session'
+                DD_TEST_SESSION_NAME: 'my-test-session'
               },
               stdio: 'pipe'
             }

integration-tests/test-api-manual.spec.js

@@ -73,7 +73,7 @@ describe('test-api-manual', () => {
       '--require ./ci-visibility/test-api-manual/test.fake.js ./ci-visibility/test-api-manual/run-fake-test-framework',
       {
         cwd,
-        env: { ...getCiVisAgentlessConfig(receiver.port), DD_CIVISIBILITY_MANUAL_API_ENABLED: '1' },
+        env: getCiVisAgentlessConfig(receiver.port),
         stdio: 'pipe'
       }
     )
@@ -82,7 +82,7 @@ describe('test-api-manual', () => {
     })
   })
 
-  it('does not report test spans if DD_CIVISIBILITY_MANUAL_API_ENABLED is not set', (done) => {
+  it('does not report test spans if DD_CIVISIBILITY_MANUAL_API_ENABLED is set to false', (done) => {
     receiver.assertPayloadReceived(() => {
       const error = new Error('should not report spans')
       done(error)
@@ -93,7 +93,10 @@ describe('test-api-manual', () => {
       '--require ./ci-visibility/test-api-manual/test.fake.js ./ci-visibility/test-api-manual/run-fake-test-framework',
       {
         cwd,
-        env: getCiVisAgentlessConfig(receiver.port),
+        env: {
+          ...getCiVisAgentlessConfig(receiver.port),
+          DD_CIVISIBILITY_MANUAL_API_ENABLED: 'false'
+        },
         stdio: 'pipe'
       }
     )

integration-tests/vitest/vitest.spec.js

@@ -21,6 +21,7 @@ const {
   TEST_SOURCE_FILE,
   TEST_SOURCE_START
 } = require('../../packages/dd-trace/src/plugins/util/test')
+const { DD_HOST_CPU_COUNT } = require('../../packages/dd-trace/src/plugins/util/env')
 
 const versions = ['1.6.0', 'latest']
 
@@ -145,6 +146,7 @@ versions.forEach((version) => {
 
         testEvents.forEach(test => {
           assert.equal(test.content.meta[TEST_COMMAND], 'vitest run')
+          assert.exists(test.content.metrics[DD_HOST_CPU_COUNT])
         })
 
         testSuiteEvents.forEach(testSuite => {
@@ -153,6 +155,7 @@ versions.forEach((version) => {
             testSuite.content.meta[TEST_SOURCE_FILE].startsWith('ci-visibility/vitest-tests/test-visibility')
           )
           assert.equal(testSuite.content.metrics[TEST_SOURCE_START], 1)
+          assert.exists(testSuite.content.metrics[DD_HOST_CPU_COUNT])
         })
         // TODO: check error messages
       }).then(() => done()).catch(done)
@@ -164,7 +167,7 @@ versions.forEach((version) => {
           env: {
             ...getCiVisAgentlessConfig(receiver.port),
             NODE_OPTIONS: '--import dd-trace/register.js -r dd-trace/ci/init', // ESM requires more flags
-            DD_SESSION_NAME: 'my-test-session'
+            DD_TEST_SESSION_NAME: 'my-test-session'
           },
           stdio: 'pipe'
         }

packages/datadog-plugin-fastify/test/integration-test/helper.mjs

@@ -4,7 +4,7 @@ export async function createAndStartServer (app) {
   })
 
   try {
-    await app.listen(0)
+    await app.listen({ port: 0 })
     const address = app.server.address()
     const port = address.port
     process.send({ port })

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

@@ -276,25 +276,34 @@ class OpenApiPlugin extends TracingPlugin {
     const completionTokens = spanTags['openai.response.usage.completion_tokens']
     const completionTokensEstimated = spanTags['openai.response.usage.completion_tokens_estimated']
 
+    const totalTokens = spanTags['openai.response.usage.total_tokens']
+
     if (!error) {
-      if (promptTokensEstimated) {
-        this.metrics.distribution(
-          'openai.tokens.prompt', promptTokens, [...tags, 'openai.estimated:true'])
-      } else {
-        this.metrics.distribution('openai.tokens.prompt', promptTokens, tags)
+      if (promptTokens != null) {
+        if (promptTokensEstimated) {
+          this.metrics.distribution(
+            'openai.tokens.prompt', promptTokens, [...tags, 'openai.estimated:true'])
+        } else {
+          this.metrics.distribution('openai.tokens.prompt', promptTokens, tags)
+        }
       }
-      if (completionTokensEstimated) {
-        this.metrics.distribution(
-          'openai.tokens.completion', completionTokens, [...tags, 'openai.estimated:true'])
-      } else {
-        this.metrics.distribution('openai.tokens.completion', completionTokens, tags)
+
+      if (completionTokens != null) {
+        if (completionTokensEstimated) {
+          this.metrics.distribution(
+            'openai.tokens.completion', completionTokens, [...tags, 'openai.estimated:true'])
+        } else {
+          this.metrics.distribution('openai.tokens.completion', completionTokens, tags)
+        }
       }
 
-      if (promptTokensEstimated || completionTokensEstimated) {
-        this.metrics.distribution(
-          'openai.tokens.total', promptTokens + completionTokens, [...tags, 'openai.estimated:true'])
-      } else {
-        this.metrics.distribution('openai.tokens.total', promptTokens + completionTokens, tags)
+      if (totalTokens != null) {
+        if (promptTokensEstimated || completionTokensEstimated) {
+          this.metrics.distribution(
+            'openai.tokens.total', totalTokens, [...tags, 'openai.estimated:true'])
+        } else {
+          this.metrics.distribution('openai.tokens.total', totalTokens, tags)
+        }
       }
     }
 
@@ -777,9 +786,9 @@ function usageExtraction (tags, body, methodName, openaiStore) {
     if (completionEstimated) tags['openai.response.usage.completion_tokens_estimated'] = true
   }
 
-  if (promptTokens) tags['openai.response.usage.prompt_tokens'] = promptTokens
-  if (completionTokens) tags['openai.response.usage.completion_tokens'] = completionTokens
-  if (totalTokens) tags['openai.response.usage.total_tokens'] = totalTokens
+  if (promptTokens != null) tags['openai.response.usage.prompt_tokens'] = promptTokens
+  if (completionTokens != null) tags['openai.response.usage.completion_tokens'] = completionTokens
+  if (totalTokens != null) tags['openai.response.usage.total_tokens'] = totalTokens
 }
 
 function truncateApiKey (apiKey) {