Skip to content

Commit cab7e6c

Browse files
pikalovArtemNpikalovArtemN
committed
chore(instrumentation-runtime-node): merge main
2 parents 97d8d92 + a5b5614 commit cab7e6c

File tree

222 files changed

+6670
-10526
lines changed

Some content is hidden

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

222 files changed

+6670
-10526
lines changed

‎.github/component-label-map.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,14 @@ pkg:sql-common:
274274
- changed-files:
275275
- any-glob-to-any-file:
276276
- packages/opentelemetry-sql-common/**
277+
pkg:propagator-aws-xray:
278+
- changed-files:
279+
- any-glob-to-any-file:
280+
- propagators/propagator-aws-xray/**
281+
pkg:propagator-aws-xray-lambda:
282+
- changed-files:
283+
- any-glob-to-any-file:
284+
- propagators/propagator-aws-xray-lambda/**
277285
pkg-status:unmaintained:
278286
- changed-files:
279287
- any-glob-to-any-file:
@@ -296,3 +304,5 @@ pkg-status:unmaintained:
296304
- plugins/node/opentelemetry-instrumentation-restify/**
297305
- plugins/node/opentelemetry-instrumentation-router/**
298306
- propagators/opentelemetry-propagator-ot-trace/**
307+
- propagators/propagator-aws-xray/**
308+
- propagators/propagator-aws-xray-lambda/**

‎.github/component_owners.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ components:
145145
- kirrg001
146146
propagators/opentelemetry-propagator-ot-trace: []
147147
# Unmaintained
148+
propagators/propagator-aws-xray: [ ]
149+
# Unmaintained
150+
propagators/propagator-aws-xray-lambda: [ ]
151+
# Unmaintained
148152

149153
ignored-authors:
150154
- renovate-bot

‎.mocharc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
require: 'ts-node/register/transpile-only'

‎.release-please-manifest.json‎

Lines changed: 55 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,66 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.3",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.6.2",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.4.4",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.4",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.7.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.2.12",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.5.0",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.13",
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.14.0",
99
"metapackages/auto-configuration-propagators": "0.3.1",
10-
"metapackages/auto-instrumentations-node": "0.51.0",
11-
"metapackages/auto-instrumentations-web": "0.41.0",
10+
"metapackages/auto-instrumentations-node": "0.52.0",
11+
"metapackages/auto-instrumentations-web": "0.42.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.4",
1414
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
15-
"packages/opentelemetry-propagation-utils": "0.30.11",
15+
"packages/opentelemetry-propagation-utils": "0.30.12",
1616
"packages/opentelemetry-redis-common": "0.36.2",
1717
"packages/opentelemetry-sql-common": "0.40.1",
18-
"packages/opentelemetry-test-utils": "0.41.0",
19-
"packages/winston-transport": "0.6.0",
20-
"plugins/node/instrumentation-amqplib": "0.42.0",
21-
"plugins/node/instrumentation-cucumber": "0.9.0",
22-
"plugins/node/instrumentation-dataloader": "0.12.0",
23-
"plugins/node/instrumentation-fs": "0.15.0",
24-
"plugins/node/instrumentation-kafkajs": "0.3.0",
25-
"plugins/node/instrumentation-lru-memoizer": "0.40.0",
26-
"plugins/node/instrumentation-mongoose": "0.42.0",
27-
"plugins/node/instrumentation-runtime-node": "0.7.0",
28-
"plugins/node/instrumentation-socket.io": "0.42.0",
29-
"plugins/node/instrumentation-tedious": "0.14.0",
30-
"plugins/node/instrumentation-undici": "0.6.0",
31-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.45.0",
32-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.44.0",
33-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.41.0",
34-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.41.0",
35-
"plugins/node/opentelemetry-instrumentation-connect": "0.39.0",
36-
"plugins/node/opentelemetry-instrumentation-dns": "0.39.0",
37-
"plugins/node/opentelemetry-instrumentation-express": "0.43.0",
38-
"plugins/node/opentelemetry-instrumentation-fastify": "0.40.0",
39-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.39.0",
40-
"plugins/node/opentelemetry-instrumentation-graphql": "0.43.0",
41-
"plugins/node/opentelemetry-instrumentation-hapi": "0.41.0",
42-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.43.0",
43-
"plugins/node/opentelemetry-instrumentation-knex": "0.40.0",
44-
"plugins/node/opentelemetry-instrumentation-koa": "0.43.0",
45-
"plugins/node/opentelemetry-instrumentation-memcached": "0.39.0",
46-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.47.0",
47-
"plugins/node/opentelemetry-instrumentation-mysql": "0.41.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
49-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
50-
"plugins/node/opentelemetry-instrumentation-net": "0.39.0",
51-
"plugins/node/opentelemetry-instrumentation-pg": "0.46.0",
52-
"plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
53-
"plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
54-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.42.1",
55-
"plugins/node/opentelemetry-instrumentation-restify": "0.41.0",
56-
"plugins/node/opentelemetry-instrumentation-router": "0.40.0",
57-
"plugins/node/opentelemetry-instrumentation-winston": "0.40.0",
58-
"plugins/web/opentelemetry-instrumentation-document-load": "0.40.0",
59-
"plugins/web/opentelemetry-instrumentation-long-task": "0.40.0",
60-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
18+
"packages/opentelemetry-test-utils": "0.42.0",
19+
"packages/winston-transport": "0.7.0",
20+
"plugins/node/instrumentation-amqplib": "0.43.0",
21+
"plugins/node/instrumentation-cucumber": "0.10.0",
22+
"plugins/node/instrumentation-dataloader": "0.13.0",
23+
"plugins/node/instrumentation-fs": "0.16.0",
24+
"plugins/node/instrumentation-kafkajs": "0.4.0",
25+
"plugins/node/instrumentation-lru-memoizer": "0.41.0",
26+
"plugins/node/instrumentation-mongoose": "0.43.0",
27+
"plugins/node/instrumentation-runtime-node": "0.8.0",
28+
"plugins/node/instrumentation-socket.io": "0.43.0",
29+
"plugins/node/instrumentation-tedious": "0.15.0",
30+
"plugins/node/instrumentation-undici": "0.7.0",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.46.0",
32+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.45.0",
33+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0",
34+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0",
35+
"plugins/node/opentelemetry-instrumentation-connect": "0.40.0",
36+
"plugins/node/opentelemetry-instrumentation-dns": "0.40.0",
37+
"plugins/node/opentelemetry-instrumentation-express": "0.44.0",
38+
"plugins/node/opentelemetry-instrumentation-fastify": "0.41.0",
39+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.40.0",
40+
"plugins/node/opentelemetry-instrumentation-graphql": "0.44.0",
41+
"plugins/node/opentelemetry-instrumentation-hapi": "0.42.0",
42+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.44.0",
43+
"plugins/node/opentelemetry-instrumentation-knex": "0.41.0",
44+
"plugins/node/opentelemetry-instrumentation-koa": "0.44.0",
45+
"plugins/node/opentelemetry-instrumentation-memcached": "0.40.0",
46+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0",
47+
"plugins/node/opentelemetry-instrumentation-mysql": "0.42.0",
48+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.42.0",
49+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0",
50+
"plugins/node/opentelemetry-instrumentation-net": "0.40.0",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.47.0",
52+
"plugins/node/opentelemetry-instrumentation-pino": "0.43.0",
53+
"plugins/node/opentelemetry-instrumentation-redis": "0.43.0",
54+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0",
55+
"plugins/node/opentelemetry-instrumentation-restify": "0.42.0",
56+
"plugins/node/opentelemetry-instrumentation-router": "0.41.0",
57+
"plugins/node/opentelemetry-instrumentation-winston": "0.41.0",
58+
"plugins/web/opentelemetry-instrumentation-document-load": "0.41.0",
59+
"plugins/web/opentelemetry-instrumentation-long-task": "0.41.0",
60+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.41.0",
6161
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
6262
"propagators/opentelemetry-propagator-instana": "0.3.2",
63-
"propagators/opentelemetry-propagator-ot-trace": "0.27.2"
63+
"propagators/opentelemetry-propagator-ot-trace": "0.27.2",
64+
"propagators/propagator-aws-xray": "1.26.0",
65+
"propagators/propagator-aws-xray-lambda": "0.53.0"
6466
}

‎archive/opentelemetry-browser-extension-autoinjection/package.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"lint:fix": "eslint . --fix",
1313
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/browser-extension-autoinjection --include-dependencies",
1414
"prewatch": "npm run precompile",
15-
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
15+
"test": "nyc mocha 'test/**/*.test.ts'",
1616
"tdd": "npm run test -- --watch-extensions ts --watch",
1717
"watch": "npx webpack --mode=development --watch",
1818
"watch:mv2": "npx webpack --mode=development --watch --env MV=2",
@@ -47,15 +47,13 @@
4747
"html-webpack-plugin": "5.3.2",
4848
"jimp": "0.16.1",
4949
"jsdom": "15.2.1",
50-
"mocha": "7.2.0",
5150
"null-loader": "4.0.1",
5251
"nyc": "15.1.0",
5352
"responsive-loader": "2.3.0",
5453
"rimraf": "4.2.0",
5554
"sinon": "15.0.1",
5655
"sinon-chrome": "3.0.1",
5756
"ts-loader": "9.2.5",
58-
"ts-mocha": "10.0.0",
5957
"typescript": "4.4.4",
6058
"webpack": "4.46.0",
6159
"webpack-cli": "4.7.2",

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [0.29.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.3...resource-detector-alibaba-cloud-v0.29.4) (2024-10-25)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
11+
312
## [0.29.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.2...resource-detector-alibaba-cloud-v0.29.3) (2024-10-10)
413

514

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.29.3",
3+
"version": "0.29.4",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -13,7 +13,7 @@
1313
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
1414
"prewatch": "npm run precompile",
1515
"prepublishOnly": "npm run compile",
16-
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
16+
"test": "nyc mocha 'test/**/*.test.ts'",
1717
"tdd": "npm run test -- --watch-extensions ts --watch",
1818
"watch": "tsc -w"
1919
},
@@ -40,24 +40,22 @@
4040
},
4141
"devDependencies": {
4242
"@opentelemetry/api": "^1.0.0",
43-
"@opentelemetry/contrib-test-utils": "^0.41.0",
43+
"@opentelemetry/contrib-test-utils": "^0.42.0",
4444
"@types/mocha": "8.2.3",
4545
"@types/node": "18.18.14",
4646
"@types/sinon": "10.0.20",
47-
"mocha": "7.2.0",
4847
"nock": "13.3.3",
4948
"nyc": "15.1.0",
5049
"rimraf": "5.0.10",
5150
"sinon": "15.2.0",
52-
"ts-mocha": "10.0.0",
5351
"typescript": "4.4.4"
5452
},
5553
"peerDependencies": {
5654
"@opentelemetry/api": "^1.0.0"
5755
},
5856
"dependencies": {
59-
"@opentelemetry/resources": "^1.10.0",
6057
"@opentelemetry/core": "^1.26.0",
58+
"@opentelemetry/resources": "^1.10.0",
6159
"@opentelemetry/semantic-conventions": "^1.27.0"
6260
},
6361
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"

‎detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [1.7.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.2...resource-detector-aws-v1.7.0) (2024-10-25)
4+
5+
6+
### Features
7+
8+
* update "@opentelemetry/*" dependencies to 1.27.0/0.54.0 ([2822511](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/2822511a8acffb875ebd67ff2cf95980a9ddc01e))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* devDependencies
15+
* @opentelemetry/contrib-test-utils bumped from ^0.41.0 to ^0.42.0
16+
317
## [1.6.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.1...resource-detector-aws-v1.6.2) (2024-10-08)
418

519

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.6.2",
3+
"version": "1.7.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -13,7 +13,7 @@
1313
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies",
1414
"prewatch": "npm run precompile",
1515
"prepublishOnly": "npm run compile",
16-
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
16+
"test": "nyc mocha 'test/**/*.test.ts'",
1717
"tdd": "npm run test -- --watch-extensions ts --watch",
1818
"watch": "tsc -w"
1919
},
@@ -39,16 +39,14 @@
3939
},
4040
"devDependencies": {
4141
"@opentelemetry/api": "^1.0.0",
42-
"@opentelemetry/contrib-test-utils": "^0.41.0",
42+
"@opentelemetry/contrib-test-utils": "^0.42.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.18.14",
4545
"@types/sinon": "10.0.20",
46-
"mocha": "7.2.0",
4746
"nock": "13.3.3",
4847
"nyc": "15.1.0",
4948
"rimraf": "5.0.10",
5049
"sinon": "15.2.0",
51-
"ts-mocha": "10.0.0",
5250
"typescript": "4.4.4"
5351
},
5452
"peerDependencies": {

‎detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ describe('[Integration] Internal tracing', () => {
3232
'http://169.254.169.254/metadata';
3333

3434
const memoryExporter = new InMemorySpanExporter();
35+
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
3536
const sdk = new NodeSDK({
3637
instrumentations: [new FsInstrumentation(), new HttpInstrumentation()],
37-
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
38+
spanProcessors: [spanProcessor],
3839
});
3940
sdk.start();
4041

@@ -58,7 +59,7 @@ describe('[Integration] Internal tracing', () => {
5859

5960
// NOTE: the require process makes use of the fs API so spans are being exported.
6061
// We reset the exporter to have a clean state for assertions
61-
await new Promise(r => setTimeout(r, 0));
62+
await spanProcessor.forceFlush();
6263
memoryExporter.reset();
6364

6465
const detectors = [

0 commit comments

Comments
 (0)