Skip to content

Commit

Permalink
Merge pull request open-telemetry#188 from opentelemetrybot/opentelem…
Browse files Browse the repository at this point in the history
…etrybot/merge-main

[AutoMerge][Main] Merging staged change(s) to main
  • Loading branch information
MSNev committed Sep 20, 2023
2 parents 521dc11 + 218c879 commit 9d604e0
Show file tree
Hide file tree
Showing 159 changed files with 1,876 additions and 1,550 deletions.
2 changes: 1 addition & 1 deletion auto-merge/contrib/.github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/contrib/.github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
image: node:14

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Lint markdown files
uses: avto-dev/markdown-lint@v1
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/contrib/.github/workflows/peer-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
image: node:14
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install script dependencies
run: npm install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
image: node:14
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install lerna
run: npm install -g lerna@5.5.2
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/contrib/.github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
# The logic below handles the npm publication:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
args: ${{ steps.lerna-args.outputs.args }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
# Need lerna to list all packages
- name: Install lerna
run: npm install -g lerna@5.5.2
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/contrib/.github/workflows/test-all-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
NPM_CONFIG_UNSAFE_PERM: true
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions auto-merge/contrib/.github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
NPM_CONFIG_UNSAFE_PERM: true
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
NODE_OPTIONS: --max-old-space-size=4096
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.34.1",
"@opentelemetry/sdk-node": "^0.41.2",
"@opentelemetry/sdk-node": "^0.43.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/instrumentation-amqplib": "^0.33.1",
"@opentelemetry/instrumentation-aws-lambda": "^0.37.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.36.0",
Expand All @@ -64,9 +64,9 @@
"@opentelemetry/instrumentation-fastify": "^0.32.2",
"@opentelemetry/instrumentation-generic-pool": "^0.32.2",
"@opentelemetry/instrumentation-graphql": "^0.35.1",
"@opentelemetry/instrumentation-grpc": "^0.41.2",
"@opentelemetry/instrumentation-grpc": "^0.43.0",
"@opentelemetry/instrumentation-hapi": "^0.33.0",
"@opentelemetry/instrumentation-http": "^0.41.2",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/instrumentation-ioredis": "^0.35.1",
"@opentelemetry/instrumentation-knex": "^0.32.1",
"@opentelemetry/instrumentation-koa": "^0.36.0",
Expand All @@ -92,6 +92,6 @@
"@opentelemetry/resource-detector-container": "^0.3.1",
"@opentelemetry/resource-detector-gcp": "^0.29.1",
"@opentelemetry/resources": "^1.12.0",
"@opentelemetry/sdk-node": "^0.41.2"
"@opentelemetry/sdk-node": "^0.43.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.3.1",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.34.1",
"@types/amqplib": "^0.5.17",
"@types/lodash": "4.14.197",
"@types/lodash": "4.14.198",
"@types/mocha": "8.2.3",
"@types/sinon": "10.0.16",
"@types/node": "18.6.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2"
"@opentelemetry/instrumentation": "^0.43.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2"
"@opentelemetry/instrumentation": "^0.43.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/tedious": "^4.0.10"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/propagator-aws-xray": "^1.3.1",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.30.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@types/bunyan": "1.8.8"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/connect": "3.4.35"
"@types/connect": "3.4.36"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-connect#readme"
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"semver": "^7.5.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/instrumentation-express": "0.28.0",
"@opentelemetry/instrumentation-http": "^0.41.2",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/express": "4.17.17"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@fastify/express": "^2.0.2",
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-async-hooks": "^1.8.0",
"@opentelemetry/instrumentation-http": "0.41.2",
"@opentelemetry/instrumentation-http": "0.43.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@types/express": "4.17.17",
Expand All @@ -63,7 +63,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2"
"@opentelemetry/instrumentation": "^0.43.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme"
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/hapi__hapi": "20.0.13"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/redis-common": "^0.36.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/ioredis4": "npm:@types/ioredis@^4.28.10"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation-http": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/instrumentation-koa": "^0.31.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/koa": "2.13.8",
"@types/koa__router": "8.0.11"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/memcached": "^2.2.6"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation-http": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/instrumentation-mongodb": "^0.32.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"dependencies": {
"@opentelemetry/sdk-metrics": "^1.9.1",
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/instrumentation": "^0.43.0",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme"
Expand Down
Loading

0 comments on commit 9d604e0

Please sign in to comment.