From 1bbf5b2d33c2712c6bde6aee0f493ed47b1376c9 Mon Sep 17 00:00:00 2001
From: Trent Mick <trent.mick@elastic.co>
Date: Thu, 4 Apr 2024 16:49:07 -0700
Subject: [PATCH] test: drop testing of @elastic/elasticsearch-canary; update
 undici dev-dep, transitive from @elastic/transport (#3949)

The elasticsearch-canary version was very old. In practice we weren't updated it,
hence there was no value in testing these.

Refs: #3948
---
 package-lock.json                             | 36 ++++---------------
 package.json                                  |  1 -
 .../@elastic/elasticsearch-canary.test.js     | 16 ---------
 3 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 test/instrumentation/modules/@elastic/elasticsearch-canary.test.js

diff --git a/package-lock.json b/package-lock.json
index 42e7ff8835..2d743f531b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,6 @@
         "@babel/core": "^7.8.4",
         "@babel/preset-env": "^7.8.4",
         "@elastic/elasticsearch": "^8.6.0",
-        "@elastic/elasticsearch-canary": "^8.8.0-canary.2",
         "@fastify/formbody": "^7.0.1",
         "@hapi/hapi": "^21.0.0",
         "@koa/router": "^12.0.0",
@@ -4247,19 +4246,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@elastic/elasticsearch-canary": {
-      "version": "8.8.0-canary.2",
-      "resolved": "https://registry.npmjs.org/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.8.0-canary.2.tgz",
-      "integrity": "sha512-UxH8YUxcsqHXGh4t2PjuL0q03XunF9vCLHPAs9r+fQcaPXpNbEuv9jbNGXv/9TLyeAKYEgcq9Xm0p0Nk/Mh0lQ==",
-      "dev": true,
-      "dependencies": {
-        "@elastic/transport": "^8.3.1",
-        "tslib": "^2.4.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/@elastic/transport": {
       "version": "8.4.1",
       "resolved": "https://registry.npmjs.org/@elastic/transport/-/transport-8.4.1.tgz",
@@ -4293,9 +4279,9 @@
       "dev": true
     },
     "node_modules/@elastic/transport/node_modules/undici": {
-      "version": "5.28.2",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz",
-      "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==",
+      "version": "5.28.4",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+      "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
       "dev": true,
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
@@ -21456,16 +21442,6 @@
         "tslib": "^2.4.0"
       }
     },
-    "@elastic/elasticsearch-canary": {
-      "version": "8.8.0-canary.2",
-      "resolved": "https://registry.npmjs.org/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.8.0-canary.2.tgz",
-      "integrity": "sha512-UxH8YUxcsqHXGh4t2PjuL0q03XunF9vCLHPAs9r+fQcaPXpNbEuv9jbNGXv/9TLyeAKYEgcq9Xm0p0Nk/Mh0lQ==",
-      "dev": true,
-      "requires": {
-        "@elastic/transport": "^8.3.1",
-        "tslib": "^2.4.0"
-      }
-    },
     "@elastic/transport": {
       "version": "8.4.1",
       "resolved": "https://registry.npmjs.org/@elastic/transport/-/transport-8.4.1.tgz",
@@ -21493,9 +21469,9 @@
           "dev": true
         },
         "undici": {
-          "version": "5.28.2",
-          "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz",
-          "integrity": "sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==",
+          "version": "5.28.4",
+          "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+          "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
           "dev": true,
           "requires": {
             "@fastify/busboy": "^2.0.0"
diff --git a/package.json b/package.json
index c4b93993ec..d8f116a64c 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,6 @@
     "@babel/core": "^7.8.4",
     "@babel/preset-env": "^7.8.4",
     "@elastic/elasticsearch": "^8.6.0",
-    "@elastic/elasticsearch-canary": "^8.8.0-canary.2",
     "@fastify/formbody": "^7.0.1",
     "@hapi/hapi": "^21.0.0",
     "@koa/router": "^12.0.0",
diff --git a/test/instrumentation/modules/@elastic/elasticsearch-canary.test.js b/test/instrumentation/modules/@elastic/elasticsearch-canary.test.js
deleted file mode 100644
index a7659d71db..0000000000
--- a/test/instrumentation/modules/@elastic/elasticsearch-canary.test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and other contributors where applicable.
- * Licensed under the BSD 2-Clause License; you may not use this file except in
- * compliance with the BSD 2-Clause License.
- */
-
-'use strict';
-
-if (process.env.GITHUB_ACTIONS === 'true' && process.platform === 'win32') {
-  console.log('# SKIP: GH Actions do not support docker services on Windows');
-  process.exit(0);
-}
-
-process.env.ELASTIC_APM_TEST_ESCLIENT_PACKAGE_NAME =
-  '@elastic/elasticsearch-canary';
-require('./elasticsearch.test.js');