Skip to content

Commit 1554621

Browse files
onurtemizkanonurtemizkan
authored
Merge branch 'main' into dataloader-custom-methods
2 parents 9b675f6 + 5eb61d8 commit 1554621

File tree

124 files changed

+3367
-3417
lines changed

Some content is hidden

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

124 files changed

+3367
-3417
lines changed

‎.github/component_owners.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
components:
33
detectors/node/opentelemetry-resource-detector-alibaba-cloud:
44
- legendecas
5-
detectors/node/opentelemetry-resource-detector-aws: []
6-
# Unmaintained
5+
detectors/node/opentelemetry-resource-detector-aws:
6+
- jj22ee
77
detectors/node/opentelemetry-resource-detector-azure:
88
- jacksonweber
99
- hectorhdzg
@@ -16,8 +16,8 @@ components:
1616
# Unmaintained
1717
detectors/node/opentelemetry-resource-detector-instana:
1818
- kirrg001
19-
incubator/opentelemetry-sampler-aws-xray: []
20-
# Unmaintained
19+
incubator/opentelemetry-sampler-aws-xray:
20+
- jj22ee
2121
metapackages/auto-configuration-propagators:
2222
- pichlermarc
2323
metapackages/auto-instrumentations-node:
@@ -35,8 +35,8 @@ components:
3535
- jamiedanielson
3636
packages/opentelemetry-host-metrics:
3737
- legendecas
38-
packages/opentelemetry-id-generator-aws-xray: []
39-
# Unmaintained
38+
packages/opentelemetry-id-generator-aws-xray:
39+
- jj22ee
4040
packages/opentelemetry-propagation-utils:
4141
- dyladan
4242
- pichlermarc
@@ -69,10 +69,11 @@ components:
6969
- mottibec
7070
plugins/node/instrumentation-tedious: []
7171
# Unmaintained
72-
plugins/node/opentelemetry-instrumentation-aws-lambda: []
73-
# Unmaintained
72+
plugins/node/opentelemetry-instrumentation-aws-lambda:
73+
- jj22ee
7474
plugins/node/opentelemetry-instrumentation-aws-sdk:
7575
- blumamir
76+
- jj22ee
7677
plugins/node/opentelemetry-instrumentation-bunyan:
7778
- seemk
7879
- trentm
@@ -145,8 +146,8 @@ components:
145146
- kirrg001
146147
propagators/opentelemetry-propagator-ot-trace: []
147148
# Unmaintained
148-
propagators/propagator-aws-xray: [ ]
149-
# Unmaintained
149+
propagators/propagator-aws-xray:
150+
- jj22ee
150151
propagators/propagator-aws-xray-lambda: [ ]
151152
# Unmaintained
152153

‎.github/workflows/release-please.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818

19+
# If you update this version make sure to keep in sync:
20+
# - `build-and-cache` job of unit-test workflow
21+
# - `build-and-cache` job of test-all-versions workflow
1922
- name: Setup Node
2023
uses: actions/setup-node@v4
2124
with:

‎.github/workflows/test-all-versions.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,36 @@ on:
1313
type: string
1414

1515
jobs:
16+
build-and-cache:
17+
strategy:
18+
fail-fast: false
19+
runs-on: ubuntu-latest
20+
env:
21+
NPM_CONFIG_UNSAFE_PERM: true
22+
NODE_OPTIONS: --max-old-space-size=4096
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
# Use the same Node.js version used for `release-please` workflow.
29+
- uses: actions/setup-node@v4
30+
with:
31+
node-version: 18
32+
- name: Install
33+
run: npm ci
34+
- name: Build
35+
run: npm run compile
36+
- name: Upload Build Artifacts
37+
uses: actions/upload-artifact@v4
38+
with:
39+
name: tav-build-cache-${{ github.run_number }}
40+
path: node_modules/.cache/nx
41+
retention-days: 1
42+
1643
tav:
1744
name: Run test-all-versions
45+
needs: build-and-cache
1846
strategy:
1947
fail-fast: false
2048
matrix:
@@ -120,6 +148,11 @@ jobs:
120148
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
121149
- name: Install
122150
run: npm ci
151+
- name: Download Build Artifacts
152+
uses: actions/download-artifact@v4
153+
with:
154+
name: tav-build-cache-${{ github.run_number }}
155+
path: node_modules/.cache/nx
123156
- name: Build
124157
run: npm run compile
125158
- name: Run test-all-versions

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,35 @@ on:
55
pull_request:
66

77
jobs:
8+
build-and-cache:
9+
strategy:
10+
fail-fast: false
11+
runs-on: ubuntu-latest
12+
env:
13+
NPM_CONFIG_UNSAFE_PERM: true
14+
NODE_OPTIONS: --max-old-space-size=4096
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
# Use the same Node.js version used for `release-please` workflow.
21+
- uses: actions/setup-node@v4
22+
with:
23+
node-version: 18
24+
- name: Install
25+
run: npm ci
26+
- name: Build
27+
run: npm run compile
28+
- name: Upload build artifact
29+
uses: actions/upload-artifact@v4
30+
with:
31+
name: tests-build-cache-${{ github.run_number }}
32+
path: node_modules/.cache/nx
33+
retention-days: 1
34+
835
unit-test:
36+
needs: build-and-cache
937
strategy:
1038
fail-fast: false
1139
matrix:
@@ -128,6 +156,11 @@ jobs:
128156
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
129157
- name: Install
130158
run: npm ci
159+
- name: Download Build Artifacts
160+
uses: actions/download-artifact@v4
161+
with:
162+
name: tests-build-cache-${{ github.run_number }}
163+
path: node_modules/.cache/nx
131164
- name: Build
132165
run: npm run compile
133166
- name: Unit tests (Full)
@@ -145,6 +178,7 @@ jobs:
145178
verbose: true
146179

147180
browser-test:
181+
needs: build-and-cache
148182
strategy:
149183
fail-fast: false
150184
matrix:
@@ -166,6 +200,11 @@ jobs:
166200
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
167201
- name: Install
168202
run: npm ci
203+
- name: Download Build Artifacts
204+
uses: actions/download-artifact@v4
205+
with:
206+
name: tests-build-cache-${{ github.run_number }}
207+
path: node_modules/.cache/nx
169208
- name: Build
170209
run: npm run compile
171210
- name: Unit tests

‎.release-please-manifest.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
88
"detectors/node/opentelemetry-resource-detector-instana": "0.14.0",
99
"metapackages/auto-configuration-propagators": "0.3.1",
10-
"metapackages/auto-instrumentations-node": "0.52.0",
10+
"metapackages/auto-instrumentations-node": "0.52.1",
1111
"metapackages/auto-instrumentations-web": "0.42.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.4",
@@ -24,12 +24,12 @@
2424
"plugins/node/instrumentation-kafkajs": "0.4.0",
2525
"plugins/node/instrumentation-lru-memoizer": "0.41.0",
2626
"plugins/node/instrumentation-mongoose": "0.43.0",
27-
"plugins/node/instrumentation-runtime-node": "0.8.0",
27+
"plugins/node/instrumentation-runtime-node": "0.9.0",
2828
"plugins/node/instrumentation-socket.io": "0.43.0",
2929
"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",
30+
"plugins/node/instrumentation-undici": "0.7.1",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.47.0",
32+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.46.0",
3333
"plugins/node/opentelemetry-instrumentation-bunyan": "0.42.0",
3434
"plugins/node/opentelemetry-instrumentation-cassandra": "0.42.0",
3535
"plugins/node/opentelemetry-instrumentation-connect": "0.40.0",
@@ -45,10 +45,10 @@
4545
"plugins/node/opentelemetry-instrumentation-memcached": "0.40.0",
4646
"plugins/node/opentelemetry-instrumentation-mongodb": "0.48.0",
4747
"plugins/node/opentelemetry-instrumentation-mysql": "0.42.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.42.0",
48+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.42.1",
4949
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.41.0",
5050
"plugins/node/opentelemetry-instrumentation-net": "0.40.0",
51-
"plugins/node/opentelemetry-instrumentation-pg": "0.47.0",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.47.1",
5252
"plugins/node/opentelemetry-instrumentation-pino": "0.43.0",
5353
"plugins/node/opentelemetry-instrumentation-redis": "0.43.0",
5454
"plugins/node/opentelemetry-instrumentation-redis-4": "0.43.0",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-alibaba-cloud --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
[![NPM Published Version][npm-img]][npm-url]
44
[![Apache License][license-image]][license-image]
55

6-
[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): N/A
6+
[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @jj22ee
77

88
Resource detector for Amazon Web Services.
99

1010
## Status
1111

12-
| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility |
13-
|-------------------------------------------------------|-------------------------------------------------------|-----------------------|
14-
| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+<br/>SDK 1.0+ |
12+
| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility |
13+
| ----------------------------------------- | ----------------------------------------------------- | --------------------- |
14+
| [Stable](../../../CONTRIBUTING.md#stable) | @jj22ee | API 1.0+<br/>SDK 1.0+ |
1515

1616
## Installation
1717

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-aws --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -40,6 +39,8 @@
4039
"devDependencies": {
4140
"@opentelemetry/api": "^1.0.0",
4241
"@opentelemetry/contrib-test-utils": "^0.42.0",
42+
"@opentelemetry/instrumentation-fs": "^0.16.0",
43+
"@opentelemetry/instrumentation-http": "^0.54.0",
4344
"@types/mocha": "8.2.3",
4445
"@types/node": "18.18.14",
4546
"@types/sinon": "10.0.20",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-azure --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -33,6 +32,7 @@
3332
"devDependencies": {
3433
"@opentelemetry/api": "^1.0.0",
3534
"@opentelemetry/contrib-test-utils": "^0.42.0",
35+
"@opentelemetry/instrumentation-http": "^0.54.0",
3636
"@types/mocha": "8.2.3",
3737
"@types/node": "18.18.14",
3838
"@types/sinon": "10.0.20",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"compile": "tsc -p .",
1111
"lint": "eslint . --ext .ts",
1212
"lint:fix": "eslint . --ext .ts --fix",
13-
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/resource-detector-container --include-dependencies",
1413
"prewatch": "npm run precompile",
1514
"prepublishOnly": "npm run compile",
1615
"test": "nyc mocha 'test/**/*.test.ts'",
@@ -34,6 +33,7 @@
3433
"devDependencies": {
3534
"@opentelemetry/api": "^1.0.0",
3635
"@opentelemetry/contrib-test-utils": "^0.42.0",
36+
"@opentelemetry/instrumentation-fs": "^0.16.0",
3737
"@types/mocha": "8.2.3",
3838
"@types/node": "18.18.14",
3939
"@types/sinon": "10.0.20",

0 commit comments

Comments
 (0)