Skip to content

Commit

Permalink
chore(instrumentation-runtime-node): fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pikalovArtemN committed Oct 8, 2024
2 parents 5121a0b + fbeb305 commit fd8d803
Show file tree
Hide file tree
Showing 63 changed files with 1,354 additions and 183 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nock": "13.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nock": "13.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nock": "13.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"eslint-plugin-header": "^3.1.1",
"mocha": "7.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
"mocha": "7.2.0",
"nock": "13.3.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nyc": "15.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@opentelemetry/sdk-node": "^0.53.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
"mocha": "7.2.0",
"nock": "13.3.3",
Expand Down
2 changes: 1 addition & 1 deletion incubator/opentelemetry-sampler-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.35.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"@typescript-eslint/eslint-plugin": "5.8.1",
"@typescript-eslint/parser": "5.8.1",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-configuration-propagators/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.4.1",
"@types/mocha": "7.0.2",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.4.1",
"@types/mocha": "7.0.2",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"mocha": "7.2.0",
"nyc": "15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "^1.3.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
"@types/webpack-env": "1.16.3",
"assert": "2.0.0",
Expand Down
Loading

0 comments on commit fd8d803

Please sign in to comment.