test: fix testing for @elastic/elasticsearch version 9 (#4583)

`@elastic/[email protected]` was released recently. This updates our testing to pass with it. So far no instrumentation changes were necessary. (I'm not sure if testing with v9 of the client would have failed with the older 8.7.1 version of the server that we had been using.)

Also reduce the number of ES client versions tested.

Obsoletes: #4576

Author: trentm

.ci/docker/docker-compose.yml

@@ -74,7 +74,7 @@ services:
       retries: 30
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.7.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0
     environment:
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
       - "network.host=_site_"

.github/workflows/test.yml

@@ -104,7 +104,7 @@ jobs:
           - nodemssqldata:/var/opt/mssql
 
       elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:8.7.1
+        image: docker.elastic.co/elasticsearch/elasticsearch:9.0.0
         env:
           ES_JAVA_OPTS: '-Xms512m -Xmx512m'
           network.host: '_site_'

.tav.yml

@@ -267,18 +267,32 @@ elasticsearch:
 #     semver (and TAV) consider "-patch.N" to be a *prereleases*. This
 #     leads to some tortured "versions:" ranges below.
 # - Version 8.11.0 dropped node v14 and v16 support.
+# - Version 9 dropped v18 support (effectively by using undici@7).
 '@elastic/elasticsearch':
-  - versions: '>=7.0.0 <7.7.0 || >7.7.0 <7.12.0'
+  - versions:
+      mode: max-3
+      include: '>=7.0.0 <7.7.0 || >7.7.0 <7.12.0'
     commands: node test/instrumentation/modules/@elastic/elasticsearch.test.js
-  - versions: '>=7.12.0 <8.2'
+  - versions:
+      mode: max-3
+      include: '>=7.12.0 <8.2'
     node: '>=12.0.0'
     commands: node test/instrumentation/modules/@elastic/elasticsearch.test.js
-  - versions: '>=8.2.0-patch.1 <8.2.0 || >8.2.0 <8.11.0'
+  - versions:
+      mode: max-3
+      include: '>8.2.0 <8.11.0'
     node: '>=14.0.0'
     commands: node test/instrumentation/modules/@elastic/elasticsearch.test.js
-  - versions: '>=8.11.0'
+  - versions:
+      mode: max-5
+      include: '>=8.11.0 <9.0.0'
     node: '>=18.0.0'
     commands: node test/instrumentation/modules/@elastic/elasticsearch.test.js
+  - versions:
+      mode: max-5
+      include: '>=9.0.0 <10'
+    node: '>=20.0.0'
+    commands: node test/instrumentation/modules/@elastic/elasticsearch.test.js
 
 handlebars:
   versions:

examples/trace-elasticsearch8.js examples/trace-elasticsearch.jsexamples/trace-elasticsearch8.js renamed to examples/trace-elasticsearch.js

@@ -6,25 +6,20 @@
  * compliance with the BSD 2-Clause License.
  */
 
-// A small example showing Elastic APM tracing @elastic/elasticsearch version 8.
+// A small example showing Elastic APM tracing @elastic/elasticsearch.
 //
 // This assumes an Elasticsearch running on localhost. You can use:
 //    npm run docker:start elasticsearch
 // to start an Elasticsearch docker container. Then the following to stop:
 //    npm run docker:stop
 
 const apm = require('../').start({
-  serviceName: 'example-trace-elasticsearch8',
+  serviceName: 'example-trace-elasticsearch',
 });
 
-// eslint-disable-next-line no-unused-vars
-const { Client, HttpConnection } = require('@elastic/elasticsearch');
+const { Client } = require('@elastic/elasticsearch');
 
 const client = new Client({
-  // By default version 8 uses the new undici HTTP client lib. You can specify
-  // `HttpConnection` to use the older HTTP client.
-  // Connection: HttpConnection,
-
   node: process.env.ES_URL || 'http://localhost:9200',
   auth: {
     username: process.env.ES_USERNAME || undefined,
@@ -33,7 +28,7 @@ const client = new Client({
   maxRetries: 1,
 });
 
-async function run() {
+async function main() {
   // For tracing spans to be created, there must be an active transaction.
   // Typically, a transaction is automatically started for incoming HTTP
   // requests to a Node.js server. However, because this script is not running
@@ -75,25 +70,23 @@ async function run() {
       t2.end();
     });
 
-  // Example aborting requests using AbortController (node v15 and above).
-  if (global.AbortController) {
-    const t3 = apm.startTransaction('t3');
-    const ac = new AbortController(); // eslint-disable-line no-undef
-    setImmediate(() => {
-      ac.abort();
-    });
-    try {
-      const res = await client.search(
-        { query: { match_all: {} } },
-        { signal: ac.signal },
-      );
-      console.log('[example 3] search response:', res);
-    } catch (err) {
-      console.log('[example 3] search error:', err);
-    } finally {
-      t3.end();
-    }
+  // Example aborting requests using AbortController.
+  const t3 = apm.startTransaction('t3');
+  const ac = new AbortController(); // eslint-disable-line no-undef
+  setImmediate(() => {
+    ac.abort();
+  });
+  try {
+    const res = await client.search(
+      { query: { match_all: {} } },
+      { signal: ac.signal },
+    );
+    console.log('[example 3] search response:', res);
+  } catch (err) {
+    console.log('[example 3] search error:', err);
+  } finally {
+    t3.end();
   }
 }
 
-run();
+main();