Merge branch 'master' into fix/lookup-as-fn-in-config

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,71 @@
+name: "Bug Report (Low Priority)"
+description: "Create a public Bug Report. Note that these may not be addressed as quickly as the helpdesk and that looking up account information will be difficult."
+title: "[BUG]: "
+labels: bug
+body:
+  - type: input
+    attributes:
+      label: Tracer Version(s)
+      description: "Version(s) of the tracer affected by this bug"
+      placeholder: 1.2.3, 4.5.6
+    validations:
+      required: true
+
+  - type: input
+    attributes:
+      label: Node.js Version(s)
+      description: "Version(s) of Node.js (`node --version`) that you've encountered this bug with"
+      placeholder: 20.1.1
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Bug Report
+      description: Please add a clear and concise description of the bug here
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Reproduction Code
+      description: Please add code here to help us reproduce the problem
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Error Logs
+      description: "Please provide any error logs from the tracer (`DD_TRACE_DEBUG=true` can help)"
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Tracer Config
+      description: "Please provide the `tracer.init(config)` object and any applicable tracer environment variables"
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Operating System
+      description: "Provide your operating system and version (e.g. `uname -a`)"
+      placeholder: Darwin Kernel Version 23.6.0
+    validations:
+      required: false
+
+  - type: dropdown
+    attributes:
+      label: Bundling
+      description: "How is your application being bundled"
+      options:
+        - Unsure
+        - No Bundling
+        - ESBuild
+        - Webpack
+        - Next.js
+        - Vite
+        - Rollup
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,9 +1,8 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
-  - name: Bug Report
+  - name: Bug Report (High Priority)
     url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:node
-    about: This option creates an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private. Please do not create a GitHub issue to report a bug.
-  - name: Feature Request
+    about: Create an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private. Please do not create a GitHub issue to report a bug.
+  - name: Feature Request (High Priority)
     url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:node&tf_1260825272270=pt_apm_category_feature_request
-    about: This option creates an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private. Please do not create a GitHub issue to request a feature.
-
+    about: Create an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private. Please do not create a GitHub issue to request a feature.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,50 @@
+name: Feature Request (Low Priority)
+description: Create a public Feature Request. Note that these may not be addressed as quickly as the helpdesk and that looking up account information will be difficult.
+title: "[FEATURE]: "
+labels: feature-request
+body:
+  - type: input
+    attributes:
+      label: Package Name
+      description: "If your feature request is to add instrumentation support for an npm package please provide the name here"
+      placeholder: left-pad
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Package Version(s)
+      description: "If your feature request is to add instrumentation support for an npm package please provide the version you use"
+      placeholder: 1.2.3
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe the feature you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem?
+      description: |
+        Please add a clear and concise description of your problem.
+        E.g. I'm unable to instrument my database queries...
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here
+    validations:
+      required: false

.github/actions/install/action.yml

@@ -1,7 +1,8 @@
 name: Install dependencies
+description: Install dependencies
 runs:
   using: composite
   steps: # retry in case of server error from registry
-    - run: yarn install --ignore-engines || yarn install --ignore-engines
+    - run: yarn install --frozen-lockfile --ignore-engines || yarn install --frozen-lockfile --ignore-engines
       shell: bash
 

.github/actions/node/14/action.yml

@@ -1,7 +1,8 @@
 name: Node 14
+description: Install Node 14
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '14'

.github/actions/node/16/action.yml

@@ -1,7 +1,8 @@
 name: Node 16
+description: Install Node 16
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '16'

.github/actions/node/18/action.yml

@@ -1,7 +1,8 @@
 name: Node 18
+description: Install Node 18
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '18'

.github/actions/node/20/action.yml

@@ -1,7 +1,8 @@
 name: Node 20
+description: Install Node 20
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '20'

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

@@ -1,7 +1,8 @@
 name: Node Latest
+description: Install the latest Node.js version
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '22' # Update this line to the latest Node.js version

.github/actions/node/oldest/action.yml

@@ -1,7 +1,8 @@
 name: Node 18
+description: Install Oldest Supported Node.js version
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         node-version: '18'

.github/actions/node/setup/action.yml

@@ -1,8 +1,9 @@
 name: Node Setup
+description: Install Node.js
 runs:
   using: composite
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       with:
         cache: yarn
         node-version: '18'

.github/actions/plugins/test-and-upstream/action.yml

@@ -1,4 +1,5 @@
-name: Plugin Tests
+name: Plugin and Upstream Tests
+description: Run plugin tests and upstream test suite
 runs:
   using: composite
   steps:
@@ -15,6 +16,8 @@ runs:
       shell: bash
     - run: yarn test:plugins:upstream
       shell: bash
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v5
     - if: always()
       uses: ./.github/actions/testagent/logs
+      with:
+        suffix: test-and-upstream-${{ github.job }}

.github/actions/plugins/test/action.yml

@@ -1,4 +1,5 @@
 name: Plugin Tests
+description: Run plugin tests
 runs:
   using: composite
   steps:
@@ -11,6 +12,8 @@ runs:
     - uses: ./.github/actions/node/latest
     - run: yarn test:plugins:ci
       shell: bash
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v5
     - if: always()
       uses: ./.github/actions/testagent/logs
+      with:
+        suffix: test-${{ github.job }}

.github/actions/plugins/upstream/action.yml

@@ -1,4 +1,5 @@
 name: Plugin Upstream Tests
+description: Run upstream test suite
 runs:
   using: composite
   steps:
@@ -11,6 +12,8 @@ runs:
     - uses: ./.github/actions/node/latest
     - run: yarn test:plugins:upstream
       shell: bash
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v5
     - if: always()
       uses: ./.github/actions/testagent/logs
+      with:
+        suffix: upstream-${{ github.job }}

.github/actions/testagent/logs/action.yml

@@ -4,37 +4,51 @@ inputs:
   container-id:
     description: "ID of the Docker Container to get logs from (optional)"
     required: false
+  suffix:
+    description: "suffix of the artifact file name"
+    required: false
 runs:
   using: composite
   steps:
     - uses: actions/checkout@v2
-    - run: |
+    - name: Create Artifacts Directories
+      run: |
+        mkdir -p "./artifacts/logs"
+        mkdir -p "./artifacts/supported-integrations"
+      shell: bash
+    - name: Save Test Agent Logs
+      id: save_logs
+      if:  runner.debug == '1' # only create test agent log artifacts if the github action has been re-run with debug mode
+      run: |
         if [ -n "${{inputs.container-id}}" ]; then
-          docker logs ${{inputs.container-id}}
+          docker logs "${{inputs.container-id}}" > "artifacts/logs/test_agent_logs_${{ inputs.suffix }}.txt"
         else
-          docker compose logs testagent
+          docker compose logs testagent > "artifacts/logs/test_agent_logs_${{ inputs.suffix }}.txt"
         fi
       shell: bash
+    - name: Archive Test Agent Logs
+      if:  runner.debug == '1' # only create test agent log artifacts if the github action has been re-run with debug mode
+      uses: actions/upload-artifact@v4
+      with:
+        name: "test_agent_logs_${{ inputs.suffix }}"
+        path: "./artifacts/logs"
     - name: Get Tested Integrations from Test Agent
       run: |
         # make temporary files to save response data to
         response=$(mktemp) && headers=$(mktemp)
 
-        # create artifacts directory if it doesn't exist
-        mkdir -p "./artifacts"
-
         # get tested integrations
         curl -o "$response" -D "$headers" http://127.0.0.1:9126/test/integrations/tested_versions
 
         # get filename representing the name of the tested integration from headers
         filename=$(awk -F': ' '/file-name/{print $2}' "$headers" | tr -d '\r\n')
 
         # copy data to final file and remove temp files
-        mv "$response" "artifacts/${filename}_supported_versions.csv"
+        mv "$response" "artifacts/supported-integrations/${filename}_supported_versions.csv"
         rm "$headers"
       shell: bash
-    - name: Archive Test Agent Artifacts
-      uses: actions/upload-artifact@v3
+    - name: Archive Test Agent Tested Versions Artifacts
+      uses: actions/upload-artifact@v4
       with:
-        name: supported-integrations
-        path: ./artifacts
+        name: supported-integrations-${{ inputs.suffix }}
+        path: ./artifacts