Skip to content

Update for a coming apm-agent-nodejs 4.x stream #2750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 7, 2023
Merged

Update for a coming apm-agent-nodejs 4.x stream #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0ff19d
Update for a coming apm-agent-nodejs 4.x stream
trentm Sep 1, 2023
5de5779
update cross-stack links
bmorelli25 Sep 5, 2023
7326f62
bring 4.x back to 7.0
bmorelli25 Sep 5, 2023
f7a364e
more changes
bmorelli25 Sep 5, 2023
a8b163b
aws-lambda: map 4.x to stack current
bmorelli25 Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1341,9 +1341,9 @@ contents:
path: CHANGELOG.asciidoc
- title: APM Node.js Agent
prefix: nodejs
current: 3.x
branches: [ {main: master}, 3.x, 2.x, 1.x, 0.x ]
live: [ 3.x ]
current: 4.x
branches: [ {main: master}, 4.x, 3.x, 2.x, 1.x ]
live: [ 4.x ]
index: docs/index.asciidoc
tags: APM Node.js Agent/Reference
subject: APM
Expand All @@ -1362,6 +1362,7 @@ contents:
exclude_branches: [ 2.x, 1.x, 0.x ]
map_branches:
3.x: *stackcurrent
4.x: *stackcurrent
- title: APM PHP Agent
prefix: php
current: 1.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/6.6.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 3.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/6.7.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/6.8.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.1.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.10.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: master
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.11.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: master
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.12.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.13.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ APM Agent versions
:apm-ios-branch: main
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.14.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.15.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.16.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.17.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.2.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.3.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.4.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.5.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 2.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.6.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.7.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.8.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
:apm-dotnet-branch: 1.x
2 changes: 1 addition & 1 deletion shared/versions/stack/7.9.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ APM Agent versions
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: master
:apm-py-branch: 5.x
:apm-ruby-branch: 3.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/7.x.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 5.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.1.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.10.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.2.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.3.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.4.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.5.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.6.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
2 changes: 1 addition & 1 deletion shared/versions/stack/8.7.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
4 changes: 2 additions & 2 deletions shared/versions/stack/8.8.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bare_version never includes -alpha or -beta
:kinesis_version: master

//////////
Keep the :esf_version: attribute value as master.
Keep the :esf_version: attribute value as master.
//////////

//////////
Expand All @@ -43,7 +43,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
4 changes: 2 additions & 2 deletions shared/versions/stack/8.9.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bare_version never includes -alpha or -beta
:esf_version: master

//////////
Keep the :esf_version: attribute value as master.
Keep the :esf_version: attribute value as master.
//////////

//////////
Expand All @@ -43,7 +43,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down
4 changes: 2 additions & 2 deletions shared/versions/stack/master.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bare_version never includes -alpha or -beta
:esf_version: master

//////////
Keep the :esf_version: attribute value as master.
Keep the :esf_version: attribute value as master.
//////////

//////////
Expand All @@ -43,7 +43,7 @@ APM Agent versions
:apm-ios-branch: 0.x
:apm-java-branch: 1.x
:apm-rum-branch: 5.x
:apm-node-branch: 3.x
:apm-node-branch: 4.x
:apm-php-branch: 1.x
:apm-py-branch: 6.x
:apm-ruby-branch: 4.x
Expand Down