v5.45.0 proposal

.github/workflows/debugger.yml

@@ -15,25 +15,21 @@ concurrency:
 
 jobs:
   ubuntu:
+    strategy:
+      matrix:
+        version: [18, 20, 22, latest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/testagent/start
-      - uses: ./.github/actions/node/oldest-maintenance-lts
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        with:
+          node-version: ${{ matrix.version }}
       - uses: ./.github/actions/install
       - run: yarn test:debugger:ci
       - run: yarn test:integration:debugger
-      - uses: ./.github/actions/node/newest-maintenance-lts
-      - run: yarn test:debugger:ci
-      - run: yarn test:integration:debugger
-      - uses: ./.github/actions/node/active-lts
-      - run: yarn test:debugger:ci
-      - run: yarn test:integration:debugger
-      - uses: ./.github/actions/node/latest
-      - run: yarn test:debugger:ci
-      - run: yarn test:integration:debugger
       - if: always()
         uses: ./.github/actions/testagent/logs
         with:
-          suffix: debugger
+          suffix: debugger-ubuntu-${{ matrix.version }}
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.44.0",
+  "version": "5.45.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

packages/datadog-plugin-langchain/test/index.spec.js

@@ -35,13 +35,12 @@ describe('Plugin', () => {
 
   describe('langchain', () => {
     withVersions('langchain', ['@langchain/core'], version => {
-      beforeEach(() => {
+      before(() => {
         return agent.load('langchain')
       })
 
-      afterEach(() => {
-        // wiping in order to read new env vars for the config each time
-        return agent.close({ ritmReset: false, wipe: true })
+      after(() => {
+        return agent.close({ ritmReset: false })
       })
 
       beforeEach(() => {
@@ -65,84 +64,6 @@ describe('Plugin', () => {
         nock.cleanAll()
       })
 
-      describe('with global configurations', () => {
-        describe('with sampling rate', () => {
-          useEnv({
-            DD_LANGCHAIN_SPAN_PROMPT_COMPLETION_SAMPLE_RATE: 0
-          })
-
-          it('does not tag prompt or completion', async () => {
-            stubCall({
-              ...openAiBaseCompletionInfo,
-              response: {
-                model: 'gpt-3.5-turbo-instruct',
-                choices: [{
-                  text: 'The answer is 4',
-                  index: 0,
-                  logprobs: null,
-                  finish_reason: 'length'
-                }],
-                usage: { prompt_tokens: 8, completion_tokens: 12, otal_tokens: 20 }
-              }
-            })
-
-            const llm = new langchainOpenai.OpenAI({ model: 'gpt-3.5-turbo-instruct' })
-            const checkTraces = agent
-              .use(traces => {
-                expect(traces[0].length).to.equal(1)
-                const span = traces[0][0]
-
-                expect(span.meta).to.not.have.property('langchain.request.prompts.0.content')
-                expect(span.meta).to.not.have.property('langchain.response.completions.0.text')
-              })
-
-            const result = await llm.generate(['what is 2 + 2?'])
-
-            expect(result.generations[0][0].text).to.equal('The answer is 4')
-
-            await checkTraces
-          })
-        })
-
-        describe('with span char limit', () => {
-          useEnv({
-            DD_LANGCHAIN_SPAN_CHAR_LIMIT: 5
-          })
-
-          it('truncates the prompt and completion', async () => {
-            stubCall({
-              ...openAiBaseCompletionInfo,
-              response: {
-                model: 'gpt-3.5-turbo-instruct',
-                choices: [{
-                  text: 'The answer is 4',
-                  index: 0,
-                  logprobs: null,
-                  finish_reason: 'length'
-                }],
-                usage: { prompt_tokens: 8, completion_tokens: 12, otal_tokens: 20 }
-              }
-            })
-
-            const llm = new langchainOpenai.OpenAI({ model: 'gpt-3.5-turbo-instruct' })
-            const checkTraces = agent
-              .use(traces => {
-                expect(traces[0].length).to.equal(1)
-                const span = traces[0][0]
-
-                expect(span.meta).to.have.property('langchain.request.prompts.0.content', 'what ...')
-                expect(span.meta).to.have.property('langchain.response.completions.0.text', 'The a...')
-              })
-
-            const result = await llm.generate(['what is 2 + 2?'])
-
-            expect(result.generations[0][0].text).to.equal('The answer is 4')
-
-            await checkTraces
-          })
-        })
-      })
-
       describe('llm', () => {
         it('does not tag output on error', async () => {
           nock('https://api.openai.com').post('/v1/completions').reply(403)

packages/dd-trace/src/appsec/sdk/track_event.js

@@ -7,6 +7,7 @@ const waf = require('../waf')
 const { keepTrace } = require('../../priority_sampler')
 const addresses = require('../addresses')
 const { ASM } = require('../../standalone/product')
+const { incrementSdkEventMetric } = require('../telemetry')
 
 function trackUserLoginSuccessEvent (tracer, user, metadata) {
   // TODO: better user check here and in _setUser() ?
@@ -15,6 +16,8 @@ function trackUserLoginSuccessEvent (tracer, user, metadata) {
     return
   }
 
+  incrementSdkEventMetric('login_success')
+
   const rootSpan = getRootSpan(tracer)
   if (!rootSpan) {
     log.warn('[ASM] Root span not available in trackUserLoginSuccessEvent')
@@ -48,6 +51,8 @@ function trackUserLoginFailureEvent (tracer, userId, exists, metadata) {
   trackEvent('users.login.failure', fields, 'trackUserLoginFailureEvent', getRootSpan(tracer))
 
   runWaf('users.login.failure', { login: userId })
+
+  incrementSdkEventMetric('login_failure')
 }
 
 function trackCustomEvent (tracer, eventName, metadata) {
@@ -57,6 +62,8 @@ function trackCustomEvent (tracer, eventName, metadata) {
   }
 
   trackEvent(eventName, metadata, 'trackCustomEvent', getRootSpan(tracer))
+
+  incrementSdkEventMetric('custom')
 }
 
 function trackEvent (eventName, fields, sdkMethodName, rootSpan) {

packages/dd-trace/src/appsec/telemetry/index.js

@@ -2,7 +2,7 @@
 
 const { DD_TELEMETRY_REQUEST_METRICS } = require('./common')
 const { addRaspRequestMetrics, trackRaspMetrics } = require('./rasp')
-const { incrementMissingUserId, incrementMissingUserLogin } = require('./user')
+const { incrementMissingUserId, incrementMissingUserLogin, incrementSdkEvent } = require('./user')
 const {
   addWafRequestMetrics,
   trackWafMetrics,
@@ -121,6 +121,12 @@ function incrementMissingUserIdMetric (framework, eventType) {
   incrementMissingUserId(framework, eventType)
 }
 
+function incrementSdkEventMetric (framework, eventType) {
+  if (!enabled) return
+
+  incrementSdkEvent(framework, eventType)
+}
+
 function getRequestMetrics (req) {
   if (req) {
     const store = getStore(req)
@@ -141,6 +147,7 @@ module.exports = {
   incrementWafRequestsMetric,
   incrementMissingUserLoginMetric,
   incrementMissingUserIdMetric,
+  incrementSdkEventMetric,
 
   getRequestMetrics
 }

packages/dd-trace/src/appsec/telemetry/user.js

@@ -18,7 +18,15 @@ function incrementMissingUserId (framework, eventType) {
   }).inc()
 }
 
+function incrementSdkEvent (eventType) {
+  appsecMetrics.count('sdk.event', {
+    event_type: eventType,
+    sdk_version: 'v1'
+  }).inc()
+}
+
 module.exports = {
   incrementMissingUserLogin,
-  incrementMissingUserId
+  incrementMissingUserId,
+  incrementSdkEvent
 }