From 473c773103f4c6c2830ad450446f6108322bd51d Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 23 Sep 2024 17:02:23 +0200 Subject: [PATCH 1/7] ci: update mssql server image --- .github/workflows/test-all-versions.yml | 2 +- .github/workflows/unit-test.yml | 2 +- packages/opentelemetry-test-utils/src/test-utils.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 3010d00341..c7a638791c 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -26,7 +26,7 @@ jobs: ports: - 27017:27017 mssql: - image: mcr.microsoft.com/mssql/server:2017-latest + image: mcr.microsoft.com/mssql/server:2019-latest env: SA_PASSWORD: mssql_passw0rd ACCEPT_EULA: Y diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 49c3711c5c..594579c746 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -24,7 +24,7 @@ jobs: ports: - 27017:27017 mssql: - image: mcr.microsoft.com/mssql/server:2017-latest + image: mcr.microsoft.com/mssql/server:2019-latest env: SA_PASSWORD: mssql_passw0rd ACCEPT_EULA: Y diff --git a/packages/opentelemetry-test-utils/src/test-utils.ts b/packages/opentelemetry-test-utils/src/test-utils.ts index b6b6845677..55fb8f66b4 100644 --- a/packages/opentelemetry-test-utils/src/test-utils.ts +++ b/packages/opentelemetry-test-utils/src/test-utils.ts @@ -39,7 +39,7 @@ const dockerRunCmds = { memcached: 'docker run --rm -d --name otel-memcached -p 11211:11211 memcached:1.6.9-alpine', mssql: - 'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2017-latest', + 'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2019-latest', mysql: 'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7 --log_output=TABLE --general_log=ON', postgres: From 5b98b79489ef3ff72bdd3b8bd07172602f983e79 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 23 Sep 2024 17:08:35 +0200 Subject: [PATCH 2/7] chore: update healthcheck command --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 594579c746..e0ed632f6c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -31,7 +31,7 @@ jobs: ports: - 1433:1433 options: >- - --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" --health-interval 1s --health-timeout 30s --health-start-period 10s From bac096282862383a90c5269b4961ff0d08cd62e7 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 23 Sep 2024 17:09:02 +0200 Subject: [PATCH 3/7] chore: update healthcheck command --- .github/workflows/test-all-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index c7a638791c..f496879a99 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -33,7 +33,7 @@ jobs: ports: - 1433:1433 options: >- - --health-cmd "/opt/mssql-tools/bin/sqlcmd -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" --health-interval 1s --health-timeout 30s --health-start-period 10s From e11308ca4a56b071a221c6b5c3dde3a2b14e02c9 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 23 Sep 2024 17:22:18 +0200 Subject: [PATCH 4/7] chore: update healthcheck command path --- .github/workflows/test-all-versions.yml | 2 +- .github/workflows/unit-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index f496879a99..27cd82af21 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -33,7 +33,7 @@ jobs: ports: - 1433:1433 options: >- - --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" --health-interval 1s --health-timeout 30s --health-start-period 10s diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index e0ed632f6c..a1f9e112c1 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -31,7 +31,7 @@ jobs: ports: - 1433:1433 options: >- - --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" --health-interval 1s --health-timeout 30s --health-start-period 10s From c309dcfc43f717b20cb2bf1521064a962f4c910c Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 23 Sep 2024 17:26:39 +0200 Subject: [PATCH 5/7] chore: ignore self-signed cert --- .github/workflows/test-all-versions.yml | 2 +- .github/workflows/unit-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 27cd82af21..038eb749b5 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -33,7 +33,7 @@ jobs: ports: - 1433:1433 options: >- - --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -C -Q 'select 1' -b -o /dev/null" --health-interval 1s --health-timeout 30s --health-start-period 10s diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index a1f9e112c1..3998a291d1 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -31,7 +31,7 @@ jobs: ports: - 1433:1433 options: >- - --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'select 1' -b -o /dev/null" + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $SA_PASSWORD -C -Q 'select 1' -b -o /dev/null" --health-interval 1s --health-timeout 30s --health-start-period 10s From 04c9080e8e36625a098271c69c4ccfd592548dff Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Mon, 23 Sep 2024 17:36:41 +0200 Subject: [PATCH 6/7] chore: go straight to mssql server 2022 --- .github/workflows/test-all-versions.yml | 2 +- .github/workflows/unit-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 038eb749b5..86e8bf4dc2 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -26,7 +26,7 @@ jobs: ports: - 27017:27017 mssql: - image: mcr.microsoft.com/mssql/server:2019-latest + image: mcr.microsoft.com/mssql/server:2022-latest env: SA_PASSWORD: mssql_passw0rd ACCEPT_EULA: Y diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 3998a291d1..2bfb469764 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -24,7 +24,7 @@ jobs: ports: - 27017:27017 mssql: - image: mcr.microsoft.com/mssql/server:2019-latest + image: mcr.microsoft.com/mssql/server:2022-latest env: SA_PASSWORD: mssql_passw0rd ACCEPT_EULA: Y From 9e329e62e60f67cff4fc9ec7be11b5f0f0eca2ee Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Mon, 23 Sep 2024 10:29:25 -0700 Subject: [PATCH 7/7] bump the mssql/server version used in contrib-test-utils 'startDocker' helper to same 2022-latest tag THis isn't critical. This startDocker() helper is only used for local dev testing. --- packages/opentelemetry-test-utils/src/test-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opentelemetry-test-utils/src/test-utils.ts b/packages/opentelemetry-test-utils/src/test-utils.ts index 55fb8f66b4..2ecace8c35 100644 --- a/packages/opentelemetry-test-utils/src/test-utils.ts +++ b/packages/opentelemetry-test-utils/src/test-utils.ts @@ -39,7 +39,7 @@ const dockerRunCmds = { memcached: 'docker run --rm -d --name otel-memcached -p 11211:11211 memcached:1.6.9-alpine', mssql: - 'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2019-latest', + 'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2022-latest', mysql: 'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7 --log_output=TABLE --general_log=ON', postgres: