Skip to content

Commit 424a6cb

Browse files
sumitsutharsumitsuthar
authored
Merge branch 'newrelic:main' into main
2 parents 214340a + c14ec3b commit 424a6cb

39 files changed

+828
-251
lines changed

‎.github/workflows/ci-workflow.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
strategy:
9999
fail-fast: false
100100
matrix:
101-
node-version: [16.x, 18.x, 20.x]
101+
node-version: [16.x, 18.x, 20.x, 22.x]
102102

103103
steps:
104104
- uses: actions/checkout@v4
@@ -130,7 +130,7 @@ jobs:
130130
strategy:
131131
fail-fast: false
132132
matrix:
133-
node-version: [16.x, 18.x, 20.x]
133+
node-version: [16.x, 18.x, 20.x, 22.x]
134134

135135
steps:
136136
- uses: actions/checkout@v4
@@ -166,7 +166,7 @@ jobs:
166166
strategy:
167167
fail-fast: false
168168
matrix:
169-
node-version: [16.x, 18.x, 20.x]
169+
node-version: [16.x, 18.x, 20.x, 22.x]
170170

171171
steps:
172172
- uses: actions/checkout@v4
@@ -217,7 +217,7 @@ jobs:
217217
strategy:
218218
fail-fast: false
219219
matrix:
220-
node-version: [16.x, 18.x, 20.x]
220+
node-version: [16.x, 18.x, 20.x, 22.x]
221221

222222
steps:
223223
- uses: actions/checkout@v4
@@ -240,7 +240,7 @@ jobs:
240240

241241
strategy:
242242
matrix:
243-
node-version: [16.x, 18.x, 20.x]
243+
node-version: [16.x, 18.x, 20.x, 22.x]
244244

245245
steps:
246246
- uses: actions/checkout@v4

‎.github/workflows/post-release.yml

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,66 @@ name: Agent Post Release
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
repo_target:
7+
description: Generate the docs for the local repo, the docs repo, or both.
8+
required: true
9+
type: choice
10+
default: both
11+
options:
12+
- local
13+
- docs
14+
- both
15+
516
workflow_run:
617
workflows: ["Create Release"]
718
types:
819
- completed
920

1021
jobs:
11-
update-docs:
12-
# Check if this was a manual invocation*workflow_dispatch) or triggered(workflow_run) and successful
13-
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run && github.event.workflow_run.conclusion == 'success' }}
22+
local:
1423
runs-on: ubuntu-latest
24+
if:
25+
(github.event.workflow_run && github.event.workflow_run.conclusion == 'success') ||
26+
(github.event_name == 'workflow_dispatch' &&
27+
(inputs.repo_target == 'local' || inputs.repo_target == 'both'))
28+
steps:
29+
- uses: actions/checkout@v4
30+
with:
31+
fetch-depth: 2
32+
- uses: actions/setup-node@v4
33+
with:
34+
node-version: 'lts/*'
35+
- run: npm install
36+
- run: |
37+
git config user.name ${GITHUB_ACTOR}
38+
git config user.email gh-actions-${GITHUB_ACTOR}@github.com
39+
- id: get_tag
40+
run: echo "latest_tag=$(cat package.json | jq .version)" >> $GITHUB_OUTPUT
41+
- run: npm run publish-docs
1542

16-
strategy:
17-
matrix:
18-
node-version: [lts/*]
19-
43+
docs:
44+
runs-on: ubuntu-latest
45+
if:
46+
(github.event.workflow_run && github.event.workflow_run.conclusion == 'success') ||
47+
(github.event_name == 'workflow_dispatch' &&
48+
(inputs.repo_target == 'local' || inputs.repo_target == 'both'))
2049
steps:
21-
- uses: actions/checkout@v4
22-
with:
23-
# The script `publish-docs` below needs to perform a merge, so
24-
# it needs the full history to perform this merge.
25-
fetch-depth: 0
26-
- name: Use Node.js ${{ matrix.node-version }}
27-
uses: actions/setup-node@v4
28-
with:
29-
node-version: ${{ matrix.node-version }}
30-
- name: Install Dependencies
31-
run: npm install
32-
- name: Setup GitHub Credentials
33-
run: |
34-
git config user.name $GITHUB_ACTOR
35-
git config user.email gh-actions-${GITHUB_ACTOR}@github.com
36-
- name: Get Created Tag
37-
id: get_tag
38-
run: echo "latest_tag=$(cat package.json | jq .version)" >> $GITHUB_OUTPUT
39-
- name: Publish API Docs
40-
run: npm run publish-docs
41-
- name: Create Docs Website PR
42-
run: node ./bin/create-docs-pr.js --tag v${{ steps.get_tag.outputs.latest_tag }}
43-
env:
44-
GITHUB_TOKEN: ${{ secrets.NODE_AGENT_GH_TOKEN }}
45-
GITHUB_USER: ${{ vars.NODE_AGENT_CI_USER_NAME }}
46-
GITHUB_EMAIL: ${{ vars.NODE_AGENT_CI_USER_EMAIL }}
50+
- uses: actions/checkout@v4
51+
with:
52+
fetch-depth: 2
53+
- uses: actions/setup-node@v4
54+
with:
55+
node-version: 'lts/*'
56+
- run: npm install
57+
- run: |
58+
git config user.name ${GITHUB_ACTOR}
59+
git config user.email gh-actions-${GITHUB_ACTOR}@github.com
60+
- id: get_tag
61+
run: echo "latest_tag=$(cat package.json | jq .version)" >> $GITHUB_OUTPUT
62+
- name: Create Docs Website PR
63+
run: node ./bin/create-docs-pr.js --tag v${{ steps.get_tag.outputs.latest_tag }}
64+
env:
65+
GITHUB_TOKEN: ${{ secrets.NODE_AGENT_GH_TOKEN }}
66+
GITHUB_USER: ${{ vars.NODE_AGENT_CI_USER_NAME }}
67+
GITHUB_EMAIL: ${{ vars.NODE_AGENT_CI_USER_EMAIL }}

‎.github/workflows/smoke-test-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [16.x, 18.x, 20.x]
19+
node-version: [16.x, 18.x, 20.x, 22.x]
2020

2121
steps:
2222
- uses: actions/checkout@v4

‎.github/workflows/versioned-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
node-version: [16.x, 18.x, 20.x]
21+
node-version: [16.x, 18.x, 20.x, 22.x]
2222

2323
steps:
2424
- uses: actions/checkout@v4

‎.github/workflows/versioned-security-agent.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
node-version: [16.x, 18.x, 20.x]
66+
node-version: [16.x, 18.x, 20.x, 22.x]
6767

6868
steps:
6969
- uses: actions/checkout@v4

‎NEWS.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
### v11.22.0 (2024-06-28)
2+
3+
#### Features
4+
5+
* Added support for Node 22([#2305](https://github.com/newrelic/node-newrelic/pull/2305)) ([0bf8908](https://github.com/newrelic/node-newrelic/commit/0bf89081a59fe598b22613257f519c171149c454))
6+
* Added AIM support for Meta Llama3 models in AWS Bedrock ([#2306](https://github.com/newrelic/node-newrelic/pull/2306)) ([ff2e509](https://github.com/newrelic/node-newrelic/commit/ff2e509913c2169c274387db461edffeee896834))
7+
8+
#### Documentation
9+
10+
* Updated compatibility report ([#2309](https://github.com/newrelic/node-newrelic/pull/2309)) ([7bf77c6](https://github.com/newrelic/node-newrelic/commit/7bf77c6b41d8313c6837293f42901c6e13954af4))
11+
12+
#### Miscellaneous chores
13+
14+
* Added [@amychisholm03](https://github.com/amychisholm03) to list of contributors 🎉 ([#2310](https://github.com/newrelic/node-newrelic/pull/2310)) ([8a890f1](https://github.com/newrelic/node-newrelic/commit/8a890f1d8879715be3b15bdc58f95c764c112646))
15+
* Forced re-creation of API docs on gh-pages ([#2307](https://github.com/newrelic/node-newrelic/pull/2307)) ([917110a](https://github.com/newrelic/node-newrelic/commit/917110a189bc77823f114b1bfb338788fa2b6043))
16+
17+
#### Tests
18+
19+
* Updated undici versioned tests to assert an error is present and not the actual message ([#2299](https://github.com/newrelic/node-newrelic/pull/2299)) ([4e38ed4](https://github.com/newrelic/node-newrelic/commit/4e38ed494f2706d4c6b3f89474efb7365e766903))
20+
21+
#### Continuous integration
22+
23+
* Added Node 22 to CI ([#2164](https://github.com/newrelic/node-newrelic/pull/2164)) ([4b12d9e](https://github.com/newrelic/node-newrelic/commit/4b12d9e7d89d8367fdb895b24e2818ff85d67592))
24+
* Added Node 22 to smoke tests and nightly versioned test runs ([#2316](https://github.com/newrelic/node-newrelic/pull/2316)) ([af00666](https://github.com/newrelic/node-newrelic/commit/af00666d3b1a3458c40bd6f0e3dca6ac2e477335))
25+
* Moved the docs PR job to before api docs publish ([#2300](https://github.com/newrelic/node-newrelic/pull/2300)) ([2e7252e](https://github.com/newrelic/node-newrelic/commit/2e7252ef3281046c3c85722ccede582e5aefa1a9))
26+
27+
### v11.21.0 (2024-06-25)
28+
29+
#### Features
30+
31+
* Added support for getting container ids from ECS metadata API ([#2292](https://github.com/newrelic/node-newrelic/pull/2292)) ([dbca830](https://github.com/newrelic/node-newrelic/commit/dbca830deb6c9420427b60df4875ba71939508c4))
32+
33+
#### Bug fixes
34+
35+
* Handled assigning headers in LambdaProxyWebRequest when there are no headers present ([#2293](https://github.com/newrelic/node-newrelic/pull/2293)) ([e4d22f3](https://github.com/newrelic/node-newrelic/commit/e4d22f38b70cee061b345d6dbc94a2783a164b76))
36+
37+
#### Documentation
38+
39+
* Updated compatibility report ([#2290](https://github.com/newrelic/node-newrelic/pull/2290)) ([b5fc893](https://github.com/newrelic/node-newrelic/commit/b5fc8932ed5a0372f8be3f0e53c6d9fa0cf12855))
40+
41+
#### Tests
42+
43+
* Fixed log error stack message truncating and failing equality test ([#2294](https://github.com/newrelic/node-newrelic/pull/2294)) ([8e06f0f](https://github.com/newrelic/node-newrelic/commit/8e06f0f77762922e7862446bdf85a32eef3f9096))
44+
* Updated shimmer method in benchmark tests ([#2281](https://github.com/newrelic/node-newrelic/pull/2281)) ([1528d68](https://github.com/newrelic/node-newrelic/commit/1528d685c7fd8e9af23ea91bd66124b82dcdb523))
45+
146
### v11.20.0 (2024-06-24)
247

348
#### Features

‎THIRD_PARTY_NOTICES.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
674674

675675
### import-in-the-middle
676676

677-
This product includes source derived from [import-in-the-middle](https://github.com/DataDog/import-in-the-middle) ([v1.7.4](https://github.com/DataDog/import-in-the-middle/tree/v1.7.4)), distributed under the [Apache-2.0 License](https://github.com/DataDog/import-in-the-middle/blob/v1.7.4/LICENSE):
677+
This product includes source derived from [import-in-the-middle](https://github.com/DataDog/import-in-the-middle) ([v1.8.0](https://github.com/DataDog/import-in-the-middle/tree/v1.8.0)), distributed under the [Apache-2.0 License](https://github.com/DataDog/import-in-the-middle/blob/v1.8.0/LICENSE):
678678

679679
```
680680
Copyright 2021 Datadog, Inc.
@@ -886,7 +886,7 @@ SOFTWARE.
886886

887887
### @aws-sdk/client-s3
888888

889-
This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.587.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE):
889+
This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.592.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.592.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.592.0/LICENSE):
890890

891891
```
892892
Apache License
@@ -1095,7 +1095,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
10951095

10961096
### @aws-sdk/s3-request-presigner
10971097

1098-
This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.587.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE):
1098+
This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.592.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.592.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.592.0/LICENSE):
10991099

11001100
```
11011101
Apache License
@@ -1750,7 +1750,7 @@ This product includes source derived from [@newrelic/newrelic-oss-cli](https://g
17501750

17511751
### @newrelic/test-utilities
17521752

1753-
This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v8.5.0](https://github.com/newrelic/node-test-utilities/tree/v8.5.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v8.5.0/LICENSE):
1753+
This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v8.6.0](https://github.com/newrelic/node-test-utilities/tree/v8.6.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v8.6.0/LICENSE):
17541754

17551755
```
17561756
Apache License
@@ -2493,7 +2493,7 @@ THE SOFTWARE.
24932493

24942494
### aws-sdk
24952495

2496-
This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1631.0](https://github.com/aws/aws-sdk-js/tree/v2.1631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1631.0/LICENSE.txt):
2496+
This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1636.0](https://github.com/aws/aws-sdk-js/tree/v2.1636.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1636.0/LICENSE.txt):
24972497

24982498
```
24992499
@@ -2892,7 +2892,7 @@ THE SOFTWARE.
28922892

28932893
### eslint-plugin-jsdoc
28942894

2895-
This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.2.7](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.7)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.7/LICENSE):
2895+
This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.2.8](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.8)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.8/LICENSE):
28962896

28972897
```
28982898
Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)
@@ -3941,7 +3941,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39413941

39423942
### @contrast/fn-inspect
39433943

3944-
This product includes source derived from [@contrast/fn-inspect](https://github.com/Contrast-Security-Inc/node-fn-inspect) ([v3.4.0](https://github.com/Contrast-Security-Inc/node-fn-inspect/tree/v3.4.0)), distributed under the [MIT License](https://github.com/Contrast-Security-Inc/node-fn-inspect/blob/v3.4.0/LICENSE):
3944+
This product includes source derived from [@contrast/fn-inspect](https://github.com/Contrast-Security-Inc/node-fn-inspect) ([v4.2.0](https://github.com/Contrast-Security-Inc/node-fn-inspect/tree/v4.2.0)), distributed under the [MIT License](https://github.com/Contrast-Security-Inc/node-fn-inspect/blob/v4.2.0/LICENSE):
39453945

39463946
```
39473947
Copyright 2022 Contrast Security, Inc

‎ai-support.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,19 @@
6464
}
6565
]
6666
},
67-
67+
{
68+
"name": "Meta Llama3",
69+
"features": [
70+
{
71+
"title": "Text",
72+
"supported": true
73+
},
74+
{
75+
"title": "Image",
76+
"supported": false
77+
}
78+
]
79+
},
6880
{
6981
"name": "Amazon Titan",
7082
"features": [

‎bin/publish-docs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ PACKAGE_VERSION=$(node -e 'console.log(require("./package").version)')
88

99
git fetch origin gh-pages
1010
git checkout gh-pages
11-
git merge -
11+
git checkout main
12+
git branch -fd gh-pages
13+
git checkout -b gh-pages
1214
npm run public-docs
1315
sleep 1
14-
git rm -r docs
15-
sleep 1
1616
mv out docs
1717
sleep 1
1818
git add docs
1919
git commit -m "docs: update for ${PACKAGE_VERSION}"
20-
git push origin gh-pages
20+
git push --force origin gh-pages

‎changelog.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
{
22
"repository": "newrelic/node-newrelic",
33
"entries": [
4+
{
5+
"version": "11.22.0",
6+
"changes": {
7+
"security": [],
8+
"bugfixes": [],
9+
"features": [
10+
"Added supoort for Node 22",
11+
"Added AIM support for Meta Llama3 models in AWS Bedrock"
12+
]
13+
}
14+
},
15+
{
16+
"version": "11.21.0",
17+
"changes": {
18+
"security": [],
19+
"bugfixes": [
20+
"Handled assigning headers in LambdaProxyWebRequest when there are no headers present"
21+
],
22+
"features": [
23+
"Added support for getting container ids from ECS metadata API"
24+
]
25+
}
26+
},
427
{
528
"version": "11.20.0",
629
"changes": {

0 commit comments

Comments
 (0)