Skip to content

Commit cb2cd96

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-js into config-yml
2 parents eeb69f5 + b0b6e9e commit cb2cd96

File tree

148 files changed

+14105
-23369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+14105
-23369
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,10 @@ body:
137137
placeholder: Node.js v20.12.1, Node.js v18.18.2, Firefox 130, Chrome 132, ...
138138
validations:
139139
required: false
140+
- type: dropdown
141+
attributes:
142+
label: Tip
143+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
144+
options:
145+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
146+
default: 0

.github/ISSUE_TEMPLATE/discussion.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ labels: discussion
1010

1111
- [ ] This only affects the JavaScript OpenTelemetry library
1212
- [ ] This may affect other libraries, but I would like to get opinions here first
13+
14+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ A clear and concise description of any alternative solutions or features you've
2121
### Additional context
2222

2323
Add any other context or screenshots about the feature request here.
24+
25+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/request_for_instrumentation.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ Add any other context or screenshots about the plugin request here.
2727
-->
2828

2929
#### Is there a reference you could point for the well-defined lifecycle methods**
30+
31+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. [Learn more here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/workflows/benchmark.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
container:
2121
image: ubuntu:24.04
2222
timeout-minutes: 10
23-
env:
24-
NPM_CONFIG_UNSAFE_PERM: true
2523
steps:
2624
# Apt packages:
2725
# - git: Needed for 'npm run submodule'
@@ -36,7 +34,7 @@ jobs:
3634
# `npm run submodule`.
3735
- run: git config --global --add safe.directory $GITHUB_WORKSPACE
3836

39-
- uses: actions/setup-node@v4
37+
- uses: actions/setup-node@v5
4038
with:
4139
cache: 'npm'
4240
cache-dependency-path: |
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Bundler tests
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
bundler-tests:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v5
16+
17+
- uses: actions/setup-node@v5
18+
with:
19+
cache: 'npm'
20+
cache-dependency-path: |
21+
package-lock.json
22+
node-version: 24
23+
- run: npm install -g npm@latest
24+
- name: Install dependencies
25+
run: npm ci
26+
- name: Build TypeScript packages
27+
run: npm run compile
28+
- name: Run bundler tests
29+
run: npm run test:bundle

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,10 @@ jobs:
2525
create-or-update-release-pr:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- name: Fork
29-
run: gh repo fork open-telemetry/opentelemetry-js
30-
env:
31-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
3228
- name: Checkout
3329
uses: actions/checkout@v5
34-
with:
35-
repository: opentelemetrybot/opentelemetry-js
36-
ref: main
37-
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
38-
- name: Sync with upstream
39-
run: |
40-
git remote show origin
41-
git remote add upstream https://github.com/open-telemetry/opentelemetry-js.git
42-
git fetch upstream
43-
git reset --hard upstream/main
44-
git push origin main --force
4530

46-
- uses: actions/setup-node@v4
31+
- uses: actions/setup-node@v5
4732
with:
4833
cache: 'npm'
4934
cache-dependency-path: package-lock.json
@@ -52,14 +37,19 @@ jobs:
5237

5338
- run: npm ci
5439

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+
5546
- name: Create/Update Release PR
5647
run: |
57-
git config user.name opentelemetrybot
58-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
48+
git config user.name otelbot
49+
git config user.email 197425009+otelbot@users.noreply.github.com
5950
npm run github:create_or_update_release_pr
6051
env:
61-
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
52+
GITHUB_TOKEN: ${{ steps.otelbot-token.outputs.token }}
6253
RELEASE_SCOPE: ${{ github.event.inputs.release_scope }}
6354
RELEASE_KIND: ${{ github.event.inputs.release_scope }}:${{ github.event.inputs.release_type }}
6455
RELEASE_PR_REMOTE: origin
65-
RELEASE_PR_OWNER: opentelemetrybot

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v5
1818

19-
- uses: actions/setup-node@v4
19+
- uses: actions/setup-node@v5
2020
with:
2121
cache: 'npm'
2222
cache-dependency-path: |

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v5
2626

27-
- uses: actions/setup-node@v4
27+
- uses: actions/setup-node@v5
2828
with:
2929
cache: 'npm'
3030
cache-dependency-path: |

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

17-
- uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
17+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

0 commit comments

Comments
 (0)