Skip to content

Commit 1b3d38f

Browse files
authored
Merge branch 'main' into main
2 parents 5b788a2 + 5eb61d8 commit 1b3d38f

File tree

319 files changed

+11902
-11586
lines changed

Some content is hidden

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

319 files changed

+11902
-11586
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: 23 additions & 18 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,15 +35,15 @@ 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
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
@@ -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
@@ -85,8 +86,8 @@ components:
8586
plugins/node/opentelemetry-instrumentation-express:
8687
- JamieDanielson
8788
- pkanal
88-
plugins/node/opentelemetry-instrumentation-fastify:
89-
- pichlermarc
89+
plugins/node/opentelemetry-instrumentation-fastify: []
90+
# Unmaintained
9091
plugins/node/opentelemetry-instrumentation-generic-pool: []
9192
# Unmaintained
9293
plugins/node/opentelemetry-instrumentation-graphql:
@@ -102,12 +103,12 @@ components:
102103
# Unmaintained
103104
plugins/node/opentelemetry-instrumentation-memcached: []
104105
# 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
106+
plugins/node/opentelemetry-instrumentation-mongodb: []
107+
# Unmaintained
108+
plugins/node/opentelemetry-instrumentation-mysql: []
109+
# Unmaintained
110+
plugins/node/opentelemetry-instrumentation-mysql2: []
111+
# Unmaintained
111112
plugins/node/opentelemetry-instrumentation-nestjs-core: []
112113
# Unmaintained
113114
plugins/node/opentelemetry-instrumentation-net:
@@ -145,6 +146,10 @@ components:
145146
- kirrg001
146147
propagators/opentelemetry-propagator-ot-trace: []
147148
# Unmaintained
149+
propagators/propagator-aws-xray:
150+
- jj22ee
151+
propagators/propagator-aws-xray-lambda: [ ]
152+
# Unmaintained
148153

149154
ignored-authors:
150155
- 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/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: 36 additions & 3 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:
@@ -26,14 +54,14 @@ jobs:
2654
ports:
2755
- 27017:27017
2856
mssql:
29-
image: mcr.microsoft.com/mssql/server:2017-latest
57+
image: mcr.microsoft.com/mssql/server:2022-latest
3058
env:
31-
SA_PASSWORD: mssql_passw0rd
59+
MSSQL_SA_PASSWORD: mssql_passw0rd
3260
ACCEPT_EULA: Y
3361
ports:
3462
- 1433:1433
3563
options: >-
36-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
64+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3765
--health-interval 1s
3866
--health-timeout 30s
3967
--health-start-period 10s
@@ -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: 46 additions & 3 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:
@@ -24,14 +52,14 @@ jobs:
2452
ports:
2553
- 27017:27017
2654
mssql:
27-
image: mcr.microsoft.com/mssql/server:2017-latest
55+
image: mcr.microsoft.com/mssql/server:2022-latest
2856
env:
29-
SA_PASSWORD: mssql_passw0rd
57+
MSSQL_SA_PASSWORD: mssql_passw0rd
3058
ACCEPT_EULA: Y
3159
ports:
3260
- 1433:1433
3361
options: >-
34-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
62+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3563
--health-interval 1s
3664
--health-timeout 30s
3765
--health-start-period 10s
@@ -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)
@@ -139,10 +172,13 @@ jobs:
139172
- name: Report Coverage
140173
if: ${{ matrix.code-coverage && !cancelled()}}
141174
uses: codecov/codecov-action@v4
175+
env:
176+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
142177
with:
143178
verbose: true
144179

145180
browser-test:
181+
needs: build-and-cache
146182
strategy:
147183
fail-fast: false
148184
matrix:
@@ -164,11 +200,18 @@ jobs:
164200
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
165201
- name: Install
166202
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
167208
- name: Build
168209
run: npm run compile
169210
- name: Unit tests
170211
run: npm run test:browser
171212
- name: Report Coverage
172213
uses: codecov/codecov-action@v4
214+
env:
215+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
173216
with:
174217
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'

0 commit comments

Comments
 (0)