Skip to content

Commit 405580b

Browse files
authored
Merge branch 'main' into links-in-consolespanexporter
2 parents 26497b9 + a5135e2 commit 405580b

File tree

43 files changed

+261
-227
lines changed

Some content is hidden

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

43 files changed

+261
-227
lines changed

CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,21 @@ All notable changes to this project will be documented in this file.
1212

1313
### :bug: (Bug Fix)
1414

15+
### :books: (Refine Doc)
16+
17+
### :house: (Internal)
18+
19+
## 1.2.0
20+
21+
### :boom: Breaking Change
22+
23+
### :rocket: (Enhancement)
24+
25+
### :bug: (Bug Fix)
26+
1527
* fix: sanitize attributes inputs [#2881](https://github.com/open-telemetry/opentelemetry-js/pull/2881) @legendecas
1628
* fix: support earlier API versions [#2892](https://github.com/open-telemetry/opentelemetry-js/pull/2892) @dyladan
29+
* fix: support extract one digit '0' in jaeger traceFlag [#2905](https://github.com/open-telemetry/opentelemetry-js/issues/2905) @shmilyoo
1730

1831
### :books: (Refine Doc)
1932

@@ -24,6 +37,8 @@ All notable changes to this project will be documented in this file.
2437
* chore: require changelog entry to merge PR [#2847](https://github.com/open-telemetry/opentelemetry-js/pull/2847) @dyladan
2538
* chore: remove peer API check [#2892](https://github.com/open-telemetry/opentelemetry-js/pull/2892) @dyladan
2639
* chore: merge lerna subdirectories into a single monorepo [#2892](https://github.com/open-telemetry/opentelemetry-js/pull/2892) @dyladan
40+
* `opentelemetry-propagator-jaeger`
41+
* [#2906](https://github.com/open-telemetry/opentelemetry-js/pull/2906) fix: support extract one digit '0' in jaeger traceFlag ([@shmilyoo](https://github.com/shmilyoo))
2742

2843
## 1.1.1
2944

experimental/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ All notable changes to experimental packages in this project will be documented
66

77
### :boom: Breaking Change
88

9+
### :rocket: (Enhancement)
10+
11+
### :bug: (Bug Fix)
12+
13+
### :books: (Refine Doc)
14+
15+
### :house: (Internal)
16+
17+
## 0.28.0
18+
19+
### :boom: Breaking Change
20+
921
* feat(sdk-metrics-base): update metric exporter interfaces #2707 @srikanthccv
1022
* feat(api-metrics): remove observable types #2687 @legendecas
1123
* fix(otlp-http-exporter): remove content length header #2879 @svetlanabrennan

experimental/backwards-compatability/node10/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node10",
3-
"version": "0.27.0",
3+
"version": "0.28.0",
44
"private": true,
55
"description": "Backwards compatability app for node8 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.27.0",
13-
"@opentelemetry/sdk-trace-base": "1.1.1"
12+
"@opentelemetry/sdk-node": "0.28.0",
13+
"@opentelemetry/sdk-trace-base": "1.2.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "10.17.60",

experimental/backwards-compatability/node12/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node12",
3-
"version": "0.27.0",
3+
"version": "0.28.0",
44
"private": true,
55
"description": "Backwards compatability app for node8 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.27.0",
13-
"@opentelemetry/sdk-trace-base": "1.1.1"
12+
"@opentelemetry/sdk-node": "0.28.0",
13+
"@opentelemetry/sdk-trace-base": "1.2.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "12.20.37",

experimental/backwards-compatability/node8/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "backcompat-node8",
3-
"version": "0.27.0",
3+
"version": "0.28.0",
44
"private": true,
55
"description": "Backwards compatability app for node8 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.27.0",
13-
"@opentelemetry/sdk-trace-base": "1.1.1"
12+
"@opentelemetry/sdk-node": "0.28.0",
13+
"@opentelemetry/sdk-trace-base": "1.2.0"
1414
},
1515
"devDependencies": {
1616
"@types/node": "8.10.66",

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-trace-otlp-grpc",
3-
"version": "0.27.0",
3+
"version": "0.28.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",
@@ -49,7 +49,7 @@
4949
"devDependencies": {
5050
"@babel/core": "7.16.0",
5151
"@opentelemetry/api": "^1.0.0",
52-
"@opentelemetry/otlp-exporter-base": "0.27.0",
52+
"@opentelemetry/otlp-exporter-base": "0.28.0",
5353
"@types/mocha": "8.2.3",
5454
"@types/node": "14.17.33",
5555
"@types/sinon": "10.0.6",
@@ -60,19 +60,19 @@
6060
"rimraf": "3.0.2",
6161
"sinon": "12.0.1",
6262
"ts-loader": "8.3.0",
63-
"ts-mocha": "8.0.0",
63+
"ts-mocha": "9.0.2",
6464
"typescript": "4.4.4"
6565
},
6666
"peerDependencies": {
6767
"@opentelemetry/api": "^1.0.0"
6868
},
6969
"dependencies": {
70-
"@opentelemetry/core": "1.1.1",
70+
"@opentelemetry/core": "1.2.0",
7171
"@grpc/grpc-js": "^1.5.9",
7272
"@grpc/proto-loader": "^0.6.9",
73-
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
74-
"@opentelemetry/otlp-grpc-exporter-base": "0.27.0",
75-
"@opentelemetry/resources": "1.1.1",
76-
"@opentelemetry/sdk-trace-base": "1.1.1"
73+
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
74+
"@opentelemetry/otlp-grpc-exporter-base": "0.28.0",
75+
"@opentelemetry/resources": "1.2.0",
76+
"@opentelemetry/sdk-trace-base": "1.2.0"
7777
}
7878
}

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.27.0",
3+
"version": "0.28.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",
@@ -84,7 +84,7 @@
8484
"rimraf": "3.0.2",
8585
"sinon": "12.0.1",
8686
"ts-loader": "8.3.0",
87-
"ts-mocha": "8.0.0",
87+
"ts-mocha": "9.0.2",
8888
"typescript": "4.4.4",
8989
"webpack": "4.46.0",
9090
"webpack-cli": "4.9.1",
@@ -94,9 +94,9 @@
9494
"@opentelemetry/api": "^1.0.0"
9595
},
9696
"dependencies": {
97-
"@opentelemetry/core": "1.1.1",
98-
"@opentelemetry/resources": "1.1.1",
99-
"@opentelemetry/sdk-trace-base": "1.1.1",
100-
"@opentelemetry/otlp-exporter-base": "0.27.0"
97+
"@opentelemetry/core": "1.2.0",
98+
"@opentelemetry/resources": "1.2.0",
99+
"@opentelemetry/sdk-trace-base": "1.2.0",
100+
"@opentelemetry/otlp-exporter-base": "0.28.0"
101101
}
102102
}

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.27.0",
3+
"version": "0.28.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",
@@ -59,7 +59,7 @@
5959
"rimraf": "3.0.2",
6060
"sinon": "12.0.1",
6161
"ts-loader": "8.3.0",
62-
"ts-mocha": "8.0.0",
62+
"ts-mocha": "9.0.2",
6363
"typescript": "4.4.4"
6464
},
6565
"peerDependencies": {
@@ -68,11 +68,11 @@
6868
"dependencies": {
6969
"@opentelemetry/core": "1.1.1",
7070
"@grpc/proto-loader": "^0.6.9",
71-
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
72-
"@opentelemetry/resources": "1.1.1",
73-
"@opentelemetry/sdk-trace-base": "1.1.1",
74-
"@opentelemetry/otlp-exporter-base": "0.27.0",
75-
"@opentelemetry/otlp-proto-exporter-base": "0.27.0",
71+
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
72+
"@opentelemetry/resources": "1.2.0",
73+
"@opentelemetry/sdk-trace-base": "1.2.0",
74+
"@opentelemetry/otlp-exporter-base": "0.28.0",
75+
"@opentelemetry/otlp-proto-exporter-base": "0.28.0",
7676
"protobufjs": "^6.9.0"
7777
}
7878
}

experimental/packages/opentelemetry-api-metrics/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "@opentelemetry/api-metrics",
3-
"version": "0.27.0",
4-
"private": true,
3+
"version": "0.28.0",
54
"description": "Public metrics API for OpenTelemetry",
65
"main": "build/src/index.js",
76
"module": "build/esm/index.js",
@@ -79,7 +78,7 @@
7978
"mocha": "7.2.0",
8079
"nyc": "15.1.0",
8180
"ts-loader": "8.3.0",
82-
"ts-mocha": "8.0.0",
81+
"ts-mocha": "9.0.2",
8382
"typescript": "4.4.4",
8483
"webpack": "4.46.0"
8584
}

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-metrics-otlp-grpc",
3-
"version": "0.27.0",
3+
"version": "0.28.0",
44
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
4949
"devDependencies": {
5050
"@babel/core": "7.16.0",
5151
"@opentelemetry/api": "^1.0.0",
52-
"@opentelemetry/api-metrics": "0.27.0",
52+
"@opentelemetry/api-metrics": "0.28.0",
5353
"@types/mocha": "8.2.3",
5454
"@types/node": "14.17.33",
5555
"@types/sinon": "10.0.6",
@@ -60,7 +60,7 @@
6060
"rimraf": "3.0.2",
6161
"sinon": "12.0.1",
6262
"ts-loader": "8.3.0",
63-
"ts-mocha": "8.0.0",
63+
"ts-mocha": "9.0.2",
6464
"typescript": "4.4.4"
6565
},
6666
"peerDependencies": {
@@ -69,11 +69,11 @@
6969
"dependencies": {
7070
"@grpc/grpc-js": "^1.5.9",
7171
"@grpc/proto-loader": "^0.6.9",
72-
"@opentelemetry/core": "1.1.1",
73-
"@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
74-
"@opentelemetry/otlp-grpc-exporter-base": "0.27.0",
75-
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
76-
"@opentelemetry/resources": "1.1.1",
77-
"@opentelemetry/sdk-metrics-base": "0.27.0"
72+
"@opentelemetry/core": "1.2.0",
73+
"@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
74+
"@opentelemetry/otlp-grpc-exporter-base": "0.28.0",
75+
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
76+
"@opentelemetry/resources": "1.2.0",
77+
"@opentelemetry/sdk-metrics-base": "0.28.0"
7878
}
7979
}

experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-metrics-otlp-http",
3-
"version": "0.27.0",
3+
"version": "0.28.0",
44
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -84,7 +84,7 @@
8484
"rimraf": "3.0.2",
8585
"sinon": "12.0.1",
8686
"ts-loader": "8.3.0",
87-
"ts-mocha": "8.0.0",
87+
"ts-mocha": "9.0.2",
8888
"typescript": "4.4.4",
8989
"webpack": "4.46.0",
9090
"webpack-cli": "4.9.1",
@@ -94,11 +94,11 @@
9494
"@opentelemetry/api": "^1.0.0"
9595
},
9696
"dependencies": {
97-
"@opentelemetry/api-metrics": "0.27.0",
98-
"@opentelemetry/core": "1.1.1",
99-
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
100-
"@opentelemetry/otlp-exporter-base": "0.27.0",
101-
"@opentelemetry/resources": "1.1.1",
102-
"@opentelemetry/sdk-metrics-base": "0.27.0"
97+
"@opentelemetry/api-metrics": "0.28.0",
98+
"@opentelemetry/core": "1.2.0",
99+
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
100+
"@opentelemetry/otlp-exporter-base": "0.28.0",
101+
"@opentelemetry/resources": "1.2.0",
102+
"@opentelemetry/sdk-metrics-base": "0.28.0"
103103
}
104104
}

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-metrics-otlp-proto",
3-
"version": "0.27.0",
3+
"version": "0.28.0",
44
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector using protobuf over HTTP",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -49,7 +49,7 @@
4949
"devDependencies": {
5050
"@babel/core": "7.16.0",
5151
"@opentelemetry/api": "^1.0.0",
52-
"@opentelemetry/api-metrics": "0.27.0",
52+
"@opentelemetry/api-metrics": "0.28.0",
5353
"@types/mocha": "8.2.3",
5454
"@types/node": "14.17.33",
5555
"@types/sinon": "10.0.6",
@@ -60,21 +60,21 @@
6060
"rimraf": "3.0.2",
6161
"sinon": "12.0.1",
6262
"ts-loader": "8.3.0",
63-
"ts-mocha": "8.0.0",
63+
"ts-mocha": "9.0.2",
6464
"typescript": "4.4.4"
6565
},
6666
"peerDependencies": {
6767
"@opentelemetry/api": "^1.0.0"
6868
},
6969
"dependencies": {
7070
"@grpc/proto-loader": "0.6.9",
71-
"@opentelemetry/core": "1.1.1",
72-
"@opentelemetry/exporter-metrics-otlp-http": "0.27.0",
73-
"@opentelemetry/otlp-proto-exporter-base": "0.27.0",
74-
"@opentelemetry/otlp-exporter-base": "0.27.0",
75-
"@opentelemetry/exporter-trace-otlp-http": "0.27.0",
76-
"@opentelemetry/resources": "1.1.1",
77-
"@opentelemetry/sdk-metrics-base": "0.27.0",
71+
"@opentelemetry/core": "1.2.0",
72+
"@opentelemetry/exporter-metrics-otlp-http": "0.28.0",
73+
"@opentelemetry/otlp-proto-exporter-base": "0.28.0",
74+
"@opentelemetry/otlp-exporter-base": "0.28.0",
75+
"@opentelemetry/exporter-trace-otlp-http": "0.28.0",
76+
"@opentelemetry/resources": "1.2.0",
77+
"@opentelemetry/sdk-metrics-base": "0.28.0",
7878
"protobufjs": "^6.9.0"
7979
}
8080
}

experimental/packages/opentelemetry-exporter-prometheus/package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "@opentelemetry/exporter-prometheus",
3-
"version": "0.27.0",
4-
"private": true,
3+
"version": "0.28.0",
54
"description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus",
65
"main": "build/src/index.js",
76
"types": "build/src/index.d.ts",
@@ -53,15 +52,15 @@
5352
"nyc": "15.1.0",
5453
"rimraf": "3.0.2",
5554
"sinon": "12.0.1",
56-
"ts-mocha": "8.0.0",
55+
"ts-mocha": "9.0.2",
5756
"typescript": "4.4.4"
5857
},
5958
"peerDependencies": {
6059
"@opentelemetry/api": "^1.0.0"
6160
},
6261
"dependencies": {
63-
"@opentelemetry/api-metrics": "0.27.0",
64-
"@opentelemetry/core": "1.1.1",
65-
"@opentelemetry/sdk-metrics-base": "0.27.0"
62+
"@opentelemetry/api-metrics": "0.28.0",
63+
"@opentelemetry/core": "1.2.0",
64+
"@opentelemetry/sdk-metrics-base": "0.28.0"
6665
}
6766
}

0 commit comments

Comments
 (0)