Merge branch 'master' into sabrenner/vertexai-llmobs

Author: sabrenner

.github/actions/install/action.yml

@@ -1,8 +1,25 @@
 name: Install dependencies
 description: Install dependencies
+inputs:
+  cache:
+    description: "Whether to enable caching of node_modules."
+    required: false
+    default: 'false'
 runs:
   using: composite
-  steps: # retry in case of server error from registry
+  steps:
+    - id: yarn-cache
+      uses: actions/cache@v4
+      with:
+        key: yarn-cache-${{ github.workflow }}-${{ github.job }}-${{ hashFiles('yarn.lock') }}
+        path: node_modules.tar
+      if: inputs.cache == 'true'
+    - run: 7z x -y node_modules.tar
+      shell: bash
+      if: inputs.cache == 'true' && steps.yarn-cache.outputs.cache-hit == 'true'
+      # Retry in case of server error from registry.
     - run: yarn install --frozen-lockfile --ignore-engines || yarn install --frozen-lockfile --ignore-engines
       shell: bash
-
+    - run: 7z -mx0 a node_modules.tar node_modules
+      shell: bash
+      if: inputs.cache == 'true' && steps.yarn-cache.outputs.cache-hit != 'true'

.github/actions/node/active-lts/action.yml

@@ -5,5 +5,4 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        cache: yarn
         node-version: '22'

.github/actions/node/latest/action.yml

@@ -5,5 +5,4 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        cache: yarn
         node-version: 'latest'

.github/actions/node/newest-maintenance-lts/action.yml

@@ -5,5 +5,4 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        cache: yarn
         node-version: '20'

.github/actions/node/oldest-maintenance-lts/action.yml

@@ -5,5 +5,4 @@ runs:
   steps:
     - uses: actions/setup-node@v4
       with:
-        cache: yarn
         node-version: '18'

.github/actions/testagent/start/action.yml

@@ -4,5 +4,5 @@ runs:
   using: composite
   steps:
     - uses: actions/checkout@v4
-    - run: docker compose up -d testagent
+    - run: docker compose up -d testagent || docker compose up -d testagent
       shell: bash

.github/workflows/appsec.yml

@@ -44,6 +44,8 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/node/active-lts
       - uses: ./.github/actions/install
+        with:
+          cache: 'true'
       - run: yarn test:appsec:ci
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
 
@@ -230,7 +232,6 @@ jobs:
       - uses: ./.github/actions/testagent/start
       - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
-          cache: yarn
           node-version: ${{ matrix.version }}
       - uses: ./.github/actions/install
       - run: yarn test:appsec:plugins:ci
@@ -257,7 +258,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - run: yarn install
+      - uses: ./.github/actions/install
       - uses: ./.github/actions/node/oldest-maintenance-lts
       - run: yarn test:integration:appsec
       - uses: ./.github/actions/node/active-lts

.github/workflows/instrumentations.yml

@@ -17,18 +17,33 @@ concurrency:
 
 
 jobs:
-
-  # These ones don't have a plugin directory, but exist in the
-  # instrumentations directory, so they need to be run somewhere. This seems to
-  # be a reasonable place to run them for now.
-
-  check_require_cache:
+  instrumentations-misc:
     runs-on: ubuntu-latest
-    env:
-      PLUGINS: check_require_cache
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: ./.github/actions/plugins/test
+      - uses: ./.github/actions/testagent/start
+      - uses: ./.github/actions/node/oldest-maintenance-lts
+      - uses: ./.github/actions/install
+      - run: yarn test:instrumentations:misc:ci
+        shell: bash
+      - uses: ./.github/actions/node/newest-maintenance-lts
+      - run: yarn test:instrumentations:misc:ci
+        shell: bash
+      - uses: ./.github/actions/node/active-lts
+      - run: yarn test:instrumentations:misc:ci
+        shell: bash
+      - uses: ./.github/actions/node/latest
+      - run: yarn test:instrumentations:misc:ci
+        shell: bash
+      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - if: always()
+        uses: ./.github/actions/testagent/logs
+        with:
+          suffix: test-${{ github.job }}
+
+  # These ones don't have a plugin directory, but exist in the root
+  # instrumentations directory, so they need to be run somewhere. This seems to
+  # be a reasonable place to run them for now.
 
   express-session:
     runs-on: ubuntu-latest

.github/workflows/llmobs.yml

@@ -15,23 +15,22 @@ concurrency:
 
 jobs:
   sdk:
+    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:llmobs:sdk:ci
-      - uses: ./.github/actions/node/newest-maintenance-lts
-      - run: yarn test:llmobs:sdk:ci
-      - uses: ./.github/actions/node/active-lts
-      - run: yarn test:llmobs:sdk:ci
-      - uses: ./.github/actions/node/latest
-      - run: yarn test:llmobs:sdk:ci
       - if: always()
         uses: ./.github/actions/testagent/logs
         with:
-          suffix: llmobs-${{ github.job }}
+          suffix: llmobs-${{ github.job }}-${{ matrix.version }}
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
 
   openai:

.github/workflows/plugins.yml

@@ -877,7 +877,6 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
         with:
-          cache: yarn
           node-version: '16'
       - uses: ./.github/actions/install
       - run: yarn config set ignore-engines true

.github/workflows/profiling.yml

@@ -49,6 +49,8 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/node/active-lts
       - uses: ./.github/actions/install
+        with:
+          cache: 'true'
       - run: yarn test:profiler:ci
       - run: yarn test:integration:profiler
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

.github/workflows/project.yml

@@ -61,11 +61,32 @@ jobs:
         env:
           DD_INJECTION_ENABLED: 'true'
 
+  integration-playwright:
+    strategy:
+      matrix:
+        version: [18, latest]
+    runs-on: ubuntu-latest
+    env:
+      DD_SERVICE: dd-trace-js-integration-tests
+      DD_CIVISIBILITY_AGENTLESS_ENABLED: 1
+      DD_API_KEY: ${{ secrets.DD_API_KEY_CI_APP }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        with:
+          node-version: ${{ matrix.version }}
+      - uses: ./.github/actions/install
+      # Install system dependencies for playwright
+      - run: npx playwright install-deps
+      - run: yarn test:integration:playwright
+        env:
+          NODE_OPTIONS: '-r ./ci/init'
+
   integration-ci:
     strategy:
       matrix:
         version: [18, latest]
-        framework: [cucumber, playwright, selenium, jest, mocha]
+        framework: [cucumber, selenium, jest, mocha]
     runs-on: ubuntu-latest
     env:
       DD_SERVICE: dd-trace-js-integration-tests

.github/workflows/tracing.yml

@@ -44,5 +44,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/node/active-lts
       - uses: ./.github/actions/install
+        with:
+          cache: 'true'
       - run: yarn test:trace:core:ci
       - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1

.gitlab-ci.yml

@@ -23,18 +23,9 @@ variables:
   SYSTEM_TESTS_LIBRARY: nodejs
   REPO_NOTIFICATION_CHANNEL: "#notifications-apm-js"
 
-onboarding_tests_installer:
-  parallel:
-    matrix:
-      - ONBOARDING_FILTER_WEBLOG: [test-app-nodejs,test-app-nodejs-container]
-        SCENARIO: [ SIMPLE_INSTALLER_AUTO_INJECTION, SIMPLE_AUTO_INJECTION_PROFILING ]
-
-onboarding_tests_k8s_injection:
-  parallel:
-    matrix:
-      - WEBLOG_VARIANT: [sample-app]
-        SCENARIO: [K8S_LIB_INJECTION, K8S_LIB_INJECTION_UDS, K8S_LIB_INJECTION_NO_AC, K8S_LIB_INJECTION_NO_AC_UDS, K8S_LIB_INJECTION_PROFILING_DISABLED, K8S_LIB_INJECTION_PROFILING_ENABLED, K8S_LIB_INJECTION_PROFILING_OVERRIDE]
-        K8S_CLUSTER_VERSION: ['7.56.2', '7.57.0', '7.59.0']
+configure_system_tests:
+  variables:
+    SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,docker-ssi,lib-injection"
 
 requirements_json_test:
   rules:

index.d.ts

@@ -2347,7 +2347,7 @@ declare namespace tracer {
        * ```javascript
        * llmobs.trace({ kind: 'llm', name: 'myLLM', modelName: 'gpt-4o', modelProvider: 'openai' }, () => {
        *  llmobs.annotate({
-       *    inputData: [{ content: 'system prompt, role: 'system' }, { content: 'user prompt', role: 'user' }],
+       *    inputData: [{ content: 'system prompt', role: 'system' }, { content: 'user prompt', role: 'user' }],
        *    outputData: { content: 'response', role: 'ai' },
        *    metadata: { temperature: 0.7 },
        *    tags: { host: 'localhost' },

integration-tests/ci-visibility/playwright-tests-test-capabilities/passing-test.js

@@ -0,0 +1,11 @@
+const { test, expect } = require('@playwright/test')
+
+test.beforeEach(async ({ page }) => {
+  await page.goto(process.env.PW_BASE_URL)
+})
+
+test('should work with passing tests', async ({ page }) => {
+  await expect(page.locator('.hello-world')).toHaveText([
+    'Hello World'
+  ])
+})

integration-tests/ci-visibility/test-nested-hooks/test-nested-hooks.js

@@ -0,0 +1,41 @@
+const { expect } = require('chai')
+
+let globalAttempts = 0
+
+describe('describe', function () {
+  this.retries(2)
+
+  beforeEach(() => {
+    // eslint-disable-next-line no-console
+    console.log('beforeEach')
+  })
+
+  afterEach(() => {
+    // eslint-disable-next-line no-console
+    console.log('afterEach')
+  })
+
+  it('is not nested', function () {
+    // eslint-disable-next-line no-console
+    console.log('is not nested')
+    expect(process.env.SHOULD_FAIL ? globalAttempts++ : 1).to.equal(1)
+  })
+
+  context('context', () => {
+    beforeEach(() => {
+      // eslint-disable-next-line no-console
+      console.log('beforeEach in context')
+    })
+
+    afterEach(() => {
+      // eslint-disable-next-line no-console
+      console.log('afterEach in context')
+    })
+
+    it('nested test with retries', function () {
+      // eslint-disable-next-line no-console
+      console.log('nested test with retries')
+      expect(0).to.equal(0)
+    })
+  })
+})

integration-tests/cypress/cypress.spec.js

@@ -113,6 +113,42 @@ moduleTypes.forEach(({
       await receiver.stop()
     })
 
+    if (version === '6.7.0') {
+      // to be removed when we drop support for cypress@6.7.0
+      it('logs a warning if using a deprecated version of cypress', (done) => {
+        let stdout = ''
+        const {
+          NODE_OPTIONS,
+          ...restEnvVars
+        } = getCiVisEvpProxyConfig(receiver.port)
+
+        childProcess = exec(
+          `${testCommand} --spec cypress/e2e/spec.cy.js`,
+          {
+            cwd,
+            env: {
+              ...restEnvVars,
+              CYPRESS_BASE_URL: `http://localhost:${webAppPort}`
+            },
+            stdio: 'pipe'
+          }
+        )
+
+        childProcess.stdout.on('data', (chunk) => {
+          stdout += chunk.toString()
+        })
+
+        childProcess.on('exit', () => {
+          assert.include(
+            stdout,
+            'WARNING: dd-trace support for Cypress<10.2.0 is deprecated' +
+            ' and will not be supported in future versions of dd-trace.'
+          )
+          done()
+        })
+      })
+    }
+
     it('does not crash if badly init', (done) => {
       const {
         NODE_OPTIONS, // NODE_OPTIONS dd-trace config does not work with cypress