From ac026215ce2bb157f871f3b99bcaf66eeb3537c1 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Wed, 16 Mar 2022 11:03:19 +0200 Subject: [PATCH 1/2] fix(amqplib): add missing rabbit service to CI daily run --- .github/workflows/test-all-versions.yml | 7 +++++++ plugins/node/instrumentation-amqplib/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 1289d1fe1e..17d25c2fb4 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -87,6 +87,13 @@ jobs: image: bitnami/cassandra:3 ports: - 9042:9042 + rabbitmq: + image: rabbitmq:3 + ports: + - 22221:5672 + env: + RABBITMQ_DEFAULT_USER: username + RABBITMQ_DEFAULT_PASS: password env: RUN_CASSANDRA_TESTS: 1 RUN_MEMCACHED_TESTS: 1 diff --git a/plugins/node/instrumentation-amqplib/package.json b/plugins/node/instrumentation-amqplib/package.json index 4e64a04250..4d8c069547 100644 --- a/plugins/node/instrumentation-amqplib/package.json +++ b/plugins/node/instrumentation-amqplib/package.json @@ -32,7 +32,7 @@ "compile": "npm run version:update && tsc -p .", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "precompile": "tsc --version && lerna run version --scope $(npm pkg get name) --include-dependencies", + "precompile": "tsc --version && lerna run version --scope @opentelemetry/instrumentation-amqplib --include-dependencies", "prewatch": "npm run precompile", "prepare": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", From 8d44bb88fe1382ec71fb5e9cc0fd01bb1abe4ae1 Mon Sep 17 00:00:00 2001 From: Amir Blum Date: Wed, 16 Mar 2022 14:21:25 +0200 Subject: [PATCH 2/2] ci: don't run amqplib tav on node 8 --- .github/workflows/test-all-versions.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml index 17d25c2fb4..1e184a0c83 100644 --- a/.github/workflows/test-all-versions.yml +++ b/.github/workflows/test-all-versions.yml @@ -22,6 +22,7 @@ jobs: --ignore @opentelemetry/instrumentation-aws-sdk --ignore @opentelemetry/instrumentation-pino --ignore @opentelemetry/instrumentation-tedious + --ignore @opentelemetry/instrumentation-amqplib - node: "10" lerna-extra-args: >- --ignore @opentelemetry/instrumentation-pino