Merge branch 'main' into esql/fix_query_log_npe

Author: luigidellaquila

.buildkite/pipelines/periodic-packaging.template.yml

@@ -12,16 +12,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - orcalelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/periodic-packaging.yml

@@ -13,16 +13,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - orcalelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/periodic-platform-support.yml

@@ -14,16 +14,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - oraclelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}

.buildkite/pipelines/pull-request/packaging-tests-unix.yml

@@ -15,16 +15,19 @@ steps:
               - opensuse-leap-15
               - oraclelinux-8
               - oraclelinux-9
+              - oraclelinux-10
               - sles-15
               - ubuntu-2204
               - ubuntu-2404
               - rocky-8
               - rocky-9
+              - rocky-10
               - rhel-8
               - rhel-9
               - rhel-10
               - almalinux-8
               - almalinux-9
+              - almalinux-10
             PACKAGING_TASK:
               - docker
               - docker-cloud-ess

AGENTS.md

@@ -90,7 +90,7 @@ The repository is organized into several key directories:
 - Prefer Gradle tasks over ad-hoc scripts.
 - When scripting CLI sequences, leverage `gradlew` task.
 - Unrecognized changes: assume other agent; keep going; focus your changes. If it causes issues, stop + ask user.
-- Do not add "Co-Authored-By" lines to commit messages. commit messages should adhere to the 50/72 rule: use a maximum of 50 columns for the commit summary
+- Do not add "Co-Authored-By" or any AI attribution trailers to commit messages, by any means—including `--trailer`, `-m`, or any other git flag. commit messages should adhere to the 50/72 rule: use a maximum of 50 columns for the commit summary
 
 ## Backwards compatibility
 - For changes to a `Writeable` implementation (`writeTo` and constructor from `StreamInput`), add a new `public static final <UNIQUE_DESCRIPTIVE_NAME> = TransportVersion.fromName("<unique_descriptive_name>")` and use it in the new code paths. Confirm the backport branches and then generate a new version file with `./gradlew generateTransportVersion`.

benchmarks/build.gradle

@@ -47,7 +47,7 @@ dependencies {
   api(project(':x-pack:plugin:core'))
   api(project(':x-pack:plugin:esql'))
   api(project(':x-pack:plugin:esql:compute'))
-  api(project(':x-pack:plugin:mapper-exponential-histogram'))
+  api(project(':x-pack:plugin:analytics'))
   api(project(':x-pack:plugin:logsdb'))
   implementation project(path: ':libs:native')
   implementation project(path: ':libs:simdvec')

benchmarks/src/main/java/org/elasticsearch/benchmark/index/mapper/DynamicMapperBenchmark.java

@@ -11,8 +11,6 @@
 
 import org.elasticsearch.common.UUIDs;
 import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.compress.CompressedXContent;
-import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.LuceneDocument;
 import org.elasticsearch.index.mapper.MapperService;
@@ -185,21 +183,16 @@ public List<LuceneDocument> benchmarkDynamicallyCreatedFields() throws Exception
         MapperService mapperService = MapperServiceFactory.create("{}");
         for (int i = 0; i < 25; i++) {
             DocumentMapper documentMapper = mapperService.documentMapper();
-            Mapping mapping = null;
-            if (documentMapper == null) {
+            boolean noMappings = documentMapper == null;
+            if (noMappings) {
                 documentMapper = DocumentMapper.createEmpty(mapperService);
-                mapping = documentMapper.mapping();
             }
             ParsedDocument doc = documentMapper.parse(randomFrom(sources));
-            if (mapping != null) {
-                doc.addDynamicMappingsUpdate(mapping);
+            if (noMappings) {
+                doc.addDynamicMappingsUpdate(Mapping.emptyCompressed());
             }
             if (doc.dynamicMappingsUpdate() != null) {
-                mapperService.merge(
-                    "_doc",
-                    new CompressedXContent(XContentHelper.toXContent(doc.dynamicMappingsUpdate(), XContentType.JSON, false)),
-                    MapperService.MergeReason.MAPPING_UPDATE
-                );
+                mapperService.merge("_doc", doc.dynamicMappingsUpdate(), MapperService.MergeReason.MAPPING_UPDATE);
             }
         }
         return mapperService.documentMapper().parse(randomFrom(sources)).docs();

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPluginOfflineBranchesFallbackFuncTest.groovy

@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.gradle.internal.info
+
+import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
+import org.gradle.testkit.runner.TaskOutcome
+
+class GlobalBuildInfoPluginOfflineBranchesFallbackFuncTest extends AbstractGradleFuncTest {
+
+    def setup() {
+        // This plugin reads files from the workspace and performs environment detection
+        // that is not compatible with the configuration cache in functional tests.
+        configurationCacheCompatible = false
+    }
+
+    def "offline mode falls back to local branches.json when present"() {
+        given:
+        writeBwcVersionSource()
+        writeBranchesJson()
+        writeBuildThatResolvesBwcVersions()
+
+        when:
+        def result = gradleRunner(
+            "resolveBwcVersions",
+            "--offline",
+            // Make any accidental outbound HTTPS attempt fail deterministically.
+            "-Dhttps.proxyHost=127.0.0.1",
+            "-Dhttps.proxyPort=1",
+            "-Dhttp.proxyHost=127.0.0.1",
+            "-Dhttp.proxyPort=1",
+            "-DBWC_VERSION_SOURCE=${file("Version.java").absolutePath}"
+        ).build()
+
+        then:
+        result.task(":resolveBwcVersions").outcome == TaskOutcome.SUCCESS
+        assertOutputContains(
+            result.output,
+            "Gradle is running in offline mode; falling back to local branches.json"
+        )
+        assertOutputContains(result.output, "BWC_VERSIONS_RESOLVED")
+    }
+
+    def "offline mode without local branches.json retains failure behavior"() {
+        given:
+        writeBwcVersionSource()
+        // Intentionally do not create branches.json
+        writeBuildThatResolvesBwcVersions()
+
+        when:
+        def result = gradleRunner(
+            "resolveBwcVersions",
+            "--offline",
+            "-Dhttps.proxyHost=127.0.0.1",
+            "-Dhttps.proxyPort=1",
+            "-Dhttp.proxyHost=127.0.0.1",
+            "-Dhttp.proxyPort=1",
+            "-DBWC_VERSION_SOURCE=${file("Version.java").absolutePath}"
+        ).buildAndFail()
+
+        then:
+        assertOutputContains(result.output, "Failed to download branches.json from:")
+        assertOutputMissing(result.output, "falling back to local branches.json")
+    }
+
+    def "non-offline mode does not fall back to local branches.json"() {
+        given:
+        writeBwcVersionSource()
+        writeBranchesJson()
+        writeBuildThatResolvesBwcVersions()
+
+        when:
+        def result = gradleRunner(
+            "resolveBwcVersions",
+            // Not passing --offline on purpose.
+            "-Dhttps.proxyHost=127.0.0.1",
+            "-Dhttps.proxyPort=1",
+            "-Dhttp.proxyHost=127.0.0.1",
+            "-Dhttp.proxyPort=1",
+            "-DBWC_VERSION_SOURCE=${file("Version.java").absolutePath}"
+        ).buildAndFail()
+
+        then:
+        assertOutputContains(result.output, "Failed to download branches.json from:")
+        assertOutputMissing(result.output, "falling back to local branches.json")
+    }
+
+    private void writeBuildThatResolvesBwcVersions() {
+        buildFile.text = """
+            plugins {
+              id 'elasticsearch.global-build-info'
+            }
+
+            tasks.register("resolveBwcVersions") {
+              doLast {
+                // Force bwcVersions resolution, which triggers branches.json loading.
+                def bwcVersions = buildParams.bwcVersionsProvider.get()
+                println "BWC_VERSIONS_RESOLVED=[" + bwcVersions + "]"
+              }
+            }
+        """
+    }
+
+    private void writeBranchesJson() {
+        file("branches.json").text = """\
+            {
+              "branches": [
+                { "branch": "main", "version": "9.1.0" },
+                { "branch": "9.0", "version": "9.0.0" }
+              ]
+            }
+        """.stripIndent()
+    }
+
+    private void writeBwcVersionSource() {
+        // This file is parsed via regex; version constants must have a non-word
+        // character before `public` and must end with `);` to match the pattern.
+        file("Version.java").text = """\
+package org.elasticsearch;
+
+public class Version {
+  // Only used by GlobalBuildInfoPlugin in tests via regex parsing.
+   public static final Version V_9_0_0 = Version.fromId(9000000);
+   public static final Version V_9_1_0 = Version.fromId(9010000);
+
+  private static Version fromId(int id) {
+    return new Version();
+  }
+}
+"""
+    }
+}
+

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

@@ -214,9 +214,24 @@ private List<Version> parseVersionLines(List<String> versionLines) {
     }
 
     private List<DevelopmentBranch> getDevelopmentBranches() {
-        String branchesFileLocation = project.getProviders()
-            .gradleProperty(BRANCHES_FILE_LOCATION_PROPERTY)
-            .getOrElse(DEFAULT_BRANCHES_FILE_URL);
+        Provider<String> branchesFileLocationProperty = project.getProviders().gradleProperty(BRANCHES_FILE_LOCATION_PROPERTY);
+        boolean hasExplicitBranchesFileLocation = branchesFileLocationProperty.isPresent();
+        String branchesFileLocation = hasExplicitBranchesFileLocation ? branchesFileLocationProperty.get() : DEFAULT_BRANCHES_FILE_URL;
+        if (hasExplicitBranchesFileLocation == false
+            && project.getGradle().getStartParameter().isOffline()
+            && branchesFileLocation.startsWith("http")) {
+            File localBranchesFile = new File(Util.locateElasticsearchWorkspace(project.getGradle()), "branches.json");
+            if (localBranchesFile.isFile()) {
+                LOGGER.warn(
+                    "Gradle is running in offline mode; falling back to local branches.json at [{}] instead of downloading from [{}]. "
+                        + "To override, set Gradle property [{}].",
+                    localBranchesFile.getAbsolutePath(),
+                    branchesFileLocation,
+                    BRANCHES_FILE_LOCATION_PROPERTY
+                );
+                branchesFileLocation = localBranchesFile.getAbsolutePath();
+            }
+        }
         LOGGER.info("Reading branches.json from {}", branchesFileLocation);
         byte[] branchesBytes;
         if (branchesFileLocation.startsWith("http")) {

build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/EmptyDirTaskTests.java

@@ -15,6 +15,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Collections;
+import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -61,9 +65,8 @@ public void testCreateEmptyDirNoPermissions() throws Exception {
 
         assertTrue(newEmptyFolder.exists());
         assertTrue(newEmptyFolder.isDirectory());
-        assertFalse(newEmptyFolder.canExecute());
-        assertFalse(newEmptyFolder.canRead());
-        assertFalse(newEmptyFolder.canWrite());
+        Set<PosixFilePermission> permissions = Files.getPosixFilePermissions(newEmptyFolder.toPath());
+        assertEquals(Collections.emptySet(), permissions);
 
         // cleanup
         newEmptyFolder.delete();