Merge branch 'master' into conti/remove-async-storage-graphql

Author: wconti27

.github/dependabot.yml

@@ -37,6 +37,11 @@ updates:
       - dependency-name: "lru-cache"
         # 11.0.0 onwards only supports Node.js 20 and above
         update-types: ["version-update:semver-major"]
+      - dependency-name: "limiter"
+        # 2.0.0 onwards breaks our tests. 3.0.0 works but it requires Node.js v16.
+        # That breaks cypress in our v5 release line. Update when v5 is EOL.
+        # Reverting this commit should suffice.
+        update-types: ["version-update:semver-major"]
     groups:
       dev-minor-and-patch-dependencies:
         dependency-type: "development"

.github/workflows/apm-integrations.yml

@@ -754,7 +754,7 @@ jobs:
         version:
           - 18
           - latest
-        range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
+        range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1']
         include:
           - range: '>=10.2.0 <11'
             range_clean: gte.10.2.0.and.lt.11
@@ -770,7 +770,7 @@ jobs:
             range_clean: gte.14.0.0.and.lte.14.2.6
           - range: '>=14.2.7 <15'
             range_clean: gte.14.2.7.and.lt.15
-          - range: '>=15.0.0'
+          - range: '>=15.0.0 <15.4.1'
             range_clean: gte.15.0.0
     runs-on: ubuntu-latest
     env:

.github/workflows/appsec.yml

@@ -216,7 +216,7 @@ jobs:
         version:
           - oldest
           - latest
-        range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0']
+        range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1']
         include:
           - range: '>=10.2.0 <11'
             range_clean: gte.10.2.0.and.lt.11
@@ -232,7 +232,7 @@ jobs:
             range_clean: gte.14.0.0.and.lte.14.2.6
           - range: '>=14.2.7 <15'
             range_clean: gte.14.2.7.and.lt.15
-          - range: '>=15.0.0'
+          - range: '>=15.0.0 <15.4.1'
             range_clean: gte.15.0.0
     runs-on: ubuntu-latest
     env:

.gitlab/benchmarks.yml

@@ -23,10 +23,6 @@ variables:
     paths:
       - platform/artifacts/
     expire_in: 3 months
-  variables:
-    # Gitlab and BP specific env vars. Do not modify.
-    KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-js
-    FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
 
 benchmarks-pr-comment:
   stage: benchmarks-pr-comment
@@ -38,9 +34,6 @@ benchmarks-pr-comment:
     - cd platform && (git init && git remote add origin https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform && git pull origin dd-trace-js)
     - bp-runner bp-runner.pr-comment.yml --debug
   allow_failure: true
-  variables:
-    # Gitlab and BP specific env vars. Do not modify.
-    KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-js
 
 check-big-regressions:
   stage: benchmarks-pr-comment
@@ -51,9 +44,6 @@ check-big-regressions:
   script:
     - cd platform && (git init && git remote add origin https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.ddbuild.io/DataDog/benchmarking-platform && git pull origin dd-trace-js)
     - bp-runner bp-runner.fail-on-regression.yml --debug
-  variables:
-    # Gitlab and BP specific env vars. Do not modify.
-    KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-js
 
 benchmark:
   extends: .benchmarks

.gitlab/macrobenchmarks.yml

@@ -19,8 +19,6 @@
       - platform/artifacts/
     expire_in: 3 months
   variables:
-    FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
-
     K6_OPTIONS_WARMUP_RATE: 500
     K6_OPTIONS_WARMUP_DURATION: 1m
     K6_OPTIONS_WARMUP_GRACEFUL_STOP: 10s

package.json

@@ -131,7 +131,7 @@
     "jest-docblock": "^29.7.0",
     "jsonpath-plus": "^10.3.0",
     "koalas": "^1.0.2",
-    "limiter": "^3.0.0",
+    "limiter": "^1.1.5",
     "lodash.sortby": "^4.7.0",
     "lru-cache": "^10.4.3",
     "module-details-from-path": "^1.0.4",

packages/datadog-instrumentations/src/langchain.js

@@ -53,6 +53,27 @@ for (const extension of extensions) {
     return exports
   })
 
+  addHook({ name: '@langchain/core', file: `dist/tools/index.${extension}`, versions: ['>=0.1'] }, exports => {
+    if (extension === 'cjs') {
+      wrap(exports.StructuredTool.prototype, 'invoke', 'orchestrion:@langchain/core:Tool_invoke')
+    }
+    return exports
+  })
+
+  addHook({ name: '@langchain/core', file: `dist/vectorstores.${extension}`, versions: ['>=0.1'] }, exports => {
+    if (extension === 'cjs') {
+      wrap(
+        exports.VectorStore.prototype, 'similaritySearch', 'orchestrion:@langchain/core:VectorStore_similaritySearch'
+      )
+      wrap(
+        exports.VectorStore.prototype, 'similaritySearchWithScore',
+        'orchestrion:@langchain/core:VectorStore_similaritySearchWithScore'
+      )
+    }
+
+    return exports
+  })
+
   addHook({ name: '@langchain/core', file: `dist/embeddings.${extension}`, versions: ['>=0.1'] }, exports => {
     if (extension === 'cjs') {
       shimmer.wrap(exports, 'Embeddings', Embeddings => {

packages/datadog-instrumentations/src/next.js

@@ -197,7 +197,7 @@ function finish (ctx, result, err) {
 // however, it is not provided as a class function or exported property
 addHook({
   name: 'next',
-  versions: ['>=13.3.0'],
+  versions: ['>=13.3.0 <15.4.1'],
   file: 'dist/server/web/spec-extension/adapters/next-request.js'
 }, NextRequestAdapter => {
   shimmer.wrap(NextRequestAdapter.NextRequestAdapter, 'fromNodeNextRequest', fromNodeNextRequest => {
@@ -212,7 +212,7 @@ addHook({
 
 addHook({
   name: 'next',
-  versions: ['>=11.1'],
+  versions: ['>=11.1 <15.4.1'],
   file: 'dist/server/serve-static.js'
 }, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
 
@@ -222,7 +222,7 @@ addHook({
   file: 'dist/next-server/server/serve-static.js'
 }, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
 
-addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js' }, nextServer => {
+addHook({ name: 'next', versions: ['>=11.1 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => {
   const Server = nextServer.default
 
   shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)
@@ -239,7 +239,7 @@ addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js'
 })
 
 // `handleApiRequest` changes parameters/implementation at 13.2.0
-addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js' }, nextServer => {
+addHook({ name: 'next', versions: ['>=13.2 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => {
   const Server = nextServer.default
   shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequestWithMatch)
   return nextServer
@@ -277,7 +277,7 @@ addHook({
 
 addHook({
   name: 'next',
-  versions: ['>=13'],
+  versions: ['>=13 <15.4.1'],
   file: 'dist/server/web/spec-extension/request.js'
 }, request => {
   shimmer.wrap(request.NextRequest.prototype, 'nextUrl', function (originalGet) {

packages/datadog-instrumentations/src/orchestrion-config/index.js

@@ -53,4 +53,34 @@ instrumentations:
       class: Embeddings
     operator: traceSync
     channel_name: "Embeddings_constructor"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/tools/index.js
+    function_query:
+      name: invoke
+      type: method
+      kind: async
+      class: StructuredTool
+    operator: tracePromise
+    channel_name: "Tool_invoke"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/vectorstores.js
+    function_query:
+      name: similaritySearch
+      type: method
+      kind: async
+      class: VectorStore
+    operator: tracePromise
+    channel_name: "VectorStore_similaritySearch"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/vectorstores.js
+    function_query:
+      name: similaritySearchWithScore
+      type: method
+      kind: async
+      class: VectorStore
+    operator: tracePromise
+    channel_name: "VectorStore_similaritySearchWithScore"
 `

packages/datadog-plugin-aws-sdk/test/sqs.spec.js

@@ -176,11 +176,22 @@ describe('Plugin', () => {
           })
         })
 
-        it('should propagate the tracing context from the producer to the consumer in batch operations', (done) => {
+        it('should propagate the tracing context from the producer to the consumer in batch operations', async () => {
           let parentId
           let traceId
 
-          agent.assertSomeTraces(traces => {
+          const sendPromise = new Promise((resolve, reject) => {
+            sqs.sendMessageBatch({
+              Entries: [
+                { Id: '1', MessageBody: 'test batch propagation 1' },
+                { Id: '2', MessageBody: 'test batch propagation 2' },
+                { Id: '3', MessageBody: 'test batch propagation 3' }
+              ],
+              QueueUrl
+            }, (err) => err ? reject(err) : resolve())
+          })
+
+          const parentPromise = agent.assertSomeTraces(traces => {
             const span = traces[0][0]
 
             expect(span.resource.startsWith('sendMessageBatch')).to.equal(true)
@@ -192,56 +203,45 @@ describe('Plugin', () => {
             traceId = span.trace_id.toString()
           })
 
-          let batchChildSpans = 0
-          agent.assertSomeTraces(traces => {
-            const span = traces[0][0]
+          await Promise.all([sendPromise, parentPromise])
 
-            expect(parentId).to.be.a('string')
-            expect(span.parent_id.toString()).to.equal(parentId)
-            expect(span.trace_id.toString()).to.equal(traceId)
-            batchChildSpans += 1
-            expect(batchChildSpans).to.equal(3)
-          }, { timeoutMs: 2000 }).then(done, done)
+          async function receiveAndAssertMessage () {
+            const childPromise = agent.assertSomeTraces(traces => {
+              const span = traces[0][0]
 
-          sqs.sendMessageBatch(
-            {
-              Entries: [
-                {
-                  Id: '1',
-                  MessageBody: 'test batch propagation 1'
-                },
-                {
-                  Id: '2',
-                  MessageBody: 'test batch propagation 2'
-                },
-                {
-                  Id: '3',
-                  MessageBody: 'test batch propagation 3'
-                }
-              ],
-              QueueUrl
-            }, (err) => {
-              if (err) return done(err)
+              expect(parentId).to.be.a('string')
+              expect(span.parent_id.toString()).to.equal(parentId)
+              expect(span.trace_id.toString()).to.equal(traceId)
+            })
 
-              function receiveMessage () {
-                sqs.receiveMessage({
-                  QueueUrl,
-                  MaxNumberOfMessages: 1
-                }, (err, data) => {
-                  if (err) return done(err)
+            const receiveMessage = new Promise((resolve, reject) => {
+              sqs.receiveMessage({
+                QueueUrl,
+                MaxNumberOfMessages: 1
+              }, (err, data) => {
+                if (err) return reject(err)
 
+                try {
                   for (const message in data.Messages) {
                     const recordData = data.Messages[message].MessageAttributes
                     expect(recordData).to.have.property('_datadog')
                     const traceContext = JSON.parse(recordData._datadog.StringValue)
                     expect(traceContext).to.have.property('x-datadog-trace-id')
                   }
-                })
-              }
-              receiveMessage()
-              receiveMessage()
-              receiveMessage()
+
+                  resolve()
+                } catch (e) {
+                  reject(e)
+                }
+              })
             })
+
+            await Promise.all([childPromise, receiveMessage])
+          }
+
+          await receiveAndAssertMessage()
+          await receiveAndAssertMessage()
+          await receiveAndAssertMessage()
         })
 
         it('should run the consumer in the context of its span', (done) => {