From ce8677ba91dcdac7c3bbebae5dbcdc77bf5723b0 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Tue, 2 Nov 2021 08:49:03 -0500
Subject: [PATCH] [7.15] Bump node to 14.18.1 (#116783)

* [7.15] Bump node to 14.18.1

* fix version

* backport connection count delay
---
 .ci/Dockerfile                                       |  2 +-
 .node-version                                        |  2 +-
 .nvmrc                                               |  2 +-
 WORKSPACE.bazel                                      | 12 ++++++------
 package.json                                         |  2 +-
 .../integration_tests/server_collector.test.ts       |  3 +++
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.ci/Dockerfile b/.ci/Dockerfile
index d3ea74ca3896..c71d2d8878f8 100644
--- a/.ci/Dockerfile
+++ b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=14.17.6
+ARG NODE_VERSION=14.18.1
 
 FROM node:${NODE_VERSION} AS base
 
diff --git a/.node-version b/.node-version
index 5595ae1aa9e4..31102b28de6a 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-14.17.6
+14.18.1
diff --git a/.nvmrc b/.nvmrc
index 5595ae1aa9e4..31102b28de6a 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14.17.6
+14.18.1
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 3ae3f202a3bf..76101fb53e52 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -27,13 +27,13 @@ check_rules_nodejs_version(minimum_version_string = "3.8.0")
 # we can update that rule.
 node_repositories(
   node_repositories = {
-    "14.17.6-darwin_amd64": ("node-v14.17.6-darwin-x64.tar.gz", "node-v14.17.6-darwin-x64", "e3e4c02240d74fb1dc8a514daa62e5de04f7eaee0bcbca06a366ece73a52ad88"),
-    "14.17.6-linux_arm64": ("node-v14.17.6-linux-arm64.tar.xz", "node-v14.17.6-linux-arm64", "9c4f3a651e03cd9b5bddd33a80e8be6a6eb15e518513e410bb0852a658699156"),
-    "14.17.6-linux_s390x": ("node-v14.17.6-linux-s390x.tar.xz", "node-v14.17.6-linux-s390x", "3677f35b97608056013b5368f86eecdb044bdccc1b3976c1d4448736c37b6a0c"),
-    "14.17.6-linux_amd64": ("node-v14.17.6-linux-x64.tar.xz", "node-v14.17.6-linux-x64", "3bbe4faf356738d88b45be222bf5e858330541ff16bd0d4cfad36540c331461b"),
-    "14.17.6-windows_amd64": ("node-v14.17.6-win-x64.zip", "node-v14.17.6-win-x64", "b83e9ce542fda7fc519cec6eb24a2575a84862ea4227dedc171a8e0b5b614ac0"),
+    "14.18.1-darwin_amd64": ("node-v14.18.1-darwin-x64.tar.gz", "node-v14.18.1-darwin-x64", "78731152378577decf681167f4c6be6c31134dfef07403c1cebfbd3289d3886f"),
+    "14.18.1-linux_arm64": ("node-v14.18.1-linux-arm64.tar.xz", "node-v14.18.1-linux-arm64", "15c2ba182bafcc006c01a0e6f736a6ff3df101dec4c45026add51025095ab60d"),
+    "14.18.1-linux_s390x": ("node-v14.18.1-linux-s390x.tar.xz", "node-v14.18.1-linux-s390x", "e01f11308371b4268341a1b25dfb4433ae2e2403940f5acbfeb820b128ca7e27"),
+    "14.18.1-linux_amd64": ("node-v14.18.1-linux-x64.tar.xz", "node-v14.18.1-linux-x64", "ad1e3baa1aee8028b43206da3b2be9b8867cb598b4318bc88a0ae4518cc062a2"),
+    "14.18.1-windows_amd64": ("node-v14.18.1-win-x64.zip", "node-v14.18.1-win-x64", "86737cd4544c4f8cda2abd8e60709a87dbf46119062c5f1d4ec297f71a9e204b"),
   },
-  node_version = "14.17.6",
+  node_version = "14.18.1",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],
diff --git a/package.json b/package.json
index be54a06a9afc..aebe196df2d2 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "**/underscore": "^1.13.1"
   },
   "engines": {
-    "node": "14.17.6",
+    "node": "14.18.1",
     "yarn": "^1.21.1"
   },
   "dependencies": {
diff --git a/src/core/server/metrics/integration_tests/server_collector.test.ts b/src/core/server/metrics/integration_tests/server_collector.test.ts
index 93589648ca0a..855ced339e0c 100644
--- a/src/core/server/metrics/integration_tests/server_collector.test.ts
+++ b/src/core/server/metrics/integration_tests/server_collector.test.ts
@@ -195,6 +195,9 @@ describe('ServerMetricsCollector', () => {
 
     waitSubject.next('go');
     await Promise.all([res1, res2]);
+    // Give the event-loop one more cycle to allow concurrent connections to be
+    // up to date before collecting
+    await new Promise((resolve) => setTimeout(resolve, 0));
     metrics = await collector.collect();
     expect(metrics.concurrent_connections).toEqual(0);
   });