Skip to content

Commit

Permalink
Merge branch 'master' into conti/add-dsm-for-google-pub-sub
Browse files Browse the repository at this point in the history
  • Loading branch information
wconti27 authored Oct 25, 2024
2 parents 0679ca1 + a081659 commit e5761a1
Show file tree
Hide file tree
Showing 1,092 changed files with 80,327 additions and 22,274 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ versions
acmeair-nodejs
vendor
integration-tests/esbuild/out.js
integration-tests/esbuild/aws-sdk-out.js
packages/dd-trace/src/appsec/blocked_templates.js
packages/dd-trace/src/payload-tagging/jsonpath-plus.js
13 changes: 10 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parserOptions": {
"ecmaVersion": 2020
"ecmaVersion": 2021
},
"extends": [
"eslint:recommended",
Expand All @@ -13,7 +13,12 @@
],
"env": {
"node": true,
"es2020": true
"es2021": true
},
"settings": {
"node": {
"version": ">=16.0.0"
}
},
"rules": {
"max-len": [2, 120, 2],
Expand All @@ -34,6 +39,8 @@
"mocha/no-exports": 0,
"mocha/no-skipped-tests": 0,
"n/no-restricted-require": [2, ["diagnostics_channel"]],
"object-curly-newline": ["error", {"multiline": true, "consistent": true }]
"n/no-callback-literal": 0,
"object-curly-newline": ["error", {"multiline": true, "consistent": true }],
"import/no-absolute-path": 0
}
}
34 changes: 0 additions & 34 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
blank_issues_enabled: true
contact_links:
- name: Bug Report
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
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.

8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/injection/action.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .github/actions/install/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: Install dependencies
runs:
using: composite
steps: # retry in case of server error from registry
- run: yarn install --ignore-engines || yarn install --ignore-engines
shell: bash

2 changes: 1 addition & 1 deletion .github/actions/node/latest/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ runs:
steps:
- uses: actions/setup-node@v3
with:
node-version: 'latest'
node-version: '22' # Update this line to the latest Node.js version
4 changes: 2 additions & 2 deletions .github/actions/node/oldest/action.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Node 16
name: Node 18
runs:
using: composite
steps:
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'
2 changes: 1 addition & 1 deletion .github/actions/node/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ runs:
- uses: actions/setup-node@v3
with:
cache: yarn
node-version: '16'
node-version: '18'
20 changes: 20 additions & 0 deletions .github/actions/plugins/test-and-upstream/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Plugin Tests
runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:ci
shell: bash
- run: yarn test:plugins:upstream
shell: bash
- uses: ./.github/actions/node/latest
- run: yarn test:plugins:ci
shell: bash
- run: yarn test:plugins:upstream
shell: bash
- uses: codecov/codecov-action@v3
- if: always()
uses: ./.github/actions/testagent/logs
16 changes: 16 additions & 0 deletions .github/actions/plugins/test/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Plugin Tests
runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:ci
shell: bash
- uses: ./.github/actions/node/latest
- run: yarn test:plugins:ci
shell: bash
- uses: codecov/codecov-action@v3
- if: always()
uses: ./.github/actions/testagent/logs
16 changes: 16 additions & 0 deletions .github/actions/plugins/upstream/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Plugin Upstream Tests
runs:
using: composite
steps:
- uses: ./.github/actions/testagent/start
- uses: ./.github/actions/node/setup
- uses: ./.github/actions/install
- uses: ./.github/actions/node/oldest
- run: yarn test:plugins:upstream
shell: bash
- uses: ./.github/actions/node/latest
- run: yarn test:plugins:upstream
shell: bash
- uses: codecov/codecov-action@v3
- if: always()
uses: ./.github/actions/testagent/logs
2 changes: 1 addition & 1 deletion .github/actions/testagent/logs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:
if [ -n "${{inputs.container-id}}" ]; then
docker logs ${{inputs.container-id}}
else
docker-compose logs testagent
docker compose logs testagent
fi
shell: bash
- name: Get Tested Integrations from Test Agent
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/testagent/start/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ description: "Starts the APM Test Agent image with environment."
runs:
using: composite
steps:
- uses: actions/checkout@v2
- run: docker-compose up -d testagent
- uses: actions/checkout@v4
- run: docker compose up -d testagent
shell: bash
6 changes: 0 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,4 @@
### Additional Notes
<!-- Anything else we should know when reviewing? -->

### Security
Datadog employees:
- [ ] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`.
- [ ] This PR doesn't touch any of that.

Unsure? Have a question? Request a review!

19 changes: 19 additions & 0 deletions .github/workflows/all-green.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: All Green
on:
pull_request:
push:
branches:
- master

jobs:

all-green:
runs-on: ubuntu-latest
permissions:
checks: read
contents: read
steps:
- uses: wechuli/allcheckspassed@v1
with:
retries: 20 # once per minute, some checks take up to 15 min
checks_exclude: devflow.*
Loading

0 comments on commit e5761a1

Please sign in to comment.