Skip to content

Commit ea8bfa2

Browse files
dyladanpichlermarcstrivlytrentmlyzlisa
authored
[next] merge changes from main (#4363)
* Add Trent to approvers (#4311) * chore(renovate): require dashboard approval for lerna updates (#4276) * chore(ci): install semver globally to speed up "peer-api" workflow (#4270) Closes: #4242 * fix(ci): remove token setup via environment variable from .npmrc (#4329) * fix(instrumentation-http): resume responses when there is no response listener Fixes a memory leak where unhandled response bodies pile up in node 20 * feat: add script to update changelogs on release preparation (#4315) * feat: add script to update changelogs on releases * fix: address comments * Apply suggestions from code review Co-authored-by: Trent Mick <[email protected]> * fix: apply suggestions from code review * fix: use packageJson.version instead of version --------- Co-authored-by: Trent Mick <[email protected]> * Fix event name * test: make rawRequest HTTP-compliant * Add node 20 to test matrix * Enable old hash functions on 20 * Fix esm handling for iitm node 20 * Use err.code to make test more reliable * Changelog * nit: single import * Remove unused files * Add v20 to supported runtimes * ci: add npm cache in actions/setup-node (#4271) * feat(sdk-logs): add droppedAttributesCount field to ReadableLogRecord (#4289) * feat(sdk-logs): add droppedAttributesCount field to ReadableLogRecord * chore: check droppedAttributesCount value in test case * feat(otlp-transformer): make toLogRecord() use ReadableLogRecord.droppedAttributesCount --------- Co-authored-by: Marc Pichler <[email protected]> * fix(api-logs): allow passing in TimeInput for LogRecord (#4345) * fix: allow passing in TimeInput for LogRecord * chore: update changelog * fix: programmatic url and headers take precedence in metric exporters… (#4334) * fix: programmatic url and headers take precedence in metric exporters (#2370) * chore: adjust grpc exporter metrics test * chore(changelog): update changelog * fix(instrumentation-http): do not mutate given headers object for outgoing http requests (#4346) Fixes: open-telemetry/opentelemetry-js-contrib#1609 * chore(deps): update actions/stale action to v9 (#4353) * fix(deps): update dependency import-in-the-middle to v1.6.0 (#4357) * chore(deps): update all patch versions (#4306) * chore(ci): use node 20 in lint workflow (#4359) * chore(deps): update dependency linkinator to v6 (#4237) * fix(otlp-exporter-base): decrease default concurrency limit to 30 (#4211) * fix(otlp-exporter-base): decrease concurrency limit to 30 * fix(changelog): add changelog entry * chore(deps): use actions/checkout >4 instead of 4.0.0 exactly (#4361) --------- Co-authored-by: Marc Pichler <[email protected]> Co-authored-by: strivly <[email protected]> Co-authored-by: Trent Mick <[email protected]> Co-authored-by: lyzlisa <[email protected]> Co-authored-by: Hyun Oh <[email protected]> Co-authored-by: Siim Kallas <[email protected]> Co-authored-by: Vladimir Adamić <[email protected]> Co-authored-by: Mend Renovate <[email protected]>
1 parent 09bdeba commit ea8bfa2

File tree

76 files changed

+914
-492
lines changed

Some content is hidden

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

76 files changed

+914
-492
lines changed

.github/workflows/benchmark.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ jobs:
1717
NPM_CONFIG_UNSAFE_PERM: true
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- uses: actions/setup-node@v4
2323
with:
24+
cache: 'npm'
25+
cache-dependency-path: |
26+
package-lock.json
2427
node-version: ${{ matrix.node_version }}
2528

2629
- run: npm install -g npm@latest

.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v8
10+
- uses: actions/stale@v9
1111
with:
1212
days-before-stale: 60
1313
days-before-close: 14

.github/workflows/docs.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313

1414
- uses: actions/setup-node@v4
1515
with:
16+
cache: 'npm'
17+
cache-dependency-path: |
18+
package-lock.json
1619
node-version: '18'
1720

1821
- name: Install and Build 🔧

.github/workflows/lint.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
1517
- uses: actions/setup-node@v4
1618
with:
17-
node-version: 18
18-
19-
- uses: actions/checkout@v4
19+
cache: 'npm'
20+
cache-dependency-path: |
21+
package-lock.json
22+
node-version: '20'
2023

2124
- name: Lint changelog file
2225
uses: avto-dev/markdown-lint@v1

.github/workflows/peer-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: npm install -g [email protected]
2121

2222
- name: Install semver
23-
run: npm install semver
23+
run: npm install -g semver
2424

2525
- name: Check API dependency semantics
2626
working-directory: packages

.github/workflows/unit-test.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
matrix:
1414
node_version:
1515
- "18"
16-
# - "20" # disabled until http instrumentation can be fixed
16+
- "20"
1717
runs-on: ubuntu-latest
1818
env:
1919
NPM_CONFIG_UNSAFE_PERM: true
@@ -23,6 +23,9 @@ jobs:
2323

2424
- uses: actions/setup-node@v4
2525
with:
26+
cache: 'npm'
27+
cache-dependency-path: |
28+
package-lock.json
2629
node-version: ${{ matrix.node_version }}
2730

2831
- run: npm install -g npm@latest
@@ -51,6 +54,9 @@ jobs:
5154

5255
- uses: actions/setup-node@v4
5356
with:
57+
cache: 'npm'
58+
cache-dependency-path: |
59+
package-lock.json
5460
node-version: '18'
5561

5662
- run: npm install -g npm@latest
@@ -77,6 +83,9 @@ jobs:
7783

7884
- uses: actions/setup-node@v4
7985
with:
86+
cache: 'npm'
87+
cache-dependency-path: |
88+
package-lock.json
8089
node-version: 18
8190

8291
- name: Bootstrap
@@ -95,9 +104,12 @@ jobs:
95104
NPM_CONFIG_UNSAFE_PERM: true
96105
steps:
97106
- name: Checkout
98-
uses: actions/checkout@v4.0.0
107+
uses: actions/checkout@v4
99108
- uses: actions/setup-node@v4
100109
with:
110+
cache: 'npm'
111+
cache-dependency-path: |
112+
package-lock.json
101113
node-version: 18
102114

103115
- name: Bootstrap
@@ -127,6 +139,9 @@ jobs:
127139

128140
- uses: actions/setup-node@v4
129141
with:
142+
cache: 'npm'
143+
cache-dependency-path: |
144+
package-lock.json
130145
node-version: ${{ matrix.node_version }}
131146

132147
- name: Build

.github/workflows/w3c-integration-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616

1717
- uses: actions/setup-node@v4
1818
with:
19+
cache: 'npm'
20+
cache-dependency-path: |
21+
package-lock.json
1922
node-version: 18
2023

2124
- name: Install and Bootstrap 🔧

.npmrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
//registry.npmjs.org/:_authToken=${NPM_TOKEN}
21
lockfile-version=2

CHANGELOG.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
99

1010
### :boom: Breaking Change
1111

12+
* fix(otlp-exporter-base)!: decrease default concurrency limit to 30 [#4211](https://github.com/open-telemetry/opentelemetry-js/pull/4211) @pichlermarc
13+
* fixes a memory leak on prolonged collector unavailability
14+
* this change is marked as breaking as it changes defaults
15+
1216
### :rocket: (Enhancement)
1317

1418
### :books: (Refine Doc)
@@ -17,9 +21,11 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1721

1822
* chore: type reference on zone.js [#4257](https://github.com/open-telemetry/opentelemetry-js/pull/4257) @legendecas
1923
* chore: no need for 'packages' in lerna.json [#4264](https://github.com/open-telemetry/opentelemetry-js/pull/4264) @trentm
24+
* test: add node 20 to test matrix [#4336](https://github.com/open-telemetry/opentelemetry-js/pull/4336) @dyladan
2025

2126
### :bug: (Bug Fix)
2227

28+
* fix(api-logs): allow for TimeInput type for LogRecord timestamps [#4345](https://github.com/open-telemetry/opentelemetry-js/pull/4345)
2329
* fix(sdk-trace-web): only access location if it is defined [#4063](https://github.com/open-telemetry/opentelemetry-js/pull/4063)
2430
* fix(sdk-trace-base): processor onStart called with a span having empty attributes
2531

@@ -365,16 +371,8 @@ There are no changes between 1.0.0 and the previous 0.33.0 version.
365371

366372
* fix(sdk-web): parse url with relative url string [#2972](https://github.com/open-telemetry/opentelemetry-js/pull/2972) @legendecas
367373

368-
### :books: (Refine Doc)
369-
370-
### :house: (Internal)
371-
372374
## 1.2.0
373375

374-
### :boom: Breaking Change
375-
376-
### :rocket: (Enhancement)
377-
378376
### :bug: (Bug Fix)
379377

380378
* fix: sanitize attributes inputs [#2881](https://github.com/open-telemetry/opentelemetry-js/pull/2881) @legendecas
@@ -2290,7 +2288,9 @@ Released 2020-03-19
22902288

22912289
Released 2020-03-16
22922290

2293-
### This is a first official beta release, which provides almost fully complete metrics, tracing, and context propagation functionality but makes no promises around breaking changes
2291+
### First official beta release
2292+
2293+
* provides almost fully complete metrics, tracing, and context propagation functionality but makes **no promises** around breaking changes
22942294

22952295
### :boom: Breaking Change
22962296

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ If you are a library author looking to build OpenTelemetry into your library, pl
111111

112112
| Platform Version | Supported |
113113
|---------------------|-----------------------------------------------|
114+
| Node.JS `v20` | :heavy_check_mark: |
114115
| Node.JS `v18` | :heavy_check_mark: |
115116
| Node.JS `v16` | :heavy_check_mark: |
116117
| Node.JS `v14` | :heavy_check_mark: |
@@ -210,6 +211,7 @@ We have a weekly SIG meeting! See the [community page](https://github.com/open-t
210211
- [Neville Wylie](https://github.com/MSNev), Microsoft
211212
- [Purvi Kanal](https://github.com/pkanal), Honeycomb
212213
- [Svetlana Brennan](https://github.com/svetlanabrennan), New Relic
214+
- [Trent Mick](https://github.com/trentm), Elastic
213215

214216
*Find more about the approver role in [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
215217

0 commit comments

Comments
 (0)