Merge branch 'master' into watson/revert2

Author: watson

.github/dependabot.yml

@@ -16,11 +16,21 @@ updates:
       gh-actions-packages:
         patterns:
           - "*"
+    labels:
+      - dependabot
+      - dependencies
+      - github_actions
+      - semver-patch
   - package-ecosystem: "npm"
     directories:
       - "/"
     schedule:
       interval: "weekly"
+    labels:
+      - dependabot
+      - dependencies
+      - javascript
+      - semver-patch
     ignore:
       - dependency-name: "@types/node"
         # Update the types manually with new Node.js version support

.github/workflows/system-tests.yml

@@ -42,4 +42,5 @@ jobs:
       desired_execution_time: 300  # 5 minutes
       scenarios_groups: tracer-release
       excluded_scenarios: APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN  # require AWS and datadog credentials
+      parametric_job_count: 8
       skip_empty_scenarios: true

.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

.gitlab/one-pipeline.locked.yml

@@ -1,4 +1,4 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/d44e89797a5a47c43cf712193abefe2178a004176606f7e01b77d1ec49a3ef5e/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/a0486057161f85a77e39ad2aa60ac66bb52414696d9b3dd87177df1057b11295/one-pipeline.yml

integration-tests/profiler/profiler.spec.js

@@ -22,16 +22,16 @@ if (process.platform !== 'win32') {
 const TIMEOUT = 30000
 
 function checkProfiles (agent, proc, timeout,
-  expectedProfileTypes = DEFAULT_PROFILE_TYPES, expectBadExit = false
+  expectedProfileTypes = DEFAULT_PROFILE_TYPES, expectBadExit = false, expectSeq = true
 ) {
   return Promise.all([
     processExitPromise(proc, timeout, expectBadExit),
-    expectProfileMessagePromise(agent, timeout, expectedProfileTypes)
+    expectProfileMessagePromise(agent, timeout, expectedProfileTypes, expectSeq)
   ])
 }
 
 function expectProfileMessagePromise (agent, timeout,
-  expectedProfileTypes = DEFAULT_PROFILE_TYPES
+  expectedProfileTypes = DEFAULT_PROFILE_TYPES, expectSeq = true
 ) {
   const fileNames = expectedProfileTypes.map(type => `${type}.pprof`)
   return agent.assertMessageReceived(({ headers, _, files }) => {
@@ -50,6 +50,9 @@ function expectProfileMessagePromise (agent, timeout,
       for (const [index, fileName] of attachments.entries()) {
         assert.propertyVal(files[index + 1], 'originalname', fileName)
       }
+      if (expectSeq) {
+        assert(event.tags_profiler.indexOf(',profile_seq:') !== -1)
+      }
     } catch (e) {
       e.message += ` ${JSON.stringify({ headers, files, event })}`
       throw e
@@ -560,7 +563,7 @@ describe('profiler', () => {
           execArgv: oomExecArgv,
           env: oomEnv
         })
-        return checkProfiles(agent, proc, timeout, ['space'], true)
+        return checkProfiles(agent, proc, timeout, ['space'], true, false)
       })
 
       it('sends a heap profile on OOM in worker thread and exits successfully', () => {
@@ -584,7 +587,7 @@ describe('profiler', () => {
             DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT: 3
           }
         })
-        return checkProfiles(agent, proc, timeout, ['space'], false)
+        return checkProfiles(agent, proc, timeout, ['space'], false, false)
       }).retries(3)
 
       it('sends a heap profile on OOM with async callback', () => {

packages/dd-trace/test/remote_config/rc-client_id.spec.js renamed to integration-tests/remote_config.spec.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { createSandbox, FakeAgent, spawnProc } = require('../../../../integration-tests/helpers')
+const { createSandbox, FakeAgent, spawnProc } = require('./helpers')
 const path = require('path')
 const Axios = require('axios')
 const { assert } = require('chai')
@@ -14,11 +14,11 @@ describe('Remote config client id', () => {
     sandbox = await createSandbox(
       ['express'],
       false,
-      [path.join(__dirname, 'resources')]
+      [path.join(__dirname, 'remote_config')]
     )
 
     cwd = sandbox.folder
-    appFile = path.join(cwd, 'resources', 'index.js')
+    appFile = path.join(cwd, 'remote_config', 'index.js')
   })
 
   after(async function () {

packages/dd-trace/test/remote_config/resources/index.js renamed to integration-tests/remote_config/index.js

@@ -25,7 +25,7 @@
     "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'",
     "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger",
     "test:eslint-rules": "node eslint-rules/*.test.mjs",
-    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,service-naming,standalone,telemetry}/**/*.spec.js\"",
+    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry}/**/*.spec.js\"",
     "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
     "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
     "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails",

package.json

@@ -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 => {