Skip to content

Commit c958f84

Browse files
pichlermarcpichlermarc
authored
Merge branch 'main' into fix/fastify-exports
2 parents 2727df2 + bda9632 commit c958f84

File tree

30 files changed

+669
-505
lines changed

30 files changed

+669
-505
lines changed

‎.release-please-manifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"detectors/node/opentelemetry-resource-detector-gcp": "0.32.0",
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
88
"detectors/node/opentelemetry-resource-detector-instana": "0.17.0",
9-
"metapackages/auto-configuration-propagators": "0.3.1",
10-
"metapackages/auto-instrumentations-node": "0.55.1",
9+
"metapackages/auto-configuration-propagators": "0.3.2",
10+
"metapackages/auto-instrumentations-node": "0.55.2",
1111
"metapackages/auto-instrumentations-web": "0.45.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.5",
@@ -24,11 +24,11 @@
2424
"plugins/node/instrumentation-kafkajs": "0.7.0",
2525
"plugins/node/instrumentation-lru-memoizer": "0.44.0",
2626
"plugins/node/instrumentation-mongoose": "0.46.0",
27-
"plugins/node/instrumentation-runtime-node": "0.12.0",
27+
"plugins/node/instrumentation-runtime-node": "0.12.1",
2828
"plugins/node/instrumentation-socket.io": "0.46.0",
2929
"plugins/node/instrumentation-tedious": "0.18.0",
3030
"plugins/node/instrumentation-undici": "0.10.0",
31-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.0",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.1",
3232
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.0",
3333
"plugins/node/opentelemetry-instrumentation-bunyan": "0.45.0",
3434
"plugins/node/opentelemetry-instrumentation-cassandra": "0.45.0",
@@ -61,6 +61,6 @@
6161
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
6262
"propagators/opentelemetry-propagator-instana": "0.3.2",
6363
"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"
64+
"propagators/propagator-aws-xray": "1.26.1",
65+
"propagators/propagator-aws-xray-lambda": "0.53.1"
6666
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
"version": "0.29.7",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
17-
"watch": "tsc -w"
18+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1819
},
1920
"keywords": [
2021
"opentelemetry",
@@ -32,7 +33,10 @@
3233
"files": [
3334
"build/src/**/*.js",
3435
"build/src/**/*.js.map",
35-
"build/src/**/*.d.ts"
36+
"build/src/**/*.d.ts",
37+
"build/esm/**/*.js",
38+
"build/esm/**/*.js.map",
39+
"build/esm/**/*.d.ts"
3640
],
3741
"publishConfig": {
3842
"access": "public"

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../../../tsconfig.base.esm.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esm",
6+
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
7+
},
8+
"include": [
9+
"src/**/*.ts"
10+
]
11+
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
"version": "1.10.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
17-
"watch": "tsc -w"
18+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1819
},
1920
"keywords": [
2021
"opentelemetry",
@@ -31,7 +32,10 @@
3132
"files": [
3233
"build/src/**/*.js",
3334
"build/src/**/*.js.map",
34-
"build/src/**/*.d.ts"
35+
"build/src/**/*.d.ts",
36+
"build/esm/**/*.js",
37+
"build/esm/**/*.js.map",
38+
"build/esm/**/*.d.ts"
3539
],
3640
"publishConfig": {
3741
"access": "public"

‎detectors/node/opentelemetry-resource-detector-aws/tsconfig.esm.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../../../tsconfig.base.esm.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esm",
6+
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
7+
},
8+
"include": [
9+
"src/**/*.ts"
10+
]
11+
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
"version": "0.5.0",
44
"description": "OpenTelemetry SDK resource detector for Azure",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
17-
"watch": "tsc -w"
18+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1819
},
1920
"author": "OpenTelemetry Authors",
2021
"license": "Apache-2.0",
@@ -24,7 +25,10 @@
2425
"files": [
2526
"build/src/**/*.js",
2627
"build/src/**/*.js.map",
27-
"build/src/**/*.d.ts"
28+
"build/src/**/*.d.ts",
29+
"build/esm/**/*.js",
30+
"build/esm/**/*.js.map",
31+
"build/esm/**/*.d.ts"
2832
],
2933
"publishConfig": {
3034
"access": "public"

‎detectors/node/opentelemetry-resource-detector-azure/tsconfig.esm.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../../../tsconfig.base.esm.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esm",
6+
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
7+
},
8+
"include": [
9+
"src/**/*.ts"
10+
]
11+
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
"version": "0.5.3",
44
"description": "Opentelemetry resource detector to get container resource attributes",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
1718
"version:update": "node ../../../scripts/version-update.js",
18-
"watch": "tsc -w"
19+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1920
},
2021
"author": "OpenTelemetry Authors",
2122
"license": "Apache-2.0",
@@ -25,7 +26,10 @@
2526
"files": [
2627
"build/src/**/*.js",
2728
"build/src/**/*.js.map",
28-
"build/src/**/*.d.ts"
29+
"build/src/**/*.d.ts",
30+
"build/esm/**/*.js",
31+
"build/esm/**/*.js.map",
32+
"build/esm/**/*.d.ts"
2933
],
3034
"publishConfig": {
3135
"access": "public"

‎detectors/node/opentelemetry-resource-detector-container/tsconfig.esm.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../../../tsconfig.base.esm.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esm",
6+
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
7+
},
8+
"include": [
9+
"src/**/*.ts"
10+
]
11+
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
"version": "0.32.0",
44
"description": "OpenTelemetry SDK resource detector for GCP",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
17-
"watch": "tsc -w"
18+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1819
},
1920
"keywords": [
2021
"opentelemetry",
@@ -31,7 +32,10 @@
3132
"files": [
3233
"build/src/**/*.js",
3334
"build/src/**/*.js.map",
34-
"build/src/**/*.d.ts"
35+
"build/src/**/*.d.ts",
36+
"build/esm/**/*.js",
37+
"build/esm/**/*.js.map",
38+
"build/esm/**/*.d.ts"
3539
],
3640
"publishConfig": {
3741
"access": "public"

0 commit comments

Comments
 (0)