Skip to content

Commit a6833d8

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js into config-yml
2 parents 1c3ce03 + a382f06 commit a6833d8

File tree

5 files changed

+49
-30
lines changed

5 files changed

+49
-30
lines changed

.github/workflows/create-or-update-release-pr.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,16 @@ jobs:
2525
create-or-update-release-pr:
2626
runs-on: ubuntu-latest
2727
steps:
28+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
29+
id: otelbot-token
30+
with:
31+
app-id: ${{ vars.OTELBOT_JS_APP_ID }}
32+
private-key: ${{ secrets.OTELBOT_JS_PRIVATE_KEY }}
33+
2834
- name: Checkout
2935
uses: actions/checkout@v5
36+
with:
37+
token: ${{ steps.otelbot-token.outputs.token }}
3038

3139
- uses: actions/setup-node@v5
3240
with:
@@ -37,12 +45,6 @@ jobs:
3745

3846
- run: npm ci
3947

40-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
41-
id: otelbot-token
42-
with:
43-
app-id: ${{ vars.OTELBOT_JS_APP_ID }}
44-
private-key: ${{ secrets.OTELBOT_JS_PRIVATE_KEY }}
45-
4648
- name: Create/Update Release PR
4749
run: |
4850
git config user.name otelbot

.github/workflows/publish-to-npm.yml

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,50 @@ permissions:
77
contents: read
88

99
jobs:
10-
release-to-npm:
10+
setup-and-compile:
1111
runs-on: ubuntu-latest
12-
permissions:
13-
# needed for NPM provenance
14-
id-token: write
1512
steps:
1613
- name: Checkout Repository
1714
uses: actions/checkout@v5
1815
with:
1916
fetch-depth: 0
20-
2117
- name: Setup Node
2218
uses: actions/setup-node@v5
2319
with:
24-
node-version: 18
20+
node-version: 24
2521
registry-url: 'https://registry.npmjs.org'
26-
2722
- run: npm ci
28-
2923
# NOTE: in the past, we've had situations where the compiled files were missing as the `prepublishOnly` script was
3024
# missing in some packages. `npx lerna publish` *should* also run compile, but this is intended as a safeguard
3125
# when that does not happen for whatever reason.
3226
- run: npm run compile
33-
27+
- name: Upload contents for publish
28+
uses: actions/upload-artifact@v4
29+
with:
30+
name: publish-cache-${{ github.run_number }}
31+
path: .
32+
include-hidden-files: true
33+
if-no-files-found: error
34+
retention-days: 10
35+
npm-publish:
36+
needs: setup-and-compile
37+
runs-on: ubuntu-latest
38+
permissions:
39+
contents: read
40+
id-token: write # to generate npm OIDC and provenance statements
41+
environment: npm-publish-environment
42+
steps:
43+
- name: Setup Node
44+
uses: actions/setup-node@v5
45+
with:
46+
node-version: 24
47+
registry-url: 'https://registry.npmjs.org'
48+
- name: Download contents for publish
49+
uses: actions/download-artifact@v4
50+
with:
51+
name: publish-cache-${{ github.run_number }}
3452
- name: Publish to npm
3553
env:
36-
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
3754
NPM_CONFIG_PROVENANCE: true
3855
# NOTE: using --concurrency 1 to reduce the likelihood of a race when publishing,
3956
# which happens when the npm registry is not fully consistent yet. This can cause the publishing of a package to be

experimental/packages/opentelemetry-instrumentation-http/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@types/request-promise-native": "1.0.21",
5959
"@types/sinon": "17.0.4",
6060
"@types/superagent": "8.1.9",
61-
"axios": "1.8.4",
61+
"axios": "1.12.0",
6262
"lerna": "6.6.2",
6363
"mocha": "11.7.2",
6464
"nock": "13.5.6",

integration-tests/propagation-validation-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@opentelemetry/context-async-hooks": "2.1.0",
1616
"@opentelemetry/core": "2.1.0",
1717
"@opentelemetry/sdk-trace-base": "2.1.0",
18-
"axios": "1.8.4",
18+
"axios": "1.12.0",
1919
"body-parser": "2.2.0",
2020
"express": "5.1.0"
2121
},

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)