Skip to content

Commit 2e7fd1e

Browse files
legendecaslegendecas
authored
Merge branch 'main' into metrics/flush
2 parents af565d4 + 08f597f commit 2e7fd1e

File tree

55 files changed

+474
-341
lines changed

Some content is hidden

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

55 files changed

+474
-341
lines changed

‎CHANGELOG.md

+11-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
1111

1212
### :rocket: (Enhancement)
1313

14-
* feat(api): add `getActiveBaggage` API [#3385](https://github.com/open-telemetry/opentelemetry-js/pull/3385)
14+
### :bug: (Bug Fix)
15+
16+
### :books: (Refine Doc)
17+
18+
### :house: (Internal)
19+
20+
## 1.9.0
21+
22+
### :rocket: (Enhancement)
23+
1524
* feat(instrumentation-grpc): set net.peer.name and net.peer.port on client spans [#3430](https://github.com/open-telemetry/opentelemetry-js/pull/3430)
1625

1726
### :bug: (Bug Fix)
@@ -22,13 +31,12 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
2231
* `telemetry.sdk.name`
2332
* `telemetry.sdk.language`
2433
* `telemetry.sdk.version`
34+
* fix(sdk-trace): make spans resilient to clock drift [#3434](https://github.com/open-telemetry/opentelemetry-js/pull/3434) @dyladan
2535
* fix(selenium-tests): updated webpack version for selenium test issue [#3456](https://github.com/open-telemetry/opentelemetry-js/issues/3456) @SaumyaBhushan
2636
* fix(sdk-metrics): collect metrics when periodic exporting metric reader flushes [#3517](https://github.com/open-telemetry/opentelemetry-js/pull/3517) @legendecas
2737
* fix(sdk-metrics): fix duplicated registration of metrics for collectors [#3488](https://github.com/open-telemetry/opentelemetry-js/pull/3488) @legendecas
2838
* fix(core): fix precision loss in numberToHrtime [#3480](https://github.com/open-telemetry/opentelemetry-js/pull/3480) @legendecas
2939

30-
### :books: (Refine Doc)
31-
3240
### :house: (Internal)
3341

3442
* chore: automatically generate tsconfigs [#3432](https://github.com/open-telemetry/opentelemetry-js/pull/3432) @legendecas

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ The below table describes which versions of each set of packages are expected to
140140

141141
| API | Stable Packages | Experimental Packages |
142142
| ----- | --------------- | --------------------- |
143+
| 1.3.x | 1.9.x | 0.35.x |
143144
| 1.3.x | 1.8.x | 0.34.x |
144145
| 1.2.x | 1.7.x | 0.33.x |
145146
| 1.2.x | 1.6.x | 0.32.x |

‎api/CHANGELOG.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
## Unreleased
5+
## 1.4.0
6+
7+
### :rocket: (Enhancement)
8+
9+
* feat(api): add `getActiveBaggage` API [#3385](https://github.com/open-telemetry/opentelemetry-js/pull/3385)
10+
11+
### :bug: (Bug Fix)
612

713
* fix(api): deprecate MetricAttributes and MetricAttributeValue [#3406](https://github.com/open-telemetry/opentelemetry-js/pull/3406) @blumamir
8-
* test(api): disable module concatenation in tree-shaking test [#3409](https://github.com/open-telemetry/opentelemetry-js/pull/3409) @legendecas
914
* fix(api): use active context as default in NoopTracer [#3476](https://github.com/open-telemetry/opentelemetry-js/pull/3476) @flarna
1015
* fix(api): declare this parameter type in observable callbacks [#3497](https://github.com/open-telemetry/opentelemetry-js/pull/3497) @legendecas
1116

17+
### :house: (Internal)
18+
19+
* test(api): disable module concatenation in tree-shaking test [#3409](https://github.com/open-telemetry/opentelemetry-js/pull/3409) @legendecas
20+
1221
## [1.3.0](https://www.github.com/open-telemetry/opentelemetry-js-api/compare/v1.2.0...v1.3.0)
1322

1423
* feat(api): merge api-metrics into api [#3374](https://github.com/open-telemetry/opentelemetry-js/pull/3374) @legendecas

‎api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/api",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "Public API for OpenTelemetry",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",

‎examples/https/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "https-example",
33
"private": true,
4-
"version": "0.34.0",
4+
"version": "0.35.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.8.0",
37-
"@opentelemetry/exporter-zipkin": "1.8.0",
38-
"@opentelemetry/instrumentation": "0.34.0",
39-
"@opentelemetry/instrumentation-http": "0.34.0",
40-
"@opentelemetry/resources": "1.8.0",
41-
"@opentelemetry/sdk-trace-base": "1.8.0",
42-
"@opentelemetry/sdk-trace-node": "1.8.0",
43-
"@opentelemetry/semantic-conventions": "1.8.0"
36+
"@opentelemetry/exporter-jaeger": "1.9.0",
37+
"@opentelemetry/exporter-zipkin": "1.9.0",
38+
"@opentelemetry/instrumentation": "0.35.0",
39+
"@opentelemetry/instrumentation-http": "0.35.0",
40+
"@opentelemetry/resources": "1.9.0",
41+
"@opentelemetry/sdk-trace-base": "1.9.0",
42+
"@opentelemetry/sdk-trace-node": "1.9.0",
43+
"@opentelemetry/semantic-conventions": "1.9.0"
4444
},
4545
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/https",
4646
"devDependencies": {

‎examples/opentelemetry-web/package.json

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

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

+12-12
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.34.0",
4+
"version": "0.35.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.8.0",
33-
"@opentelemetry/exporter-metrics-otlp-grpc": "0.34.0",
34-
"@opentelemetry/exporter-metrics-otlp-http": "0.34.0",
35-
"@opentelemetry/exporter-metrics-otlp-proto": "0.34.0",
36-
"@opentelemetry/exporter-trace-otlp-grpc": "0.34.0",
37-
"@opentelemetry/exporter-trace-otlp-http": "0.34.0",
38-
"@opentelemetry/exporter-trace-otlp-proto": "0.34.0",
39-
"@opentelemetry/resources": "1.8.0",
40-
"@opentelemetry/sdk-metrics": "1.8.0",
41-
"@opentelemetry/sdk-trace-base": "1.8.0",
42-
"@opentelemetry/semantic-conventions": "1.8.0"
32+
"@opentelemetry/core": "1.9.0",
33+
"@opentelemetry/exporter-metrics-otlp-grpc": "0.35.0",
34+
"@opentelemetry/exporter-metrics-otlp-http": "0.35.0",
35+
"@opentelemetry/exporter-metrics-otlp-proto": "0.35.0",
36+
"@opentelemetry/exporter-trace-otlp-grpc": "0.35.0",
37+
"@opentelemetry/exporter-trace-otlp-http": "0.35.0",
38+
"@opentelemetry/exporter-trace-otlp-proto": "0.35.0",
39+
"@opentelemetry/resources": "1.9.0",
40+
"@opentelemetry/sdk-metrics": "1.9.0",
41+
"@opentelemetry/sdk-trace-base": "1.9.0",
42+
"@opentelemetry/semantic-conventions": "1.9.0"
4343
},
4444
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/otlp-exporter-node"
4545
}

‎experimental/CHANGELOG.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ All notable changes to experimental packages in this project will be documented
88

99
### :rocket: (Enhancement)
1010

11+
### :bug: (Bug Fix)
12+
13+
### :books: (Refine Doc)
14+
15+
### :house: (Internal)
16+
17+
## 0.35.0
18+
19+
### :rocket: (Enhancement)
20+
1121
* feat(instrumentation-http): monitor error events with events.errorMonitor [#3402](https://github.com/open-telemetry/opentelemetry-js/pull/3402) @legendecas
1222
* feat(instrumentation-grpc): added grpc metadata client side attributes in instrumentation [#3386](https://github.com/open-telemetry/opentelemetry-js/pull/3386)
1323
* feat(instrumentation): add new `_setMeterInstruments` protected method that update the meter instruments every meter provider update.
@@ -23,10 +33,10 @@ All notable changes to experimental packages in this project will be documented
2333
* fix(prometheus-sanitization): replace repeated `_` with a single `_` [3470](https://github.com/open-telemetry/opentelemetry-js/pull/3470) @samimusallam
2434
* fix(prometheus-serializer): correct string used for NaN [#3477](https://github.com/open-telemetry/opentelemetry-js/pull/3477) @JacksonWeber
2535
* fix(instrumentation-http): close server span when response finishes [#3407](https://github.com/open-telemetry/opentelemetry-js/pull/3407) @legendecas
36+
* fix(instrumentation-fetch): make spans resilient to clock drift by using Date.now [#3434](https://github.com/open-telemetry/opentelemetry-js/pull/3434) @dyladan
37+
* fix(instrumentation-xml-http-request): make spans resilient to clock drift by using Date.now [#3434](https://github.com/open-telemetry/opentelemetry-js/pull/3434) @dyladan
2638
* fix(sdk-node): fix exporter to be read only OTEL_TRACES_EXPORTER is set to a valid exporter [3492] @svetlanabrennan
2739

28-
### :books: (Refine Doc)
29-
3040
### :house: (Internal)
3141

3242
* chore(otlp-proto-exporter-base): upgrade protobufjs to 7.1.2 and relax versioning [#3433](https://github.com/open-telemetry/opentelemetry-js/pull/3433) @seemk

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node14",
3-
"version": "0.34.0",
3+
"version": "0.35.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.34.0",
13-
"@opentelemetry/sdk-trace-base": "1.8.0"
12+
"@opentelemetry/sdk-node": "0.35.0",
13+
"@opentelemetry/sdk-trace-base": "1.9.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "14.18.25",

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node16",
3-
"version": "0.34.0",
3+
"version": "0.35.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.34.0",
13-
"@opentelemetry/sdk-trace-base": "1.8.0"
12+
"@opentelemetry/sdk-node": "0.35.0",
13+
"@opentelemetry/sdk-trace-base": "1.9.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "16.11.52",

‎experimental/examples/prometheus/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prometheus-example",
3-
"version": "0.34.0",
3+
"version": "0.35.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.34.0",
15-
"@opentelemetry/sdk-metrics": "1.8.0"
14+
"@opentelemetry/exporter-prometheus": "0.35.0",
15+
"@opentelemetry/sdk-metrics": "1.9.0"
1616
}
1717
}

‎experimental/packages/api-logs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/api-logs",
3-
"version": "0.34.0",
3+
"version": "0.35.0",
44
"description": "Public logs API for OpenTelemetry",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",

‎experimental/packages/exporter-trace-otlp-grpc/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-grpc",
3-
"version": "0.34.0",
3+
"version": "0.35.0",
44
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -50,7 +50,7 @@
5050
"@babel/core": "7.16.0",
5151
"@grpc/proto-loader": "^0.7.3",
5252
"@opentelemetry/api": "^1.0.0",
53-
"@opentelemetry/otlp-exporter-base": "0.34.0",
53+
"@opentelemetry/otlp-exporter-base": "0.35.0",
5454
"@types/mocha": "10.0.0",
5555
"@types/node": "18.6.5",
5656
"@types/sinon": "10.0.13",
@@ -69,11 +69,11 @@
6969
},
7070
"dependencies": {
7171
"@grpc/grpc-js": "^1.7.1",
72-
"@opentelemetry/core": "1.8.0",
73-
"@opentelemetry/otlp-grpc-exporter-base": "0.34.0",
74-
"@opentelemetry/otlp-transformer": "0.34.0",
75-
"@opentelemetry/resources": "1.8.0",
76-
"@opentelemetry/sdk-trace-base": "1.8.0"
72+
"@opentelemetry/core": "1.9.0",
73+
"@opentelemetry/otlp-grpc-exporter-base": "0.35.0",
74+
"@opentelemetry/otlp-transformer": "0.35.0",
75+
"@opentelemetry/resources": "1.9.0",
76+
"@opentelemetry/sdk-trace-base": "1.9.0"
7777
},
7878
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-grpc",
7979
"sideEffects": false

‎experimental/packages/exporter-trace-otlp-http/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-http",
3-
"version": "0.34.0",
3+
"version": "0.35.0",
44
"description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -94,11 +94,11 @@
9494
"@opentelemetry/api": "^1.0.0"
9595
},
9696
"dependencies": {
97-
"@opentelemetry/core": "1.8.0",
98-
"@opentelemetry/otlp-exporter-base": "0.34.0",
99-
"@opentelemetry/otlp-transformer": "0.34.0",
100-
"@opentelemetry/resources": "1.8.0",
101-
"@opentelemetry/sdk-trace-base": "1.8.0"
97+
"@opentelemetry/core": "1.9.0",
98+
"@opentelemetry/otlp-exporter-base": "0.35.0",
99+
"@opentelemetry/otlp-transformer": "0.35.0",
100+
"@opentelemetry/resources": "1.9.0",
101+
"@opentelemetry/sdk-trace-base": "1.9.0"
102102
},
103103
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-http",
104104
"sideEffects": false

‎experimental/packages/exporter-trace-otlp-proto/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-proto",
3-
"version": "0.34.0",
3+
"version": "0.35.0",
44
"description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -66,12 +66,12 @@
6666
"@opentelemetry/api": "^1.0.0"
6767
},
6868
"dependencies": {
69-
"@opentelemetry/core": "1.8.0",
70-
"@opentelemetry/otlp-exporter-base": "0.34.0",
71-
"@opentelemetry/otlp-proto-exporter-base": "0.34.0",
72-
"@opentelemetry/otlp-transformer": "0.34.0",
73-
"@opentelemetry/resources": "1.8.0",
74-
"@opentelemetry/sdk-trace-base": "1.8.0"
69+
"@opentelemetry/core": "1.9.0",
70+
"@opentelemetry/otlp-exporter-base": "0.35.0",
71+
"@opentelemetry/otlp-proto-exporter-base": "0.35.0",
72+
"@opentelemetry/otlp-transformer": "0.35.0",
73+
"@opentelemetry/resources": "1.9.0",
74+
"@opentelemetry/sdk-trace-base": "1.9.0"
7575
},
7676
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/exporter-trace-otlp-proto",
7777
"sideEffects": false

‎experimental/packages/opentelemetry-browser-detector/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/opentelemetry-browser-detector",
3-
"version": "0.34.0",
3+
"version": "0.35.0",
44
"description": "OpenTelemetry Resource Detector for Browser",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -70,8 +70,8 @@
7070
"@opentelemetry/api": "^1.0.0"
7171
},
7272
"dependencies": {
73-
"@opentelemetry/resources": "1.8.0",
74-
"@opentelemetry/semantic-conventions": "1.8.0"
73+
"@opentelemetry/resources": "1.9.0",
74+
"@opentelemetry/semantic-conventions": "1.9.0"
7575
},
7676
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/browser-detector"
7777
}

0 commit comments

Comments
 (0)