Merge branch 'main' into ad-hoc-management-screen-2

Author: flash1293

.buildkite/scripts/steps/functional/apm_cypress.sh

@@ -4,6 +4,8 @@ set -euo pipefail
 
 source .buildkite/scripts/common/util.sh
 
+APM_CYPRESS_RECORD_KEY="$(retry 5 5 vault read -field=CYPRESS_RECORD_KEY secret/kibana-issues/dev/apm-cypress-dashboard-record-key)"
+
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/download_build_artifacts.sh
 
@@ -15,4 +17,6 @@ cd "$XPACK_DIR"
 
 checks-reporter-with-killswitch "APM Cypress Tests" \
   node plugins/apm/scripts/test/e2e.js \
-  --kibana-install-dir "$KIBANA_BUILD_LOCATION"
+  --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
+  --record \
+  --key "$APM_CYPRESS_RECORD_KEY"

.github/CODEOWNERS

@@ -745,6 +745,9 @@ packages/core/http/core-http-context-server-internal @elastic/kibana-core
 packages/core/http/core-http-context-server-mocks @elastic/kibana-core
 packages/core/http/core-http-request-handler-context-server @elastic/kibana-core
 packages/core/http/core-http-request-handler-context-server-internal @elastic/kibana-core
+packages/core/http/core-http-resources-server @elastic/kibana-core
+packages/core/http/core-http-resources-server-internal @elastic/kibana-core
+packages/core/http/core-http-resources-server-mocks @elastic/kibana-core
 packages/core/http/core-http-router-server-internal @elastic/kibana-core
 packages/core/http/core-http-router-server-mocks @elastic/kibana-core
 packages/core/http/core-http-server @elastic/kibana-core

package.json

@@ -215,6 +215,9 @@
     "@kbn/core-http-context-server-mocks": "link:bazel-bin/packages/core/http/core-http-context-server-mocks",
     "@kbn/core-http-request-handler-context-server": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server",
     "@kbn/core-http-request-handler-context-server-internal": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server-internal",
+    "@kbn/core-http-resources-server": "link:bazel-bin/packages/core/http/core-http-resources-server",
+    "@kbn/core-http-resources-server-internal": "link:bazel-bin/packages/core/http/core-http-resources-server-internal",
+    "@kbn/core-http-resources-server-mocks": "link:bazel-bin/packages/core/http/core-http-resources-server-mocks",
     "@kbn/core-http-router-server-internal": "link:bazel-bin/packages/core/http/core-http-router-server-internal",
     "@kbn/core-http-router-server-mocks": "link:bazel-bin/packages/core/http/core-http-router-server-mocks",
     "@kbn/core-http-server": "link:bazel-bin/packages/core/http/core-http-server",
@@ -942,6 +945,9 @@
     "@types/kbn__core-http-context-server-mocks": "link:bazel-bin/packages/core/http/core-http-context-server-mocks/npm_module_types",
     "@types/kbn__core-http-request-handler-context-server": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server/npm_module_types",
     "@types/kbn__core-http-request-handler-context-server-internal": "link:bazel-bin/packages/core/http/core-http-request-handler-context-server-internal/npm_module_types",
+    "@types/kbn__core-http-resources-server": "link:bazel-bin/packages/core/http/core-http-resources-server/npm_module_types",
+    "@types/kbn__core-http-resources-server-internal": "link:bazel-bin/packages/core/http/core-http-resources-server-internal/npm_module_types",
+    "@types/kbn__core-http-resources-server-mocks": "link:bazel-bin/packages/core/http/core-http-resources-server-mocks/npm_module_types",
     "@types/kbn__core-http-router-server-internal": "link:bazel-bin/packages/core/http/core-http-router-server-internal/npm_module_types",
     "@types/kbn__core-http-router-server-mocks": "link:bazel-bin/packages/core/http/core-http-router-server-mocks/npm_module_types",
     "@types/kbn__core-http-server": "link:bazel-bin/packages/core/http/core-http-server/npm_module_types",

packages/BUILD.bazel

@@ -81,6 +81,9 @@ filegroup(
     "//packages/core/http/core-http-context-server-mocks:build",
     "//packages/core/http/core-http-request-handler-context-server:build",
     "//packages/core/http/core-http-request-handler-context-server-internal:build",
+    "//packages/core/http/core-http-resources-server:build",
+    "//packages/core/http/core-http-resources-server-internal:build",
+    "//packages/core/http/core-http-resources-server-mocks:build",
     "//packages/core/http/core-http-router-server-internal:build",
     "//packages/core/http/core-http-router-server-mocks:build",
     "//packages/core/http/core-http-server:build",
@@ -418,6 +421,9 @@ filegroup(
     "//packages/core/http/core-http-context-server-mocks:build_types",
     "//packages/core/http/core-http-request-handler-context-server:build_types",
     "//packages/core/http/core-http-request-handler-context-server-internal:build_types",
+    "//packages/core/http/core-http-resources-server:build_types",
+    "//packages/core/http/core-http-resources-server-internal:build_types",
+    "//packages/core/http/core-http-resources-server-mocks:build_types",
     "//packages/core/http/core-http-router-server-internal:build_types",
     "//packages/core/http/core-http-router-server-mocks:build_types",
     "//packages/core/http/core-http-server:build_types",

packages/core/apps/core-apps-browser-internal/src/status/lib/load_status.test.ts

@@ -61,6 +61,19 @@ const mockedResponse: StatusResponse = {
         '15m': 0.1,
       },
     },
+    elasticsearch_client: {
+      protocol: 'https',
+      connectedNodes: 3,
+      nodesWithActiveSockets: 3,
+      nodesWithIdleSockets: 1,
+      totalActiveSockets: 25,
+      totalIdleSockets: 2,
+      totalQueuedRequests: 0,
+      mostActiveNodeSockets: 15,
+      averageActiveSocketsPerNode: 8,
+      mostIdleNodeSockets: 2,
+      averageIdleSocketsPerNode: 0.5,
+    },
     process: {
       pid: 1,
       memory: {

packages/core/elasticsearch/core-elasticsearch-client-server-internal/index.ts

@@ -9,7 +9,7 @@
 export { ScopedClusterClient } from './src/scoped_cluster_client';
 export { ClusterClient } from './src/cluster_client';
 export { configureClient } from './src/configure_client';
-export { AgentManager } from './src/agent_manager';
+export { type AgentStore, AgentManager } from './src/agent_manager';
 export { getRequestDebugMeta, getErrorMessage } from './src/log_query_and_deprecation';
 export {
   PRODUCT_RESPONSE_HEADER,

packages/core/elasticsearch/core-elasticsearch-client-server-internal/src/agent_manager.test.ts

@@ -104,10 +104,10 @@ describe('AgentManager', () => {
         const agentFactory = agentManager.getAgentFactory();
         const agent = agentFactory({ url: new URL('http://elastic-node-1:9200') });
         // eslint-disable-next-line dot-notation
-        expect(agentManager['httpStore'].has(agent)).toEqual(true);
+        expect(agentManager['agents'].has(agent)).toEqual(true);
         agent.destroy();
         // eslint-disable-next-line dot-notation
-        expect(agentManager['httpStore'].has(agent)).toEqual(false);
+        expect(agentManager['agents'].has(agent)).toEqual(false);
       });
     });
 
@@ -122,4 +122,21 @@ describe('AgentManager', () => {
       });
     });
   });
+
+  describe('#getAgents()', () => {
+    it('returns the created HTTP and HTTPs Agent instances', () => {
+      const agentManager = new AgentManager();
+      const agentFactory1 = agentManager.getAgentFactory();
+      const agentFactory2 = agentManager.getAgentFactory();
+      const agent1 = agentFactory1({ url: new URL('http://elastic-node-1:9200') });
+      const agent2 = agentFactory2({ url: new URL('http://elastic-node-1:9200') });
+      const agent3 = agentFactory1({ url: new URL('https://elastic-node-1:9200') });
+      const agent4 = agentFactory2({ url: new URL('https://elastic-node-1:9200') });
+
+      const agents = agentManager.getAgents();
+
+      expect(agents.size).toEqual(4);
+      expect([...agents]).toEqual(expect.arrayContaining([agent1, agent2, agent3, agent4]));
+    });
+  });
 });

packages/core/elasticsearch/core-elasticsearch-client-server-internal/src/agent_manager.ts

@@ -8,7 +8,7 @@
 
 import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent } from 'https';
-import { ConnectionOptions, HttpAgentOptions } from '@elastic/elasticsearch';
+import type { ConnectionOptions, HttpAgentOptions } from '@elastic/elasticsearch';
 
 const HTTPS = 'https:';
 const DEFAULT_CONFIG: HttpAgentOptions = {
@@ -22,6 +22,14 @@ const DEFAULT_CONFIG: HttpAgentOptions = {
 export type NetworkAgent = HttpAgent | HttpsAgent;
 export type AgentFactory = (connectionOpts: ConnectionOptions) => NetworkAgent;
 
+export interface AgentFactoryProvider {
+  getAgentFactory(agentOptions?: HttpAgentOptions): AgentFactory;
+}
+
+export interface AgentStore {
+  getAgents(): Set<NetworkAgent>;
+}
+
 /**
  * Allows obtaining Agent factories, which can then be fed into elasticsearch-js's Client class.
  * Ideally, we should obtain one Agent factory for each ES Client class.
@@ -33,15 +41,11 @@ export type AgentFactory = (connectionOpts: ConnectionOptions) => NetworkAgent;
  * exposes methods that can modify the underlying pools, effectively impacting the connections of other Clients.
  * @internal
  **/
-export class AgentManager {
-  // Stores Https Agent instances
-  private httpsStore: Set<HttpsAgent>;
-  // Stores Http Agent instances
-  private httpStore: Set<HttpAgent>;
+export class AgentManager implements AgentFactoryProvider, AgentStore {
+  private agents: Set<HttpAgent>;
 
   constructor(private agentOptions: HttpAgentOptions = DEFAULT_CONFIG) {
-    this.httpsStore = new Set();
-    this.httpStore = new Set();
+    this.agents = new Set();
   }
 
   public getAgentFactory(agentOptions?: HttpAgentOptions): AgentFactory {
@@ -61,8 +65,8 @@ export class AgentManager {
             connectionOpts.tls
           );
           httpsAgent = new HttpsAgent(config);
-          this.httpsStore.add(httpsAgent);
-          dereferenceOnDestroy(this.httpsStore, httpsAgent);
+          this.agents.add(httpsAgent);
+          dereferenceOnDestroy(this.agents, httpsAgent);
         }
 
         return httpsAgent;
@@ -71,19 +75,23 @@ export class AgentManager {
       if (!httpAgent) {
         const config = Object.assign({}, DEFAULT_CONFIG, this.agentOptions, agentOptions);
         httpAgent = new HttpAgent(config);
-        this.httpStore.add(httpAgent);
-        dereferenceOnDestroy(this.httpStore, httpAgent);
+        this.agents.add(httpAgent);
+        dereferenceOnDestroy(this.agents, httpAgent);
       }
 
       return httpAgent;
     };
   }
+
+  public getAgents(): Set<NetworkAgent> {
+    return this.agents;
+  }
 }
 
-const dereferenceOnDestroy = (protocolStore: Set<NetworkAgent>, agent: NetworkAgent) => {
+const dereferenceOnDestroy = (store: Set<NetworkAgent>, agent: NetworkAgent) => {
   const doDestroy = agent.destroy.bind(agent);
   agent.destroy = () => {
-    protocolStore.delete(agent);
+    store.delete(agent);
     doDestroy();
   };
 };