Skip to content

Commit 0f6db38

Browse files
authored
Merge branch 'main' into dor/add_context_to_publish_batch
2 parents c41ebde + 675ec97 commit 0f6db38

File tree

65 files changed

+606
-1164
lines changed

Some content is hidden

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

65 files changed

+606
-1164
lines changed

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
services:
4646
memcached:
47-
image: memcached:1.6.36-alpine
47+
image: memcached:1.6.37-alpine
4848
ports:
4949
- 11211:11211
5050
mongo:

detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
"devDependencies": {
4545
"@opentelemetry/api": "^1.0.0",
4646
"@opentelemetry/contrib-test-utils": "^0.45.1",
47-
"@types/mocha": "8.2.3",
47+
"@types/mocha": "10.0.10",
4848
"@types/node": "18.18.14",
49-
"@types/sinon": "10.0.20",
49+
"@types/sinon": "17.0.4",
5050
"nock": "13.3.3",
5151
"nyc": "15.1.0",
5252
"rimraf": "5.0.10",

detectors/node/opentelemetry-resource-detector-aws/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"@opentelemetry/contrib-test-utils": "^0.45.1",
4646
"@opentelemetry/instrumentation-fs": "^0.19.1",
4747
"@opentelemetry/instrumentation-http": "^0.57.2",
48-
"@types/mocha": "8.2.3",
48+
"@types/mocha": "10.0.10",
4949
"@types/node": "18.18.14",
50-
"@types/sinon": "10.0.20",
50+
"@types/sinon": "17.0.4",
5151
"nock": "13.3.3",
5252
"nyc": "15.1.0",
5353
"rimraf": "5.0.10",

detectors/node/opentelemetry-resource-detector-azure/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"@opentelemetry/api": "^1.0.0",
3838
"@opentelemetry/contrib-test-utils": "^0.45.1",
3939
"@opentelemetry/instrumentation-http": "^0.57.2",
40-
"@types/mocha": "8.2.3",
40+
"@types/mocha": "10.0.10",
4141
"@types/node": "18.18.14",
42-
"@types/sinon": "10.0.20",
42+
"@types/sinon": "17.0.4",
4343
"nock": "13.3.3",
4444
"nyc": "15.1.0",
4545
"rimraf": "5.0.10",

detectors/node/opentelemetry-resource-detector-container/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
"@opentelemetry/api": "^1.0.0",
3939
"@opentelemetry/contrib-test-utils": "^0.45.1",
4040
"@opentelemetry/instrumentation-fs": "^0.19.1",
41-
"@types/mocha": "8.2.3",
41+
"@types/mocha": "10.0.10",
4242
"@types/node": "18.18.14",
43-
"@types/sinon": "10.0.20",
43+
"@types/sinon": "17.0.4",
4444
"eslint-plugin-header": "^3.1.1",
4545
"nock": "13.3.3",
4646
"nyc": "15.1.0",

detectors/node/opentelemetry-resource-detector-gcp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@opentelemetry/api": "^1.0.0",
4545
"@opentelemetry/contrib-test-utils": "^0.45.1",
4646
"@opentelemetry/instrumentation-http": "^0.57.2",
47-
"@types/mocha": "8.2.3",
47+
"@types/mocha": "10.0.10",
4848
"@types/node": "18.18.14",
4949
"@types/semver": "7.5.8",
5050
"nock": "13.3.3",

detectors/node/opentelemetry-resource-detector-github/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
},
4747
"devDependencies": {
4848
"@opentelemetry/api": "^1.0.0",
49-
"@types/mocha": "8.2.3",
49+
"@types/mocha": "10.0.10",
5050
"@types/node": "18.18.14",
51-
"@types/sinon": "10.0.20",
51+
"@types/sinon": "17.0.4",
5252
"nyc": "15.1.0",
5353
"rimraf": "5.0.10",
5454
"sinon": "15.2.0",

detectors/node/opentelemetry-resource-detector-instana/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@opentelemetry/api": "^1.3.0",
4444
"@opentelemetry/contrib-test-utils": "^0.45.1",
4545
"@opentelemetry/sdk-node": "^0.57.2",
46-
"@types/mocha": "8.2.3",
46+
"@types/mocha": "10.0.10",
4747
"@types/node": "18.18.14",
4848
"@types/semver": "7.5.8",
4949
"nock": "13.3.3",

incubator/opentelemetry-sampler-aws-xray/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
"devDependencies": {
5252
"@opentelemetry/api": "^1.3.0",
5353
"@opentelemetry/contrib-test-utils": "^0.35.0",
54-
"@types/mocha": "8.2.3",
54+
"@types/mocha": "10.0.10",
5555
"@types/node": "18.18.14",
56-
"@types/sinon": "10.0.20",
56+
"@types/sinon": "17.0.4",
5757
"@typescript-eslint/eslint-plugin": "5.8.1",
5858
"@typescript-eslint/parser": "5.8.1",
5959
"eslint": "8.7.0",

metapackages/auto-configuration-propagators/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
},
3434
"devDependencies": {
3535
"@opentelemetry/api": "^1.4.1",
36-
"@types/mocha": "7.0.2",
36+
"@types/mocha": "10.0.10",
3737
"@types/node": "18.18.14",
38-
"@types/sinon": "10.0.20",
38+
"@types/sinon": "17.0.4",
3939
"nyc": "15.1.0",
4040
"rimraf": "5.0.10",
4141
"sinon": "15.2.0",

0 commit comments

Comments
 (0)