🤖 ESQL: Merge upstream (#174)

🤖 Generated PR to keep ESQL development branch up to date

Author: elasticsearchmachine

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.gradle.internal.conventions.LicensingPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.file.ArchiveOperations;
@@ -32,7 +33,7 @@
 
 import javax.inject.Inject;
 
-public class InternalDistributionArchiveCheckPlugin implements InternalPlugin {
+public class InternalDistributionArchiveCheckPlugin implements Plugin<Project> {
 
     private ArchiveOperations archiveOperations;
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java

@@ -9,6 +9,7 @@
 package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
 import org.gradle.api.attributes.Attribute;
@@ -38,7 +39,7 @@
  * - the unpacked variant is used by consumers like test cluster definitions
  * 4. Having per-distribution sub-projects means we can build them in parallel.
  */
-public class InternalDistributionArchiveSetupPlugin implements InternalPlugin {
+public class InternalDistributionArchiveSetupPlugin implements Plugin<Project> {
 
     public static final String DEFAULT_CONFIGURATION_NAME = "default";
     public static final String EXTRACTED_CONFIGURATION_NAME = "extracted";

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

@@ -13,6 +13,7 @@
 import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.provider.Provider;
@@ -40,7 +41,7 @@
  * unreleased versions are when Gradle projects are set up, so we use "build-unreleased-version-*" as placeholders
  * and configure them to build various versions here.
  */
-public class InternalDistributionBwcSetupPlugin implements InternalPlugin {
+public class InternalDistributionBwcSetupPlugin implements Plugin<Project> {
 
     private static final String BWC_TASK_THROTTLE_SERVICE = "bwcTaskThrottle";
     private ProviderFactory providerFactory;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

@@ -24,6 +24,7 @@
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.GradleException;
 import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.provider.Provider;
@@ -37,7 +38,7 @@
  * distribution resolution strategies to the 'elasticsearch.download-distribution' plugin
  * to resolve distributions from a local snapshot or a locally built bwc snapshot.
  */
-public class InternalDistributionDownloadPlugin implements InternalPlugin {
+public class InternalDistributionDownloadPlugin implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
@@ -129,12 +130,6 @@ private static String distributionProjectPath(ElasticsearchDistribution distribu
         return projectPath;
     }
 
-    @Override
-    public String getExternalUseErrorMessage() {
-        return "Plugin 'elasticsearch.internal-distribution-download' is not supported. "
-            + "Use 'elasticsearch.distribution-download' plugin instead.";
-    }
-
     /**
      * Works out the gradle project name that provides a distribution artifact.
      *

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalPlugin.java

@@ -8,9 +8,10 @@
 
 package org.elasticsearch.gradle.internal;
 
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
-public class InternalPluginBuildPlugin implements InternalPlugin {
+public class InternalPluginBuildPlugin implements Plugin<Project> {
     @Override
     public void apply(Project project) {
         project.getPluginManager().apply(BuildPlugin.class);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalPluginBuildPlugin.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.elasticsearch.gradle.VersionProperties;
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
@@ -30,7 +29,7 @@
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 
-public class CheckstylePrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class CheckstylePrecommitPlugin extends PrecommitPlugin {
     @Override
     public TaskProvider<? extends Task> createTask(Project project) {
         // Always copy the checkstyle configuration files to 'buildDir/checkstyle' since the resources could be located in a jar

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -18,7 +17,7 @@
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.tasks.TaskProvider;
 
-public class DependencyLicensesPrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class DependencyLicensesPrecommitPlugin extends PrecommitPlugin {
 
     @Override
     public TaskProvider<? extends Task> createTask(Project project) {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesPrecommitPlugin.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.Project;
@@ -20,7 +19,7 @@
 
 import javax.inject.Inject;
 
-public class FilePermissionsPrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class FilePermissionsPrecommitPlugin extends PrecommitPlugin {
 
     public static final String FILEPERMISSIONS_TASK_NAME = "filepermissions";
     private ProviderFactory providerFactory;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsPrecommitPlugin.java

@@ -12,7 +12,6 @@
 import groovy.lang.Closure;
 
 import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask;
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.gradle.api.Project;
@@ -32,7 +31,7 @@
 import static de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin.FORBIDDEN_APIS_EXTENSION_NAME;
 import static de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin.FORBIDDEN_APIS_TASK_NAME;
 
-public class ForbiddenApisPrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class ForbiddenApisPrecommitPlugin extends PrecommitPlugin {
     @Override
     public TaskProvider<? extends Task> createTask(Project project) {
         project.getPluginManager().apply(JavaBasePlugin.class);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.Project;
@@ -20,7 +19,7 @@
 
 import javax.inject.Inject;
 
-public class ForbiddenPatternsPrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class ForbiddenPatternsPrecommitPlugin extends PrecommitPlugin {
 
     public static final String FORBIDDEN_PATTERNS_TASK_NAME = "forbiddenPatterns";
     private final ProviderFactory providerFactory;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsPrecommitPlugin.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.Project;
@@ -17,7 +16,7 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
 
-public class JavaModulePrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class JavaModulePrecommitPlugin extends PrecommitPlugin {
 
     public static final String TASK_NAME = "validateModule";
 

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/JavaModulePrecommitPlugin.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -18,7 +17,7 @@
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.api.tasks.TaskProvider;
 
-public class LoggerUsagePrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class LoggerUsagePrecommitPlugin extends PrecommitPlugin {
     @Override
     public TaskProvider<? extends Task> createTask(Project project) {
         Configuration loggerUsageConfig = project.getConfigurations().create("loggerUsagePlugin");

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsagePrecommitPlugin.java

@@ -10,7 +10,6 @@
 
 import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
 import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask;
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.gradle.api.Project;
@@ -21,7 +20,7 @@
 
 import java.nio.file.Path;
 
-public class ThirdPartyAuditPrecommitPlugin extends PrecommitPlugin implements InternalPlugin {
+public class ThirdPartyAuditPrecommitPlugin extends PrecommitPlugin {
 
     public static final String JDK_JAR_HELL_CONFIG_NAME = "jdkJarHell";
     public static final String LIBS_ELASTICSEARCH_CORE_PROJECT_PATH = ":libs:elasticsearch-core";

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java

@@ -8,14 +8,14 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.internal.conventions.util.Util;
+import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.provider.Provider;
 
 import java.io.File;
 
-public class ValidateRestSpecPlugin implements InternalPlugin {
+public class ValidateRestSpecPlugin implements Plugin<Project> {
     private static final String DOUBLE_STAR = "**"; // checkstyle thinks these are javadocs :(
 
     @Override

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ValidateRestSpecPlugin.java

@@ -138,9 +138,9 @@ tasks.register("verifyVersions") {
  * after the backport of the backcompat code is complete.
  */
 
-boolean bwc_tests_enabled = true
+boolean bwc_tests_enabled = false
 // place a PR link here when committing bwc changes:
-String bwc_tests_disabled_issue = ""
+String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/88336"
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
     throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

build.gradle

@@ -0,0 +1,6 @@
+pr: 88336
+summary: Add `build_flavor` back to info api rest response
+area: Infra/Core
+type: bug
+issues:
+ - 88318

docs/changelog/88336.yaml

@@ -352,6 +352,7 @@ This command should give you a JSON result:
     "number" : "{version_qualified}",
     "build_type" : "{build_type}",
     "build_hash" : "f27399d",
+    "build_flavor": "default",
     "build_date" : "2016-03-30T09:51:41.449Z",
     "build_snapshot" : false,
     "lucene_version" : "{lucene_version}",

docs/plugins/discovery-azure-classic.asciidoc

@@ -36,6 +36,7 @@ GET /
     "number" : "{version_qualified}",
     "build_type" : "{build_type}",
     "build_hash" : "f27399d",
+    "build_flavor" : "default",
     "build_date" : "2016-03-30T09:51:41.449Z",
     "build_snapshot" : false,
     "lucene_version" : "{lucene_version}",

docs/reference/setup/install/check-running.asciidoc

@@ -7,3 +7,11 @@
     - is_true:    tagline
     - is_true:    version
     - is_true:    version.number
+
+---
+"Info build flavor":
+    - skip:
+        version: "8.3.0 - 8.3.2"
+        reason: "build flavor in info was missing in 8.3.0 to 8.3.2"
+    - do:         {info: {}}
+    - match:      { version.build_flavor: default }

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/info/10_info.yml

@@ -87,6 +87,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field("cluster_uuid", clusterUuid);
         builder.startObject("version")
             .field("number", build.qualifiedVersion())
+            .field("build_flavor", "default")
             .field("build_type", build.type().displayName())
             .field("build_hash", build.hash())
             .field("build_date", build.date())

server/src/main/java/org/elasticsearch/action/main/MainResponse.java

@@ -259,6 +259,10 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeLong(previousIOTime);
         }
 
+        public String getDeviceName() {
+            return deviceName;
+        }
+
         public long operations() {
             if (previousReadsCompleted == -1 || previousWritesCompleted == -1) return -1;
 

server/src/main/java/org/elasticsearch/monitor/fs/FsInfo.java

@@ -103,6 +103,14 @@ public long getServerOpen() {
         return serverOpen();
     }
 
+    public long totalOutboundConnections() {
+        return this.totalOutboundConnections;
+    }
+
+    public long getTotalOutboundConnections() {
+        return totalOutboundConnections();
+    }
+
     public long rxCount() {
         return rxCount;
     }

server/src/main/java/org/elasticsearch/transport/TransportStats.java

@@ -64,6 +64,7 @@ public void testToXContent() throws IOException {
                         "cluster_uuid": "%s",
                         "version": {
                             "number": "%s",
+                            "build_flavor": "default",
                             "build_type": "%s",
                             "build_hash": "%s",
                             "build_date": "%s",