Merge branch 'main' into remove-addLogRecordProcessor

Author: pichlermarc

plugins/node/opentelemetry-instrumentation-redis-4/test/redis.test.ts

@@ -314,7 +314,12 @@ describe('redis@^4.0.0', () => {
         // Ignore. If the test Redis is not at the default port we expect this
         // to error.
       }
-      await newClient.disconnect();
+      try {
+        await newClient.disconnect();
+      } catch (_disconnectErr) {
+        // Ignore. In [email protected] and earlier this disconnect throws
+        // "The client is closed" if the connect failed.
+      }
 
       const [span] = getTestSpans();
       assert.strictEqual(span.name, 'redis-connect');