From 23cd64ea7f6b6808104dd4afd42434e9699653c0 Mon Sep 17 00:00:00 2001
From: Trent Mick <trent.mick@elastic.co>
Date: Tue, 14 Jan 2025 15:06:20 -0800
Subject: [PATCH] skip testing with Node <18 with the latest aws-sdk clients

Also fix a bug in runTestFixtures that would never resolve a promise
if versionRanges was used to skip a test.
---
 packages/instrumentation-openai/test/testutils.js      | 1 +
 packages/opentelemetry-node/test/instr-aws-sdk.test.js | 8 ++++++++
 packages/opentelemetry-node/test/testutils.js          | 1 +
 3 files changed, 10 insertions(+)

diff --git a/packages/instrumentation-openai/test/testutils.js b/packages/instrumentation-openai/test/testutils.js
index e1b1f6b3..5d90048d 100644
--- a/packages/instrumentation-openai/test/testutils.js
+++ b/packages/instrumentation-openai/test/testutils.js
@@ -525,6 +525,7 @@ function runTestFixtures(suite, testFixtures) {
                   )})`
                 );
                 t.end();
+                outerResolve();
                 return;
               }
             }
diff --git a/packages/opentelemetry-node/test/instr-aws-sdk.test.js b/packages/opentelemetry-node/test/instr-aws-sdk.test.js
index 4982ce36..e7d70c17 100644
--- a/packages/opentelemetry-node/test/instr-aws-sdk.test.js
+++ b/packages/opentelemetry-node/test/instr-aws-sdk.test.js
@@ -31,10 +31,15 @@ const TEST_REGION = 'us-east-2';
 const server = createServer();
 const endpoint = `http://127.0.0.1:${server.address().port}`;
 
+// `@aws-sdk/client-*` >=3.723.0 switched to `@smithy/smithy-client@4`
+// which supports only Node.js v18 and later now.
+const AWS_SDK_SUPPORTED_NODE_RANGE = '>=18.0.0';
+
 /** @type {import('./testutils').TestFixture[]} */
 const testFixtures = [
     {
         name: 'use-aws-client-s3',
+        versionRanges: {node: AWS_SDK_SUPPORTED_NODE_RANGE},
         args: ['./fixtures/use-aws-client-s3.js'],
         cwd: __dirname,
         env: {
@@ -70,6 +75,7 @@ const testFixtures = [
     },
     {
         name: 'use-aws-client-sns',
+        versionRanges: {node: AWS_SDK_SUPPORTED_NODE_RANGE},
         args: ['./fixtures/use-aws-client-sns.js'],
         cwd: __dirname,
         env: {
@@ -106,6 +112,7 @@ const testFixtures = [
     },
     {
         name: 'use-aws-client-sqs',
+        versionRanges: {node: AWS_SDK_SUPPORTED_NODE_RANGE},
         args: ['./fixtures/use-aws-client-sqs.js'],
         cwd: __dirname,
         env: {
@@ -143,6 +150,7 @@ const testFixtures = [
     },
     {
         name: 'use-aws-client-dynamodb',
+        versionRanges: {node: AWS_SDK_SUPPORTED_NODE_RANGE},
         args: ['./fixtures/use-aws-client-dynamodb.js'],
         cwd: __dirname,
         env: {
diff --git a/packages/opentelemetry-node/test/testutils.js b/packages/opentelemetry-node/test/testutils.js
index 57b82e8e..a7d08305 100644
--- a/packages/opentelemetry-node/test/testutils.js
+++ b/packages/opentelemetry-node/test/testutils.js
@@ -569,6 +569,7 @@ function runTestFixtures(suite, testFixtures) {
                                     )})`
                                 );
                                 t.end();
+                                outerResolve();
                                 return;
                             }
                         }