Skip to content

Commit 9587d3e

Browse files
committed
Merge branch 'feat/support-express-v5' of https://github.com/timfish/opentelemetry-js-contrib into feat/support-express-v5
2 parents 94f564c + 3524745 commit 9587d3e

File tree

16 files changed

+539
-115
lines changed

16 files changed

+539
-115
lines changed

.github/component-label-map.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ pkg-status:unmaintained:
282282
- plugins/node/instrumentation-tedious/**
283283
- plugins/node/opentelemetry-instrumentation-connect/**
284284
- plugins/node/opentelemetry-instrumentation-dns/**
285+
- plugins/node/opentelemetry-instrumentation-fastify/**
285286
- plugins/node/opentelemetry-instrumentation-generic-pool/**
286287
- plugins/node/opentelemetry-instrumentation-hapi/**
287288
- plugins/node/opentelemetry-instrumentation-knex/**

.github/component_owners.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
ports:
2727
- 27017:27017
2828
mssql:
29-
image: mcr.microsoft.com/mssql/server:2017-latest
29+
image: mcr.microsoft.com/mssql/server:2022-latest
3030
env:
31-
SA_PASSWORD: mssql_passw0rd
31+
MSSQL_SA_PASSWORD: mssql_passw0rd
3232
ACCEPT_EULA: Y
3333
ports:
3434
- 1433:1433
3535
options: >-
36-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
36+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3737
--health-interval 1s
3838
--health-timeout 30s
3939
--health-start-period 10s

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
ports:
2525
- 27017:27017
2626
mssql:
27-
image: mcr.microsoft.com/mssql/server:2017-latest
27+
image: mcr.microsoft.com/mssql/server:2022-latest
2828
env:
29-
SA_PASSWORD: mssql_passw0rd
29+
MSSQL_SA_PASSWORD: mssql_passw0rd
3030
ACCEPT_EULA: Y
3131
ports:
3232
- 1433:1433
3333
options: >-
34-
--health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null"
34+
--health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
3535
--health-interval 1s
3636
--health-timeout 30s
3737
--health-start-period 10s

0 commit comments

Comments
 (0)