Skip to content

Commit 5073ab3

Browse files
authored
Merge branch 'main' into fix-http-requireparent
2 parents 658e198 + 4f0b628 commit 5073ab3

File tree

1,087 files changed

+89820
-71820
lines changed

Some content is hidden

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

1,087 files changed

+89820
-71820
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 69 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,77 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
Thanks for taking the time to fill out this bug report!
9-
Please make sure to fill out the entire form below,
10-
providing as much context as you can in order to help us
11-
triage and track down your bug as quickly as possible.
8+
> [!IMPORTANT]
9+
> **Please read all parts of this form carefully.** By following the instructions carefully, you ensure that we
10+
> can get started fixing your bug, instead of being stuck at trying to reproduce your issue. Please provide
11+
> all requested information, even if you think it does not apply to your problem.
12+
>
13+
> **If you use a third-party package that re-distributes OpenTelemetry, open the bug ticket with that third party unless you can provide steps to reproduce this with pure OpenTelemetry.**
14+
> Digging into third-party distributions of OpenTelemetry is not in scope for this project.
1215
13-
Before filing a bug, please be sure you have searched through
14-
[existing bugs](https://github.com/open-telemetry/opentelemetry-js/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug)
15-
to see if your bug is already addressed.
16-
17-
If your bug is related to an instrumentation or plugin in [opentelemetry-js-contrib](https://github.com/open-telemetry/opentelemetry-js-contrib)
18-
please be sure to file it there.
16+
Before filing a bug, please be sure you have searched through [existing open bugs](https://github.com/open-telemetry/opentelemetry-js/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3Abug)
17+
to see if this bug has already been filed.
18+
- type: markdown
19+
attributes:
20+
value: |
21+
## Bug Reproduction
1922
- type: textarea
2023
attributes:
2124
label: What happened?
22-
description: Please provide as much detail as you reasonably can.
25+
description: |
26+
> [!IMPORTANT]
27+
> **Please provide as much detail as you reasonably can.**
28+
> We all know the complexities of developing with JavaScript/TypeScript. **Be specific** about your setup and **DO NOT** assume that the person handling your bug report knows how to use your specific combination of tooling. Always provide build instructions and config files.
2329
value: |
2430
## Steps to Reproduce
25-
31+
<!--
32+
The most effective way to solve a bug is to provide a link to a reproducer repository. It is extremely difficult to exactly reproduce problems
33+
and doing so can take multiple hours for us. You know your tooling and setup and we know OpenTelemetry JavaScript internals.
34+
Let's help each other! :)
35+
-->
2636
## Expected Result
2737
2838
## Actual Result
2939
3040
## Additional Details
41+
<!--
42+
Anything you can think of that will help us reproduce and understand your problem:
43+
- details about the behavior of the bug
44+
- code to reproduce, if not provided via a repository above (including setting up any frameworks you may be using, we likely don't use the same tech-stack that you're using on the daily)
45+
- which tooling you use and how you're using it
46+
- config files for your tooling (typescript, bundlers, ...)
47+
- how you run your code (example: `node -r otel.js ./index.js`).
48+
- which module type you are you using (`module` or `commonjs`)
49+
-->
50+
3151
3252
validations:
3353
required: true
3454
- type: textarea
3555
attributes:
3656
label: OpenTelemetry Setup Code
37-
description: Please provide the code you use to set up OpenTelemetry
57+
description: |
58+
Please provide the code you use to set up OpenTelemetry.
59+
If you use `@opentelemetry/auto-instrumentations-node/register`, please state so here.
60+
You may omit this step if you have provided a reproducer repository.
3861
placeholder: | # This comes from our README.md
39-
// tracing.js
62+
// otel.js
4063
4164
'use strict'
4265
4366
const process = require('process');
4467
const opentelemetry = require('@opentelemetry/sdk-node');
4568
const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
4669
const { ConsoleSpanExporter } = require('@opentelemetry/sdk-trace-base');
47-
const { Resource } = require('@opentelemetry/resources');
48-
const { SEMRESATTRS_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
70+
const { resourceFromAttributes } = require('@opentelemetry/resources');
71+
const { ATTR_SERVICE_NAME } = require('@opentelemetry/semantic-conventions');
4972
5073
// configure the SDK to export telemetry data to the console
5174
// enable all auto-instrumentations from the meta package
5275
const traceExporter = new ConsoleSpanExporter();
5376
const sdk = new opentelemetry.NodeSDK({
54-
resource: new Resource({
55-
[SEMRESATTRS_SERVICE_NAME]: 'my-service',
77+
resource: resourceFromAttributes({
78+
[ATTR_SERVICE_NAME]: 'my-service',
5679
}),
5780
traceExporter,
5881
instrumentations: [getNodeAutoInstrumentations()]
@@ -75,13 +98,15 @@ body:
7598
- type: textarea
7699
attributes:
77100
label: package.json
78-
description: If possible, please provide your full package.json. If not, please provide at least your list of dependencies and their versions, especially OpenTelemetry versions.
101+
description: |
102+
Please provide your the full package.json needed to reproduce the issue.
103+
You may omit this step if you provided a reproducer repository.
79104
render: "JSON"
80105
placeholder: |
81106
{
82107
"name": "my-app",
83108
"scripts": {
84-
"start": "node -r tracing.js app.js"
109+
"start": "node -r otel.js app.js"
85110
},
86111
"dependencies": {
87112
"@opentelemetry/api": "^1.3.0",
@@ -95,3 +120,27 @@ body:
95120
description: |
96121
Please copy and paste any relevant log output.
97122
render: shell
123+
- type: markdown
124+
attributes:
125+
value: |
126+
## System Details
127+
System Details help us when we cannot reproduce your problem with the information provided above. Sometimes bugs only surface on specific platforms and runtime versions.
128+
- type: textarea
129+
attributes:
130+
label: Operating System and Version
131+
placeholder: Ubuntu 24.04, Windows 11 Build 26100.2033, macOS 15.0.1
132+
validations:
133+
required: false
134+
- type: textarea
135+
attributes:
136+
label: Runtime and Version
137+
placeholder: Node.js v20.12.1, Node.js v18.18.2, Firefox 130, Chrome 132, ...
138+
validations:
139+
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/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Before creating a pull request, please make sure:
77
- You have read the guide for contributing
88
- See https://github.com/open-telemetry/opentelemetry-js/blob/main/CONTRIBUTING.md
99
- You signed all your commits (otherwise we won't be able to merge the PR)
10-
- See https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#sign-the-cla
10+
- See https://github.com/open-telemetry/community/blob/main/guides/contributor#sign-the-cla
1111
- You added unit tests for the new functionality
1212
- You mention in the PR description which issue it is addressing, e.g. "Fixes #xxx". This will auto-close
1313
the issue that your PR fixes (if such)

.github/workflows/benchmark.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,37 @@ on:
44
push:
55
branches: [ main ]
66

7+
permissions:
8+
contents: read
9+
710
jobs:
811
benchmark-tests:
12+
permissions:
13+
contents: write # required for pushing benchmark results to gh-pages
914
strategy:
1015
fail-fast: false
1116
matrix:
1217
node_version:
13-
- "18"
14-
runs-on: self-hosted
18+
- "22"
19+
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
20+
container:
21+
image: ubuntu:24.04
1522
timeout-minutes: 10
16-
env:
17-
NPM_CONFIG_UNSAFE_PERM: true
1823
steps:
24+
# Apt packages:
25+
# - git: Needed for 'npm run submodule'
26+
- name: Setup container environment
27+
run: |
28+
apt-get update && apt-get install --fix-missing -y git
29+
1930
- name: Checkout
20-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
32+
33+
# Avoid "detected dubious ownership in repository" error when running
34+
# `npm run submodule`.
35+
- run: git config --global --add safe.directory $GITHUB_WORKSPACE
2136

22-
- uses: actions/setup-node@v4
37+
- uses: actions/setup-node@v5
2338
with:
2439
cache: 'npm'
2540
cache-dependency-path: |

.github/workflows/changelog.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This action requires that any PR targeting the main branch should touch at
1+
# This action requires that any PR targeting the main and next branch should touch at
22
# least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
33
# Changelog" label to disable this action.
44

@@ -9,13 +9,16 @@ on:
99
types: [opened, synchronize, reopened, labeled, unlabeled]
1010
branches:
1111
- main
12+
- next
13+
permissions:
14+
contents: read
1215
jobs:
1316
changelog:
1417
runs-on: ubuntu-latest
1518
if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')}}
1619

1720
steps:
18-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
1922

2023
- name: Check for CHANGELOG changes
2124
run: |

.github/workflows/close-stale.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@ on:
33
schedule:
44
- cron: '30 6 * * 1'
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
stale:
11+
permissions:
12+
issues: write # required for closing stale issues
13+
pull-requests: write # required for closing stale PRs
814
runs-on: ubuntu-latest
915
steps:
1016
- uses: actions/stale@v9

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@ on:
66
branches: [ main ]
77
pull_request:
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
CodeQL-Build:
14+
permissions:
15+
security-events: write
1116
runs-on: ubuntu-latest
1217

1318
steps:
1419
- name: Checkout repository
15-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
1621

1722
# Initializes the CodeQL tools for scanning.
1823
- name: Initialize CodeQL
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Create or Update Release PR
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release_type:
7+
type: choice
8+
description: Release type
9+
options:
10+
- patch
11+
- minor
12+
release_scope:
13+
type: choice
14+
description: Release Scope
15+
options:
16+
- experimental # all packages in experimental/packages
17+
- sdk # all SDK packages, experimental and stable, excluding semantic conventions
18+
- all # all release packages, including API, excluding semconv
19+
- semconv # only semantic convention package
20+
21+
permissions:
22+
contents: read
23+
24+
jobs:
25+
create-or-update-release-pr:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: Fork
29+
run: gh repo fork open-telemetry/opentelemetry-js
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
32+
- name: Checkout
33+
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
45+
46+
- uses: actions/setup-node@v5
47+
with:
48+
cache: 'npm'
49+
cache-dependency-path: package-lock.json
50+
node-version: 22
51+
- run: npm install -g npm@latest
52+
53+
- run: npm ci
54+
55+
- name: Create/Update Release PR
56+
run: |
57+
git config user.name opentelemetrybot
58+
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
59+
npm run github:create_or_update_release_pr
60+
env:
61+
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
62+
RELEASE_SCOPE: ${{ github.event.inputs.release_scope }}
63+
RELEASE_KIND: ${{ github.event.inputs.release_scope }}:${{ github.event.inputs.release_type }}
64+
RELEASE_PR_REMOTE: origin
65+
RELEASE_PR_OWNER: opentelemetrybot

0 commit comments

Comments
 (0)