Skip to content

Commit

Permalink
Merge 9ed9ad8 into 070b685
Browse files Browse the repository at this point in the history
  • Loading branch information
llc1123 authored Jul 2, 2023
2 parents 070b685 + 9ed9ad8 commit 3e77bed
Show file tree
Hide file tree
Showing 49 changed files with 58 additions and 52 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
### :house: (Internal)

* feat(minification): [Minification] Add noEmitHelpers, importHelpers and tslib as a dependency [#3913](https://github.com/open-telemetry/opentelemetry-js/issues/3913)
* chore(deps): update `typescript` to `4.9.5` [#3952](https://github.com/open-telemetry/opentelemetry-js/pull/3952) @llc1123

## 1.14.0

Expand Down
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"unionfs": "4.5.1",
"webpack": "4.46.0"
},
Expand Down
10 changes: 7 additions & 3 deletions api/test/common/diag/logLevel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ describe('LogLevelFilter DiagLogger', () => {
ignoreFuncs: Array<keyof DiagLogger>;
}> = [
{ message: 'ALL', level: DiagLogLevel.ALL, ignoreFuncs: [] },
{ message: 'greater than ALL', level: 32768, ignoreFuncs: [] },
{
message: 'greater than ALL',
level: 32768 as DiagLogLevel,
ignoreFuncs: [],
},
{ message: 'VERBOSE', level: DiagLogLevel.VERBOSE, ignoreFuncs: [] },
{ message: 'DEBUG', level: DiagLogLevel.DEBUG, ignoreFuncs: ['verbose'] },
{
Expand All @@ -101,7 +105,7 @@ describe('LogLevelFilter DiagLogger', () => {
},
{
message: 'between ERROR and NONE',
level: 1,
level: 1 as DiagLogLevel,
ignoreFuncs: ['verbose', 'debug', 'info', 'warn', 'error'],
},
{
Expand All @@ -111,7 +115,7 @@ describe('LogLevelFilter DiagLogger', () => {
},
{
message: 'less than NONE',
level: -1000,
level: -1000 as DiagLogLevel,
ignoreFuncs: ['verbose', 'debug', 'info', 'warn', 'error'],
},
];
Expand Down
2 changes: 2 additions & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ All notable changes to experimental packages in this project will be documented

### :house: (Internal)

* chore(deps): update `typescript` to `4.9.5` [#3952](https://github.com/open-telemetry/opentelemetry-js/pull/3952) @llc1123

## 0.40.0

### :boom: Breaking Change
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatibility/node14/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@types/node": "14.18.25",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/backwards-compatibility/node16/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@types/node": "16.11.52",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/api-events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"nyc": "15.1.0",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-events",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/api-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"nyc": "15.1.0",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/api-logs",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/exporter-logs-otlp-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/exporter-logs-otlp-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"semver": "7.5.3",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"sinon": "15.1.2",
"superagent": "8.0.9",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-sdk-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-sdk-node",
"sideEffects": false
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-grpc-exporter-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/otlp-transformer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"nyc": "15.1.0",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/sdk-logs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"dependencies": {
"@opentelemetry/core": "1.14.0",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/shim-opencensus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opencensus/core": "^0.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tslib": "^2.3.1"
},
"devDependencies": {
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"engines": {
"node": ">=14"
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,9 @@
"markdownlint-cli": "0.35.0",
"prettier": "2.8.8",
"semver": "7.5.3",
"typedoc": "0.22.18",
"typedoc-plugin-missing-exports": "1.0.0",
"typedoc-plugin-resolve-crossmodule-references": "0.2.2",
"typescript": "4.4.4",
"typedoc": "0.24.8",
"typedoc-plugin-missing-exports": "2.0.0",
"typescript": "4.9.5",
"tslib": "^2.3.1"
},
"changelog": {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-async-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"mocha": "10.2.0",
"nyc": "15.1.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.5.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-zone-peer-dep/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"zone.js": "0.11.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-context-zone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"nyc": "15.1.0",
"sinon": "15.1.2",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-exporter-zipkin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagator-b3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"nyc": "15.1.0",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
"typescript": "4.9.5"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-propagator-b3",
"sideEffects": false
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry-propagator-jaeger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"sinon": "15.1.2",
"ts-loader": "8.4.0",
"ts-mocha": "10.0.0",
"typescript": "4.4.4",
"typescript": "4.9.5",
"webpack": "4.46.0"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit 3e77bed

Please sign in to comment.