Skip to content

Commit a8b4cd2

Browse files
committed
Merge branch 'main' into next-main-2024-12-04
2 parents 810b618 + 569346b commit a8b4cd2

File tree

262 files changed

+14200
-16716
lines changed

Some content is hidden

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

262 files changed

+14200
-16716
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 58 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,61 @@ 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
@@ -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,20 @@ 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

.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/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Unit tests
4141
run: npm run test
4242
- name: Report Coverage
43-
uses: codecov/codecov-action@v4
43+
uses: codecov/codecov-action@v5
4444
env:
4545
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4646
with:
@@ -96,7 +96,7 @@ jobs:
9696
- name: Unit tests
9797
run: npm run test:browser
9898
- name: Report Coverage
99-
uses: codecov/codecov-action@v4
99+
uses: codecov/codecov-action@v5
100100
env:
101101
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
102102
with:
@@ -124,7 +124,7 @@ jobs:
124124
- name: Unit tests
125125
run: npm run test:webworker
126126
- name: Report Coverage
127-
uses: codecov/codecov-action@v4
127+
uses: codecov/codecov-action@v5
128128
env:
129129
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
130130
with:

CHANGELOG.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,24 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
1313

1414
### :rocket: (Enhancement)
1515

16+
### :bug: (Bug Fix)
17+
18+
* fix(sdk-trace-base): do not load OTEL_ env vars on module load, but when needed [#5224](https://github.com/open-telemetry/opentelemetry-js/pull/5224)
19+
20+
### :books: (Refine Doc)
21+
22+
### :house: (Internal)
23+
24+
## 1.29.0
25+
26+
### :boom: Breaking Change
27+
28+
* feat(sdk-metrics): Add support for aggregation cardinality limit with a default limit of 2000. This limit can be customized via views [#5182](https://github.com/open-telemetry/opentelemetry-js/pull/5128)
29+
30+
## 1.28.0
31+
32+
### :rocket: (Enhancement)
33+
1634
* feat(sdk-metrics, sdk-trace): add `mergeResourceWithDefaults` flag, which allows opting-out of resources getting merged with the default resource [#4617](https://github.com/open-telemetry/opentelemetry-js/pull/4617)
1735
* default: `true` (no change in behavior)
1836
* note: `false` will become the default behavior in the next major version in order to comply with [specification requirements](https://github.com/open-telemetry/opentelemetry-specification/blob/f3511a5ccda376dfd1de76dfa086fc9b35b54757/specification/resource/sdk.md?plain=1#L31-L36)
@@ -22,10 +40,9 @@ For semantic convention package changes, see the [semconv CHANGELOG](packages/se
2240
### :bug: (Bug Fix)
2341

2442
* fix(sdk-metrics): await exports in `PeriodicExportingMetricReader` when async resource attributes have not yet settled [#5119](https://github.com/open-telemetry/opentelemetry-js/pull/5119/) @pichlermarc
25-
26-
### :books: (Refine Doc)
27-
28-
### :house: (Internal)
43+
* fix(sdk-trace): performance.now() may return the same value for consecutive calls [#5150](https://github.com/open-telemetry/opentelemetry-js/pull/5150) @dyladan
44+
* fix(sdk-trace-base): pass BatchSpanProcessor#forceFlush() errors on visibilitychange/pagehide to globalErrorHandler [#5143](https://github.com/open-telemetry/opentelemetry-js/pull/5143) @pichlermarc
45+
* fixes a bug where switching browser tabs with a failing exporter would cause an unhandled error
2946

3047
## 1.27.0
3148

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Reporting bugs is an important contribution. Please make sure to include:
7979
### Before you start
8080

8181
Please read project contribution
82-
[guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
82+
[guide](https://github.com/open-telemetry/community/blob/main/guides/contributor)
8383
for general practices for OpenTelemetry project.
8484

8585
#### Conventional commit
@@ -145,7 +145,7 @@ git merge upstream/main
145145

146146
Remember to always work in a branch of your local copy, as you might otherwise have to contend with conflicts in main.
147147

148-
Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#github-workflow) section of general project contributing guide.
148+
Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/guides/contributor/processes.md#github-workflow) section of general project contributing guide.
149149

150150
## Development
151151

api/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"access": "public"
7878
},
7979
"devDependencies": {
80-
"@types/mocha": "10.0.8",
80+
"@types/mocha": "10.0.10",
8181
"@types/node": "18.6.5",
8282
"@types/sinon": "17.0.3",
8383
"@types/webpack": "5.28.5",
@@ -94,13 +94,13 @@
9494
"karma-webpack": "5.0.1",
9595
"lerna": "6.6.2",
9696
"memfs": "3.5.3",
97-
"mocha": "10.7.3",
97+
"mocha": "10.8.2",
9898
"nyc": "15.1.0",
9999
"sinon": "15.1.2",
100100
"ts-loader": "9.5.1",
101101
"typescript": "4.4.4",
102102
"unionfs": "4.5.4",
103-
"webpack": "5.94.0"
103+
"webpack": "5.96.1"
104104
},
105105
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/api",
106106
"sideEffects": false

api/src/platform/browser/globalThis.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ export const _globalThis: typeof globalThis =
3030
typeof globalThis === 'object'
3131
? globalThis
3232
: typeof self === 'object'
33-
? self
34-
: typeof window === 'object'
35-
? window
36-
: typeof global === 'object'
37-
? global
38-
: ({} as typeof globalThis);
33+
? self
34+
: typeof window === 'object'
35+
? window
36+
: typeof global === 'object'
37+
? global
38+
: ({} as typeof globalThis);

examples/esm-http-ts/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "esm-http-ts",
33
"private": true,
4-
"version": "0.54.2",
4+
"version": "0.56.0",
55
"description": "Example of HTTP integration with OpenTelemetry using ESM and TypeScript",
66
"main": "build/index.js",
77
"type": "module",
@@ -32,12 +32,12 @@
3232
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
3333
"dependencies": {
3434
"@opentelemetry/api": "1.9.0",
35-
"@opentelemetry/exporter-trace-otlp-proto": "0.54.2",
36-
"@opentelemetry/instrumentation": "0.54.2",
37-
"@opentelemetry/instrumentation-http": "0.54.2",
38-
"@opentelemetry/resources": "1.27.0",
39-
"@opentelemetry/sdk-trace-base": "1.27.0",
40-
"@opentelemetry/sdk-trace-node": "1.27.0",
41-
"@opentelemetry/semantic-conventions": "1.27.0"
35+
"@opentelemetry/exporter-trace-otlp-proto": "0.56.0",
36+
"@opentelemetry/instrumentation": "0.56.0",
37+
"@opentelemetry/instrumentation-http": "0.56.0",
38+
"@opentelemetry/resources": "1.29.0",
39+
"@opentelemetry/sdk-trace-base": "1.29.0",
40+
"@opentelemetry/sdk-trace-node": "1.29.0",
41+
"@opentelemetry/semantic-conventions": "1.28.0"
4242
}
4343
}

examples/http/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "http-example",
33
"private": true,
4-
"version": "0.54.2",
4+
"version": "0.56.0",
55
"description": "Example of HTTP integration with OpenTelemetry",
66
"main": "index.js",
77
"scripts": {
@@ -30,14 +30,14 @@
3030
},
3131
"dependencies": {
3232
"@opentelemetry/api": "^1.3.0",
33-
"@opentelemetry/exporter-jaeger": "1.27.0",
34-
"@opentelemetry/exporter-zipkin": "1.27.0",
35-
"@opentelemetry/instrumentation": "0.54.2",
36-
"@opentelemetry/instrumentation-http": "0.54.2",
37-
"@opentelemetry/resources": "1.27.0",
38-
"@opentelemetry/sdk-trace-base": "1.27.0",
39-
"@opentelemetry/sdk-trace-node": "1.27.0",
40-
"@opentelemetry/semantic-conventions": "1.27.0"
33+
"@opentelemetry/exporter-jaeger": "1.29.0",
34+
"@opentelemetry/exporter-zipkin": "1.29.0",
35+
"@opentelemetry/instrumentation": "0.56.0",
36+
"@opentelemetry/instrumentation-http": "0.56.0",
37+
"@opentelemetry/resources": "1.29.0",
38+
"@opentelemetry/sdk-trace-base": "1.29.0",
39+
"@opentelemetry/sdk-trace-node": "1.29.0",
40+
"@opentelemetry/semantic-conventions": "1.28.0"
4141
},
4242
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
4343
"devDependencies": {

examples/https/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "https-example",
33
"private": true,
4-
"version": "0.54.2",
4+
"version": "0.56.0",
55
"description": "Example of HTTPs integration with OpenTelemetry",
66
"main": "build/src/index.js",
77
"types": "build/src/index.d.ts",
@@ -34,14 +34,14 @@
3434
},
3535
"dependencies": {
3636
"@opentelemetry/api": "^1.3.0",
37-
"@opentelemetry/exporter-jaeger": "1.27.0",
38-
"@opentelemetry/exporter-zipkin": "1.27.0",
39-
"@opentelemetry/instrumentation": "0.54.2",
40-
"@opentelemetry/instrumentation-http": "0.54.2",
41-
"@opentelemetry/resources": "1.27.0",
42-
"@opentelemetry/sdk-trace-base": "1.27.0",
43-
"@opentelemetry/sdk-trace-node": "1.27.0",
44-
"@opentelemetry/semantic-conventions": "1.27.0"
37+
"@opentelemetry/exporter-jaeger": "1.29.0",
38+
"@opentelemetry/exporter-zipkin": "1.29.0",
39+
"@opentelemetry/instrumentation": "0.56.0",
40+
"@opentelemetry/instrumentation-http": "0.56.0",
41+
"@opentelemetry/resources": "1.29.0",
42+
"@opentelemetry/sdk-trace-base": "1.29.0",
43+
"@opentelemetry/sdk-trace-node": "1.29.0",
44+
"@opentelemetry/semantic-conventions": "1.28.0"
4545
},
4646
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
4747
"devDependencies": {

0 commit comments

Comments
 (0)