Skip to content

Commit

Permalink
Merge 08bbeb5 into 34c5bdb
Browse files Browse the repository at this point in the history
  • Loading branch information
@dyladan
dyladan authored Aug 18, 2022
2 parents 34c5bdb + 08bbeb5 commit e961537
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 24 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.

* feat(sdk-trace-base): move Sampler declaration into sdk-trace-base [#3088](https://github.com/open-telemetry/opentelemetry-js/pull/3088) @legendecas
* fix(grpc-instrumentation): added grpc attributes in instrumentation [#3127](https://github.com/open-telemetry/opentelemetry-js/pull/3127) @andrewzenkov
* feat: support latest `@opentelemetry/api` [#3177](https://github.com/open-telemetry/opentelemetry-js/pull/3177) @dyladan

### :bug: (Bug Fix)

Expand Down
1 change: 1 addition & 0 deletions experimental/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ All notable changes to experimental packages in this project will be documented
* fix(add-views-to-node-sdk): added the ability to define meter views in `NodeSDK` [#3066](https://github.com/open-telemetry/opentelemetry-js/pull/3124) @weyert
* feature(add-console-metrics-exporter): add ConsoleMetricExporter [#3120](https://github.com/open-telemetry/opentelemetry-js/pull/3120) @weyert
* feature(prometheus-serialiser): export the unit block when unit is set in metric descriptor [#3066](https://github.com/open-telemetry/opentelemetry-js/pull/3041) @weyert
* feat: support latest `@opentelemetry/api` [#3177](https://github.com/open-telemetry/opentelemetry-js/pull/3177) @dyladan

### :bug: (Bug Fix)

Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-sdk-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"@opentelemetry/sdk-trace-node": "1.5.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@opentelemetry/context-async-hooks": "1.5.0",
"@opentelemetry/semantic-conventions": "1.5.0",
"@types/mocha": "9.1.1",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/otlp-transformer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
"README.md"
],
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/webpack-env": "1.16.3",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-async-hooks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"codecov": "3.8.3",
Expand All @@ -55,7 +55,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-context-async-hooks"
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-zone-peer-dep/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -81,7 +81,7 @@
"zone.js": "0.11.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"zone.js": "^0.10.2 || ^0.11.0"
},
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -88,7 +88,7 @@
"webpack": "4.46.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/semantic-conventions": "1.5.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-propagator-b3/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"@opentelemetry/core": "1.5.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"codecov": "3.8.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-propagator-jaeger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -77,7 +77,7 @@
"webpack": "4.46.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/core": "1.5.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-resources/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -86,7 +86,7 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/core": "1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@types/mocha": "9.1.1",
"@types/node": "18.6.5",
"@types/sinon": "10.0.13",
Expand All @@ -88,7 +88,7 @@
"webpack": "4.46.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/core": "1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@opentelemetry/resources": "1.5.0",
"@opentelemetry/semantic-conventions": "1.5.0",
"@types/mocha": "9.1.1",
Expand All @@ -61,7 +61,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/context-async-hooks": "1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"devDependencies": {
"@babel/core": "7.16.0",
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@opentelemetry/context-zone": "1.5.0",
"@opentelemetry/propagator-b3": "1.5.0",
"@opentelemetry/resources": "1.5.0",
Expand Down Expand Up @@ -88,7 +88,7 @@
"webpack-merge": "5.8.0"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/core": "1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-shim-opentracing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0",
"@opentelemetry/api": ">=1.0.0 <1.3.0",
"@opentelemetry/propagator-b3": "1.5.0",
"@opentelemetry/propagator-jaeger": "1.5.0",
"@opentelemetry/sdk-trace-base": "1.5.0",
Expand All @@ -56,7 +56,7 @@
"typescript": "4.4.4"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.2.0"
"@opentelemetry/api": ">=1.0.0 <1.3.0"
},
"dependencies": {
"@opentelemetry/core": "1.5.0",
Expand Down

0 comments on commit e961537

Please sign in to comment.