Skip to content

Commit bcaef1c

Browse files
JamieDanielsonJamieDanielson
authored
Merge branch 'main' into esm-support
2 parents 16109d3 + 8fc7689 commit bcaef1c

52 files changed

Lines changed: 315 additions & 332 deletions

File tree

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,23 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1111

1212
### :rocket: (Enhancement)
1313

14+
### :bug: (Bug Fix)
15+
16+
### :books: (Refine Doc)
17+
18+
### :house: (Internal)
19+
20+
## 1.13.0
21+
22+
### :rocket: (Enhancement)
23+
1424
* feat(core): add environment variables for OTLP log exporters. [#3712](https://github.com/open-telemetry/opentelemetry-js/pull/3712/) @llc1123
1525

1626
### :bug: (Bug Fix)
1727

1828
* fix(http-instrumentation): stop listening to `request`'s `close` event once it has emitted `response` [#3625](https://github.com/open-telemetry/opentelemetry-js/pull/3625) @SimenB
1929
* fix(sdk-node): fix initialization in bundled environments by not loading @opentelemetry/exporter-jaeger [#3739](https://github.com/open-telemetry/opentelemetry-js/pull/3739) @pichlermarc
2030

21-
### :books: (Refine Doc)
22-
23-
### :house: (Internal)
24-
2531
## 1.12.0
2632

2733
### :rocket: (Enhancement)

‎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.37.0",
4+
"version": "0.39.0",
55
"description": "Example of HTTP integration with OpenTelemetry",
66
"main": "index.js",
77
"scripts": {
@@ -29,14 +29,14 @@
2929
},
3030
"dependencies": {
3131
"@opentelemetry/api": "^1.3.0",
32-
"@opentelemetry/exporter-jaeger": "1.9.1",
33-
"@opentelemetry/exporter-zipkin": "1.9.1",
34-
"@opentelemetry/instrumentation": "0.35.1",
35-
"@opentelemetry/instrumentation-http": "0.35.1",
36-
"@opentelemetry/resources": "1.9.1",
37-
"@opentelemetry/sdk-trace-base": "1.9.1",
38-
"@opentelemetry/sdk-trace-node": "1.9.1",
39-
"@opentelemetry/semantic-conventions": "1.9.1"
32+
"@opentelemetry/exporter-jaeger": "1.13.0",
33+
"@opentelemetry/exporter-zipkin": "1.13.0",
34+
"@opentelemetry/instrumentation": "0.39.0",
35+
"@opentelemetry/instrumentation-http": "0.39.0",
36+
"@opentelemetry/resources": "1.13.0",
37+
"@opentelemetry/sdk-trace-base": "1.13.0",
38+
"@opentelemetry/sdk-trace-node": "1.13.0",
39+
"@opentelemetry/semantic-conventions": "1.13.0"
4040
},
4141
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/http",
4242
"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.38.0",
4+
"version": "0.39.0",
55
"description": "Example of HTTPs integration with OpenTelemetry",
66
"main": "build/src/index.js",
77
"types": "build/src/index.d.ts",
@@ -33,14 +33,14 @@
3333
},
3434
"dependencies": {
3535
"@opentelemetry/api": "^1.0.0",
36-
"@opentelemetry/exporter-jaeger": "1.12.0",
37-
"@opentelemetry/exporter-zipkin": "1.12.0",
38-
"@opentelemetry/instrumentation": "0.38.0",
39-
"@opentelemetry/instrumentation-http": "0.38.0",
40-
"@opentelemetry/resources": "1.12.0",
41-
"@opentelemetry/sdk-trace-base": "1.12.0",
42-
"@opentelemetry/sdk-trace-node": "1.12.0",
43-
"@opentelemetry/semantic-conventions": "1.12.0"
36+
"@opentelemetry/exporter-jaeger": "1.13.0",
37+
"@opentelemetry/exporter-zipkin": "1.13.0",
38+
"@opentelemetry/instrumentation": "0.39.0",
39+
"@opentelemetry/instrumentation-http": "0.39.0",
40+
"@opentelemetry/resources": "1.13.0",
41+
"@opentelemetry/sdk-trace-base": "1.13.0",
42+
"@opentelemetry/sdk-trace-node": "1.13.0",
43+
"@opentelemetry/semantic-conventions": "1.13.0"
4444
},
4545
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
4646
"devDependencies": {

‎examples/opentelemetry-web/package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "web-opentelemetry-example",
33
"private": true,
4-
"version": "0.38.0",
4+
"version": "0.39.0",
55
"description": "Example of using @opentelemetry/sdk-trace-web and @opentelemetry/sdk-metrics in browser",
66
"main": "index.js",
77
"scripts": {
@@ -43,20 +43,20 @@
4343
},
4444
"dependencies": {
4545
"@opentelemetry/api": "^1.3.0",
46-
"@opentelemetry/context-zone": "1.12.0",
47-
"@opentelemetry/core": "1.12.0",
48-
"@opentelemetry/exporter-metrics-otlp-http": "0.38.0",
49-
"@opentelemetry/exporter-trace-otlp-http": "0.38.0",
50-
"@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
51-
"@opentelemetry/exporter-zipkin": "1.12.0",
52-
"@opentelemetry/instrumentation": "0.38.0",
53-
"@opentelemetry/instrumentation-fetch": "0.38.0",
54-
"@opentelemetry/instrumentation-xml-http-request": "0.38.0",
55-
"@opentelemetry/propagator-b3": "1.12.0",
56-
"@opentelemetry/sdk-metrics": "1.12.0",
57-
"@opentelemetry/sdk-trace-base": "1.12.0",
58-
"@opentelemetry/sdk-trace-web": "1.12.0",
59-
"@opentelemetry/semantic-conventions": "1.12.0"
46+
"@opentelemetry/context-zone": "1.13.0",
47+
"@opentelemetry/core": "1.13.0",
48+
"@opentelemetry/exporter-metrics-otlp-http": "0.39.0",
49+
"@opentelemetry/exporter-trace-otlp-http": "0.39.0",
50+
"@opentelemetry/exporter-trace-otlp-proto": "0.39.0",
51+
"@opentelemetry/exporter-zipkin": "1.13.0",
52+
"@opentelemetry/instrumentation": "0.39.0",
53+
"@opentelemetry/instrumentation-fetch": "0.39.0",
54+
"@opentelemetry/instrumentation-xml-http-request": "0.39.0",
55+
"@opentelemetry/propagator-b3": "1.13.0",
56+
"@opentelemetry/sdk-metrics": "1.13.0",
57+
"@opentelemetry/sdk-trace-base": "1.13.0",
58+
"@opentelemetry/sdk-trace-web": "1.13.0",
59+
"@opentelemetry/semantic-conventions": "1.13.0"
6060
},
6161
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/tracer-web"
6262
}

‎examples/otlp-exporter-node/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "example-otlp-exporter-node",
33
"private": true,
4-
"version": "0.38.0",
4+
"version": "0.39.0",
55
"description": "Example of using @opentelemetry/collector-exporter in Node.js",
66
"main": "index.js",
77
"scripts": {
@@ -29,17 +29,17 @@
2929
},
3030
"dependencies": {
3131
"@opentelemetry/api": "^1.3.0",
32-
"@opentelemetry/core": "1.12.0",
33-
"@opentelemetry/exporter-metrics-otlp-grpc": "0.38.0",
34-
"@opentelemetry/exporter-metrics-otlp-http": "0.38.0",
35-
"@opentelemetry/exporter-metrics-otlp-proto": "0.38.0",
36-
"@opentelemetry/exporter-trace-otlp-grpc": "0.38.0",
37-
"@opentelemetry/exporter-trace-otlp-http": "0.38.0",
38-
"@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
39-
"@opentelemetry/resources": "1.12.0",
40-
"@opentelemetry/sdk-metrics": "1.12.0",
41-
"@opentelemetry/sdk-trace-base": "1.12.0",
42-
"@opentelemetry/semantic-conventions": "1.12.0"
32+
"@opentelemetry/core": "1.13.0",
33+
"@opentelemetry/exporter-metrics-otlp-grpc": "0.39.0",
34+
"@opentelemetry/exporter-metrics-otlp-http": "0.39.0",
35+
"@opentelemetry/exporter-metrics-otlp-proto": "0.39.0",
36+
"@opentelemetry/exporter-trace-otlp-grpc": "0.39.0",
37+
"@opentelemetry/exporter-trace-otlp-http": "0.39.0",
38+
"@opentelemetry/exporter-trace-otlp-proto": "0.39.0",
39+
"@opentelemetry/resources": "1.13.0",
40+
"@opentelemetry/sdk-metrics": "1.13.0",
41+
"@opentelemetry/sdk-trace-base": "1.13.0",
42+
"@opentelemetry/semantic-conventions": "1.13.0"
4343
},
4444
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
4545
}

‎experimental/CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,18 @@ All notable changes to experimental packages in this project will be documented
88

99
### :rocket: (Enhancement)
1010

11-
* feat(instrumentation): add ESM support for instrumentation [#3698](https://github.com/open-telemetry/opentelemetry-js/pull/3698) @JamieDanielson, @pkanal, @vmarchaud, @lizthegrey, @bengl
11+
* feat(instrumentation): add ESM support for instrumentation. [#3698](https://github.com/open-telemetry/opentelemetry-js/pull/3698) @JamieDanielson, @pkanal, @vmarchaud, @lizthegrey, @bengl
12+
13+
### :bug: (Bug Fix)
14+
15+
### :books: (Refine Doc)
16+
17+
### :house: (Internal)
18+
19+
## 0.39.0
20+
21+
### :rocket: (Enhancement)
22+
1223
* feat(otlp-transformer): support log records. [#3712](https://github.com/open-telemetry/opentelemetry-js/pull/3712/) @llc1123
1324
* feat(otlp-grpc-exporter-base): support log records. [#3712](https://github.com/open-telemetry/opentelemetry-js/pull/3712/) @llc1123
1425
* feat(exporter-logs-otlp-grpc): otlp-grpc exporter for logs. [#3712](https://github.com/open-telemetry/opentelemetry-js/pull/3712/) @llc1123
@@ -22,6 +33,8 @@ All notable changes to experimental packages in this project will be documented
2233

2334
### :books: (Refine Doc)
2435

36+
* doc(instrumentation): add limitiations section to readme [#3786](https://github.com/open-telemetry/opentelemetry-js/pull/3786) @flarna
37+
2538
### :house: (Internal)
2639

2740
## 0.38.0

‎experimental/backwards-compatability/node14/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node14",
3-
"version": "0.38.0",
3+
"version": "0.39.0",
44
"private": true,
55
"description": "Backwards compatability app for node 14 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
@@ -9,8 +9,8 @@
99
"peer-api-check": "node ../../../scripts/peer-api-check.js"
1010
},
1111
"dependencies": {
12-
"@opentelemetry/sdk-node": "0.38.0",
13-
"@opentelemetry/sdk-trace-base": "1.12.0"
12+
"@opentelemetry/sdk-node": "0.39.0",
13+
"@opentelemetry/sdk-trace-base": "1.13.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "14.18.25",

‎experimental/backwards-compatability/node16/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node16",
3-
"version": "0.38.0",
3+
"version": "0.39.0",
44
"private": true,
55
"description": "Backwards compatability app for node 16 types and the OpenTelemetry Node.js SDK",
66
"main": "index.js",
@@ -9,8 +9,8 @@
99
"peer-api-check": "node ../../../scripts/peer-api-check.js"
1010
},
1111
"dependencies": {
12-
"@opentelemetry/sdk-node": "0.38.0",
13-
"@opentelemetry/sdk-trace-base": "1.12.0"
12+
"@opentelemetry/sdk-node": "0.39.0",
13+
"@opentelemetry/sdk-trace-base": "1.13.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "16.11.52",

‎experimental/examples/logs/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"name": "logs-example",
3-
"version": "0.1.0",
3+
"version": "0.2.0",
44
"private": true,
55
"scripts": {
66
"start": "ts-node index.ts"
77
},
88
"dependencies": {
99
"@opentelemetry/api": "^1.4.1",
10-
"@opentelemetry/api-logs": "^0.38.0",
11-
"@opentelemetry/sdk-logs": "^0.38.0"
10+
"@opentelemetry/api-logs": "0.39.0",
11+
"@opentelemetry/sdk-logs": "0.39.0"
1212
},
1313
"devDependencies": {
14-
"ts-node": "^10.9.1",
15-
"@types/node": "18.6.5"
14+
"@types/node": "18.6.5",
15+
"ts-node": "^10.9.1"
1616
}
1717
}

‎experimental/examples/prometheus/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prometheus-example",
3-
"version": "0.38.0",
3+
"version": "0.39.0",
44
"private": true,
55
"description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus",
66
"main": "index.js",
@@ -11,7 +11,7 @@
1111
"license": "Apache-2.0",
1212
"dependencies": {
1313
"@opentelemetry/api": "^1.3.0",
14-
"@opentelemetry/exporter-prometheus": "0.38.0",
15-
"@opentelemetry/sdk-metrics": "1.12.0"
14+
"@opentelemetry/exporter-prometheus": "0.39.0",
15+
"@opentelemetry/sdk-metrics": "1.13.0"
1616
}
1717
}

0 commit comments

Comments
 (0)
⚡