diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml b/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml index 48fcc20f58..b1f3559732 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/.tav.yml @@ -1,67 +1,28 @@ -# Note: tests must set `SKIP_TEST_IF_DISABLE=true` to override usage of -# `mocha --require '../../../scripts/skip-test-if.js' ...` if calling `npm test`. - # Versions [3.363.0, 3.377.0] of all @aws-sdk/client-* were bad releases. See: # - https://github.com/open-telemetry/opentelemetry-js-contrib/pull/2464#issuecomment-2403652552 # - https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1828#issuecomment-1834276719 # node version support in JS SDK v3: -# - 14.x dropped in v3.567.0 https://github.com/aws/aws-sdk-js-v3/pull/6034 # - 16.x dropped in v3.723.0 https://github.com/aws/aws-sdk-js-v3/pull/6775 -"@aws-sdk/client-s3": - env: - - SKIP_TEST_IF_DISABLE=true +'@aws-sdk/client-s3': # - 3.529.0 was missing the fast-xml-parser dependency (https://github.com/aws/aws-sdk-js-v3/releases/tag/v3.529.1) jobs: - - node: ">=18" - versions: - include: "^3.6.1" - exclude: "3.529.0 || >=3.363.0 <=3.377.0" - mode: "max-7" - commands: - - mocha --require '@opentelemetry/contrib-test-utils' test/aws-sdk-v3-s3.test.ts - - mocha --require '@opentelemetry/contrib-test-utils' test/s3.test.ts - - node: "16" - versions: - include: ">=3.6.1 <3.723.0" - exclude: "3.529.0 || >=3.363.0 <=3.377.0" - mode: "max-7" - commands: - - mocha --require '@opentelemetry/contrib-test-utils' test/aws-sdk-v3-s3.test.ts - - mocha --require '@opentelemetry/contrib-test-utils' test/s3.test.ts - - node: "14" + - node: '>=18' versions: - include: ">=3.6.1 <3.567.0" - exclude: "3.529.0 || >=3.363.0 <=3.377.0" - mode: "max-7" + include: '^3.6.1' + exclude: '3.529.0 || >=3.363.0 <=3.377.0' + mode: 'max-7' commands: - mocha --require '@opentelemetry/contrib-test-utils' test/aws-sdk-v3-s3.test.ts - mocha --require '@opentelemetry/contrib-test-utils' test/s3.test.ts -"@aws-sdk/client-sqs": - env: - - SKIP_TEST_IF_DISABLE=true +'@aws-sdk/client-sqs': jobs: - - node: ">=18" - versions: - include: "^3.24.0" - exclude: ">=3.363.0 <=3.377.0" - mode: "max-7" - commands: - - mocha --require '@opentelemetry/contrib-test-utils' test/aws-sdk-v3-sqs.test.ts - - node: "16" + - node: '>=18' versions: - include: ">=3.24.0 <3.723.0" - exclude: ">=3.363.0 <=3.377.0" - mode: "max-7" + include: '^3.24.0' + exclude: '>=3.363.0 <=3.377.0' + mode: 'max-7' commands: - mocha --require '@opentelemetry/contrib-test-utils' test/aws-sdk-v3-sqs.test.ts - - node: "14" - versions: - include: ">=3.24.0 <3.567.0" - exclude: ">=3.363.0 <=3.377.0" - mode: "max-7" - commands: - - mocha --require '@opentelemetry/contrib-test-utils' test/aws-sdk-v3-sqs.test.ts - diff --git a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json index ba5f9fef09..684b61054c 100644 --- a/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json +++ b/plugins/node/opentelemetry-instrumentation-aws-sdk/package.json @@ -35,7 +35,7 @@ "prewatch": "npm run precompile", "prepublishOnly": "npm run compile", "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "SKIP_TEST_IF_NODE_OLDER_THAN=18 nyc mocha --require '../../../scripts/skip-test-if.js' --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", + "test": "nyc mocha --require '@opentelemetry/contrib-test-utils' 'test/**/*.test.ts'", "test-all-versions": "tav", "version:update": "node ../../../scripts/version-update.js", "watch": "tsc -w"