Skip to content
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.

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

docs: update 4.x branch for v4.11.0 release (take 2) #4434

Merged
merged 39 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ef6ac9a
chore: APM agent json server schema 20bb1f9ac324c275c41f6f81ac0e5ef93…
elastic-observability-automation[bot] Jan 6, 2025
14c7a5e
fix: get 'npm ci' working again (#4397)
trentm Jan 6, 2025
1a9c668
chore(deps-dev): bump undici from 7.1.0 to 7.2.0 (#4382)
dependabot[bot] Jan 7, 2025
e93728e
chore(deps): bump import-in-the-middle from 1.11.3 to 1.12.0 (#4383)
dependabot[bot] Jan 7, 2025
7f7304b
chore(deps-dev): bump eslint-plugin-n in the eslint group (#4378)
dependabot[bot] Jan 7, 2025
ab49065
chore(deps-dev): bump mysql2 from 3.11.5 to 3.12.0 (#4390)
dependabot[bot] Jan 7, 2025
5f095e8
chore(deps-dev): bump ioredis from 5.4.1 to 5.4.2 (#4381)
dependabot[bot] Jan 7, 2025
2796c2f
chore(deps): bump agentkeepalive from 4.5.0 to 4.6.0 (#4391)
dependabot[bot] Jan 7, 2025
b243dcc
chore(deps): bump @opentelemetry/sdk-metrics from 1.29.0 to 1.30.0 (#…
dependabot[bot] Jan 7, 2025
d3a28cc
chore(deps): bump @opentelemetry/sdk-metrics (#4384)
dependabot[bot] Jan 7, 2025
b82a27b
chore(deps): bump next from 14.2.10 to 14.2.21 in /examples/nextjs (#…
dependabot[bot] Jan 7, 2025
c94d396
chore(deps-dev): bump @apollo/server in the apollo group (#4395)
dependabot[bot] Jan 7, 2025
c7c74d4
chore(deps): bump @opentelemetry/exporter-prometheus from 0.56.0 to 0…
dependabot[bot] Jan 7, 2025
fb72f6f
chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest do…
elastic-renovate-prod[bot] Jan 7, 2025
884b4ca
fix: instrumentation of `@aws-sdk/client-*` v3.723.0 and later now wo…
trentm Jan 7, 2025
8581452
chore: support passing relevant release tags to update-4x-branch.sh a…
trentm Jan 7, 2025
1872f11
chore: slack-lite notifications (#4401)
trentm Jan 8, 2025
e94a629
chore(labeler): don't label PRs from our renovate bot as a community …
trentm Jan 9, 2025
c10fdff
chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest do…
elastic-renovate-prod[bot] Jan 9, 2025
074c5b2
chore(ci): change from ubuntu-latest to ubuntu-24.04 (#4404)
trentm Jan 9, 2025
f1bedb7
deps: Bump updatecli version to v0.92.0 (#4405)
elastic-observability-automation[bot] Jan 13, 2025
43209db
chore(deps-dev): bump wait-on from 8.0.1 to 8.0.2 (#4408)
dependabot[bot] Jan 13, 2025
526f5f7
chore(deps-dev): bump fastify from 5.2.0 to 5.2.1 (#4409)
dependabot[bot] Jan 13, 2025
2f73316
chore(deps-dev): bump @fastify/formbody from 8.0.1 to 8.0.2 (#4411)
dependabot[bot] Jan 13, 2025
2be6a70
chore(deps-dev): bump eslint from 9.17.0 to 9.18.0 in the eslint grou…
dependabot[bot] Jan 13, 2025
77bcc4a
chore(deps-dev): bump undici from 7.2.0 to 7.2.1 (#4410)
dependabot[bot] Jan 13, 2025
a69768b
chore(deps-dev): bump typescript from 5.7.2 to 5.7.3 (#4412)
dependabot[bot] Jan 13, 2025
28c0825
chore(deps): bump cookie and light-my-request (#4416)
dependabot[bot] Jan 14, 2025
3bed8fe
fix(slack notifications): don't attempt to post a slack message if do…
trentm Jan 14, 2025
f85b675
chore: disable dependabot updates of the test app used for the experi…
trentm Jan 14, 2025
2e6c76a
test: excise 'request' library from our tests (#4417)
trentm Jan 14, 2025
faf299d
chore(deps): bump docker/build-push-action in the github-actions grou…
dependabot[bot] Jan 14, 2025
77221f1
fix(slack notifications): correct the if-logic for skipping some noti…
trentm Jan 14, 2025
6fe7bf5
chore(deps): update OTel deps (#4425)
trentm Jan 16, 2025
5f440f0
chore(deps): bump docker/build-push-action in the github-actions grou…
dependabot[bot] Jan 20, 2025
3c11d7a
chore(deps): update docker.elastic.co/wolfi/chainguard-base:latest do…
elastic-renovate-prod[bot] Jan 20, 2025
376832e
chore(deps-dev): bump undici from 7.2.1 to 7.2.3 (#4429)
dependabot[bot] Jan 20, 2025
3f5340f
feat(azure-functions): support Azure Functions programming model v4 (…
trentm Jan 20, 2025
68a70ad
release 4.11.0 (#4432)
trentm Jan 20, 2025
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
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ updates:
- "eslint*"

- package-ecosystem: "npm"
directory: "/test/instrumentation/azure-functions/fixtures/AJsAzureFnApp"
directory: "/test/instrumentation/azure-functions/fixtures/azfunc3"
schedule:
interval: "weekly"
open-pull-requests-limit: 5
reviewers:
- "elastic/apm-agent-node-js"

- package-ecosystem: "npm"
directory: "/test/instrumentation/modules/next/a-nextjs-app"
directory: "/test/instrumentation/azure-functions/fixtures/azfunc4"
schedule:
interval: "weekly"
open-pull-requests-limit: 5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/addToProject.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:
jobs:
add_to_project:
if: github.event.issue && github.event.issue.milestone
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Get token
id: get_token
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# made, these will stop and there will be no value in testing v17 nightlies.
#
test-nightly:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 30
strategy:
fail-fast: false
Expand All @@ -44,7 +44,7 @@ jobs:
# The node.js project *sometimes* produces "rc" builds leading up to a new
# release. They get uploaded to: https://nodejs.org/download/rc/
test-rc:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 30
strategy:
fail-fast: false
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:

jobs:
triage:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Get token
id: get_token
Expand All @@ -33,7 +33,10 @@ jobs:
github-token: ${{ steps.get_token.outputs.token }}

- name: Add community and triage labels
if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' && github.actor != 'elastic-observability-automation[bot]'
if: contains(steps.is_elastic_member.outputs.result, 'false') &&
github.actor != 'dependabot[bot]' &&
github.actor != 'elastic-renovate-prod[bot]' &&
github.actor != 'elastic-observability-automation[bot]'
uses: actions/github-script@v7
with:
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/microbenchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:

jobs:
microbenchmark:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 5
steps:
- name: Run microbenchmark
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:

jobs:
release:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
DOCKER_IMAGE_NAME: docker.elastic.co/observability/apm-agent-nodejs
steps:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Build and Push Docker Image
id: docker-push
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

- name: Build and Push Docker Image (wolfi)
id: docker-push-wolfi
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
126 changes: 126 additions & 0 deletions .github/workflows/slack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# Post a slack message something like the following for issue and PR actions:
# <$url|$title>
# | $repo#$num · issue opened by $user
#
# Configuration:
# 1. Set `SLACK_CHANNEL`.
# 2. Add a `SLACK_BOT_TOKEN` secret to your repo. This is the "Bot User OAuth
# Token" from the "OAuth & Permissions" section of your Slack App
# (https://api.slack.com/apps). The token must have the `chat:write`
# permission.
# 3. Optionally tweak the `if:` and `on:` sections below to control which issue
# and PR events are skipped.

name: slack

env:
SLACK_CHANNEL: "#apm-agent-node"

on:
issues:
types: [opened, reopened, closed]
pull_request:
types: [opened, ready_for_review, reopened, closed]

jobs:
slack:
# Skip notification if:
# - dependabot or renovate PRs, too noisy
# - draft PRs
if: ${{ !(
(github.event.action == 'opened' && github.event.pull_request.draft) ||
github.event.pull_request.user.login == 'dependabot[bot]' ||
github.event.pull_request.user.login == 'elastic-renovate-prod[bot]'
) }}
runs-on: ubuntu-24.04
steps:
- name: Prepare Slack message
id: prepare
shell: python
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: |
import os
from pprint import pprint
import json

CLOSED_RED = '#cb2431'
GITHUB_BLACK = '#24292f'
MERGED_PURPLE = '#6f42c1'
OPEN_GREEN = '#36a64f'
DRAFT_GRAY = '#6a737d'

ctx = json.loads(os.environ["GITHUB_CONTEXT"])
# pprint(ctx) # for dev/debugging
event = ctx["event"]
action = event["action"]
if "issue" in event:
title = event["issue"]["title"]
url = event["issue"]["html_url"]
num = event["issue"]["number"]
action_str = f"issue {action}"
color = {
"opened": OPEN_GREEN,
"reopened": OPEN_GREEN,
"closed": CLOSED_RED,
}.get(action, "#ffffff")
elif "pull_request" in event:
title = event["pull_request"]["title"]
url = event["pull_request"]["html_url"]
num = event["pull_request"]["number"]
if action == "closed":
if event["pull_request"]["merged"]:
action_str = "PR merged"
color = MERGED_PURPLE
else:
action_str = "PR closed"
color = CLOSED_RED
elif event["pull_request"]["draft"]:
action_str = "PR in draft"
color = DRAFT_GRAY
elif action == "ready_for_review":
action_str = "PR ready for review"
color = OPEN_GREEN
else:
action_str = "PR opened"
color = OPEN_GREEN
else:
pprint(ctx)
raise ValueError('unexpected event: not an issue or PR event')

payload = {
"channel": os.environ["SLACK_CHANNEL"],

# Note: Omitting the "text" field is intentional, so that it is not
# rendered by default. Guidelines on accessibility in:
# https://api.slack.com/methods/chat.postMessage#text-blocks-attachments
# are unclear for "attachments" usage. This competes with:
# https://api.slack.com/reference/messaging/attachments#guidelines__message-attachments-as-objects
# guidelines to group all object data inside the attachment.
# The downside is that the `chatMessage` below results in warnings
# from the Slack API about not including the top-level "text".
#"text": title,

# Intentionally *not* using Slack's newer blocks,
# https://api.slack.com/messaging/attachments-to-blocks
# because styling with the older syntax is slightly nicer, IMHO.
"attachments": [
{
"color": color,
"title": title,
"title_link": url,
"footer": f"{ctx['repository']}#{num} · *{action_str}* by {event['sender']['login']}",
"footer_icon": "https://github.githubassets.com/favicon.ico"
}
]
}

with open(os.environ.get("GITHUB_OUTPUT"), "a") as f:
f.write("payload={}".format(json.dumps(payload)))

- name: Post Slack message
uses: slackapi/[email protected]
with:
method: chat.postMessage
token: ${{ secrets.SLACK_BOT_TOKEN }}
payload: ${{ steps.prepare.outputs.payload }}
4 changes: 2 additions & 2 deletions .github/workflows/tav-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
jobs:
command-validation:
if: startsWith(github.event.review.body, '/test tav')
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 5
permissions:
pull-requests: write
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:

test-tav:
needs: command-validation
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 40
strategy:
max-parallel: 15
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:

jobs:
prepare-matrix:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 5
outputs:
permutations: ${{ steps.transform.outputs.permutations }}
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

test-tav:
needs: prepare-matrix
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 40
strategy:
max-parallel: 15
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ permissions:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- run: echo "No build required"
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ permissions:
jobs:

lint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
- '16.0'
- '14'
- '14.17'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
# failure if at least one job listed "needs" is not successful.
test:
if: always()
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs:
- lint
- test-vers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updatecli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
compose:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
packages: read
Expand Down
58 changes: 38 additions & 20 deletions .tav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -467,14 +467,20 @@ aws-sdk:
- node test/instrumentation/modules/aws-sdk/dynamodb.test.js

'@aws-sdk/client-s3':
versions:
# - 3.377.0 was a bad release (https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1828#issuecomment-1834276719)
mode: max-7
include: '>=3.15.0 <4'
exclude: '3.377.0'
commands:
- node test/instrumentation/modules/@aws-sdk/client-s3.test.js
node: '>=14'
- versions:
# - 3.377.0 was a bad release (https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1828#issuecomment-1834276719)
mode: max-5
include: '>=3.15.0 <3.723.0'
exclude: '3.377.0'
node: '>=14'
commands:
- node test/instrumentation/modules/@aws-sdk/client-s3.test.js
- versions:
mode: max-5
include: '>=3.723.0 <4'
node: '>=18'
commands:
- node test/instrumentation/modules/@aws-sdk/client-s3.test.js

'@aws-sdk/client-dynamodb':
versions:
Expand All @@ -485,20 +491,32 @@ aws-sdk:
node: '>=14'

'@aws-sdk/client-sns':
versions:
mode: max-7
include: '>=3.15.0 <4'
commands:
- node test/instrumentation/modules/@aws-sdk/client-sns.test.js
node: '>=14'
- versions:
mode: max-7
include: '>=3.15.0 <3.723.0'
node: '>=14'
commands:
- node test/instrumentation/modules/@aws-sdk/client-sns.test.js
- versions:
mode: max-5
include: '>=3.723.0 <4'
node: '>=18'
commands:
- node test/instrumentation/modules/@aws-sdk/client-sns.test.js

'@aws-sdk/client-sqs':
versions:
mode: max-7
include: '>=3.15.0 <4'
commands:
- node test/instrumentation/modules/@aws-sdk/client-sqs.test.js
node: '>=14'
- versions:
mode: max-7
include: '>=3.15.0 <3.723.0'
node: '>=14'
commands:
- node test/instrumentation/modules/@aws-sdk/client-sqs.test.js
- versions:
mode: max-5
include: '>=3.723.0 <4'
node: '>=18'
commands:
- node test/instrumentation/modules/@aws-sdk/client-sqs.test.js

# - [email protected] added its diagnostics_channel support.
# - In [email protected] the `request.origin` property was added, which we need
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
updatecli v0.89.0
updatecli v0.92.0
Loading
Loading