Skip to content

Commit 989db3e

Browse files
facostaembracefacostaembrace
committed
Merge branch 'main' into instrumentation-react-native-navigation
2 parents d22d280 + 9a20e15 commit 989db3e

File tree

261 files changed

+9796
-13741
lines changed

Some content is hidden

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

261 files changed

+9796
-13741
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,20 +274,35 @@ 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:
280288
- detectors/node/opentelemetry-resource-detector-github/**
289+
- packages/opentelemetry-redis-common/**
281290
- plugins/node/instrumentation-fs/**
282291
- plugins/node/instrumentation-tedious/**
283292
- plugins/node/opentelemetry-instrumentation-connect/**
284293
- plugins/node/opentelemetry-instrumentation-dns/**
294+
- plugins/node/opentelemetry-instrumentation-fastify/**
285295
- plugins/node/opentelemetry-instrumentation-generic-pool/**
286296
- plugins/node/opentelemetry-instrumentation-hapi/**
287297
- plugins/node/opentelemetry-instrumentation-knex/**
288298
- plugins/node/opentelemetry-instrumentation-koa/**
289299
- plugins/node/opentelemetry-instrumentation-memcached/**
300+
- plugins/node/opentelemetry-instrumentation-mongodb/**
301+
- plugins/node/opentelemetry-instrumentation-mysql/**
302+
- plugins/node/opentelemetry-instrumentation-mysql2/**
290303
- plugins/node/opentelemetry-instrumentation-nestjs-core/**
291304
- plugins/node/opentelemetry-instrumentation-restify/**
292305
- plugins/node/opentelemetry-instrumentation-router/**
293306
- propagators/opentelemetry-propagator-ot-trace/**
307+
- propagators/propagator-aws-xray/**
308+
- propagators/propagator-aws-xray-lambda/**

‎.github/component_owners.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ components:
4242
- pichlermarc
4343
- legendecas
4444
- blumamir
45-
packages/opentelemetry-redis-common:
46-
- haddasbronfman
45+
packages/opentelemetry-redis-common: []
46+
# Unmaintained
4747
packages/opentelemetry-test-utils:
4848
- dyladan
4949
- pichlermarc
@@ -85,8 +85,8 @@ components:
8585
plugins/node/opentelemetry-instrumentation-express:
8686
- JamieDanielson
8787
- pkanal
88-
plugins/node/opentelemetry-instrumentation-fastify:
89-
- pichlermarc
88+
plugins/node/opentelemetry-instrumentation-fastify: []
89+
# Unmaintained
9090
plugins/node/opentelemetry-instrumentation-generic-pool: []
9191
# Unmaintained
9292
plugins/node/opentelemetry-instrumentation-graphql:
@@ -102,12 +102,12 @@ components:
102102
# Unmaintained
103103
plugins/node/opentelemetry-instrumentation-memcached: []
104104
# Unmaintained
105-
plugins/node/opentelemetry-instrumentation-mongodb:
106-
- osherv
107-
plugins/node/opentelemetry-instrumentation-mysql:
108-
- haddasbronfman
109-
plugins/node/opentelemetry-instrumentation-mysql2:
110-
- haddasbronfman
105+
plugins/node/opentelemetry-instrumentation-mongodb: []
106+
# Unmaintained
107+
plugins/node/opentelemetry-instrumentation-mysql: []
108+
# Unmaintained
109+
plugins/node/opentelemetry-instrumentation-mysql2: []
110+
# Unmaintained
111111
plugins/node/opentelemetry-instrumentation-nestjs-core: []
112112
# Unmaintained
113113
plugins/node/opentelemetry-instrumentation-net:
@@ -148,6 +148,10 @@ components:
148148
- kirrg001
149149
propagators/opentelemetry-propagator-ot-trace: []
150150
# Unmaintained
151+
propagators/propagator-aws-xray: [ ]
152+
# Unmaintained
153+
propagators/propagator-aws-xray-lambda: [ ]
154+
# Unmaintained
151155

152156
ignored-authors:
153157
- renovate-bot

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@ name: "CodeQL Analysis"
22

33
on:
44
workflow_dispatch:
5-
schedule:
6-
# ┌───────────── minute (0 - 59)
7-
# │ ┌───────────── hour (0 - 23)
8-
# │ │ ┌───────────── day of the month (1 - 31)
9-
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
10-
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
11-
# │ │ │ │ │
12-
# │ │ │ │ │
13-
# │ │ │ │ │
14-
# * * * * *
15-
- cron: '30 1 * * *'
5+
push:
6+
branches: [ main ]
7+
pull_request:
168

179
jobs:
1810
CodeQL-Build:

‎.github/workflows/lint.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ jobs:
1919
- name: Lint
2020
run: |
2121
npm run lint
22-
npm run lint:markdown
23-
npm run lint:readme

‎.github/workflows/unit-test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ jobs:
139139
- name: Report Coverage
140140
if: ${{ matrix.code-coverage && !cancelled()}}
141141
uses: codecov/codecov-action@v4
142+
env:
143+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
142144
with:
143145
verbose: true
144146

@@ -170,5 +172,7 @@ jobs:
170172
run: npm run test:browser
171173
- name: Report Coverage
172174
uses: codecov/codecov-action@v4
175+
env:
176+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
173177
with:
174178
verbose: true

‎.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: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,67 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.1",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.6.1",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.4.1",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.11",
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.12.0",
9-
"metapackages/auto-configuration-propagators": "0.3.0",
10-
"metapackages/auto-instrumentations-node": "0.50.0",
11-
"metapackages/auto-instrumentations-web": "0.41.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.14.0",
9+
"metapackages/auto-configuration-propagators": "0.3.1",
10+
"metapackages/auto-instrumentations-node": "0.52.0",
11+
"metapackages/auto-instrumentations-web": "0.42.0",
1212
"packages/baggage-span-processor": "0.3.1",
13-
"packages/opentelemetry-host-metrics": "0.35.3",
13+
"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",
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",
3131
"plugins/node/instrumentation-react-native-navigation": "0.1.0",
32-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.44.0",
33-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.44.0",
34-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.41.0",
35-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.41.0",
36-
"plugins/node/opentelemetry-instrumentation-connect": "0.39.0",
37-
"plugins/node/opentelemetry-instrumentation-dns": "0.39.0",
38-
"plugins/node/opentelemetry-instrumentation-express": "0.42.0",
39-
"plugins/node/opentelemetry-instrumentation-fastify": "0.39.0",
40-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.39.0",
41-
"plugins/node/opentelemetry-instrumentation-graphql": "0.43.0",
42-
"plugins/node/opentelemetry-instrumentation-hapi": "0.41.0",
43-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.43.0",
44-
"plugins/node/opentelemetry-instrumentation-knex": "0.40.0",
45-
"plugins/node/opentelemetry-instrumentation-koa": "0.43.0",
46-
"plugins/node/opentelemetry-instrumentation-memcached": "0.39.0",
47-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.47.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql": "0.41.0",
49-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
50-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
51-
"plugins/node/opentelemetry-instrumentation-net": "0.39.0",
52-
"plugins/node/opentelemetry-instrumentation-pg": "0.44.0",
53-
"plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
54-
"plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
55-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.42.0",
56-
"plugins/node/opentelemetry-instrumentation-restify": "0.41.0",
57-
"plugins/node/opentelemetry-instrumentation-router": "0.40.0",
58-
"plugins/node/opentelemetry-instrumentation-winston": "0.40.0",
59-
"plugins/web/opentelemetry-instrumentation-document-load": "0.40.0",
60-
"plugins/web/opentelemetry-instrumentation-long-task": "0.40.0",
61-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
32+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.46.0",
33+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.45.0",
34+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0",
35+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0",
36+
"plugins/node/opentelemetry-instrumentation-connect": "0.40.0",
37+
"plugins/node/opentelemetry-instrumentation-dns": "0.40.0",
38+
"plugins/node/opentelemetry-instrumentation-express": "0.44.0",
39+
"plugins/node/opentelemetry-instrumentation-fastify": "0.41.0",
40+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.40.0",
41+
"plugins/node/opentelemetry-instrumentation-graphql": "0.44.0",
42+
"plugins/node/opentelemetry-instrumentation-hapi": "0.42.0",
43+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.44.0",
44+
"plugins/node/opentelemetry-instrumentation-knex": "0.41.0",
45+
"plugins/node/opentelemetry-instrumentation-koa": "0.44.0",
46+
"plugins/node/opentelemetry-instrumentation-memcached": "0.40.0",
47+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0",
48+
"plugins/node/opentelemetry-instrumentation-mysql": "0.42.0",
49+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.42.0",
50+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0",
51+
"plugins/node/opentelemetry-instrumentation-net": "0.40.0",
52+
"plugins/node/opentelemetry-instrumentation-pg": "0.47.0",
53+
"plugins/node/opentelemetry-instrumentation-pino": "0.43.0",
54+
"plugins/node/opentelemetry-instrumentation-redis": "0.43.0",
55+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0",
56+
"plugins/node/opentelemetry-instrumentation-restify": "0.42.0",
57+
"plugins/node/opentelemetry-instrumentation-router": "0.41.0",
58+
"plugins/node/opentelemetry-instrumentation-winston": "0.41.0",
59+
"plugins/web/opentelemetry-instrumentation-document-load": "0.41.0",
60+
"plugins/web/opentelemetry-instrumentation-long-task": "0.41.0",
61+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.41.0",
6262
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
6363
"propagators/opentelemetry-propagator-instana": "0.3.2",
64-
"propagators/opentelemetry-propagator-ot-trace": "0.27.2"
64+
"propagators/opentelemetry-propagator-ot-trace": "0.27.2",
65+
"propagators/propagator-aws-xray": "1.26.0",
66+
"propagators/propagator-aws-xray-lambda": "0.53.0"
6567
}

‎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: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
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+
12+
## [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)
13+
14+
15+
### Bug Fixes
16+
17+
* add missing @opentelemetry/core dependency ([#2473](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2473)) ([4d66431](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4d66431a2ad480720bf6c33663a419ec1404cd33))
18+
19+
## [0.29.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.1...resource-detector-alibaba-cloud-v0.29.2) (2024-10-08)
20+
21+
22+
### Bug Fixes
23+
24+
* **detector-alibaba:** suppres internal tracing ([#2429](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2429)) ([9a7690e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/9a7690e92e571fcbf541eb76b6a5c4fde546b6e6))
25+
326
## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.0...resource-detector-alibaba-cloud-v0.29.1) (2024-09-02)
427

528

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

Lines changed: 5 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.1",
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,22 +40,21 @@
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",
45-
"@types/node": "18.6.5",
45+
"@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": {
57+
"@opentelemetry/core": "^1.26.0",
5958
"@opentelemetry/resources": "^1.10.0",
6059
"@opentelemetry/semantic-conventions": "^1.27.0"
6160
},

0 commit comments

Comments
 (0)