Merge branch 'main' into resharding_cps

Author: lkts

.buildkite/scripts/update-transport-versions.sh

@@ -15,20 +15,16 @@ fi
 NEW_COMMIT_MESSAGE="[CI] Update transport version definitions"
 
 echo "--- Generating updated transport version definitions"
-# Calculate backport branches based on pull request version labels
-backport_branches=$(
-  echo "${GITHUB_PR_LABELS}" \
-    | tr ',' '\n' \
-    | grep -E "v[0-9]+\.[0-9]+\.[0-9]+" \
-    | sed -E 's/^v([0-9]+)\.([0-9]+)\.[0-9]+$/\1.\2/' \
-    | paste -sd, -
-)
-
-if [[ -z "${backport_branches}" ]]; then
+# Extract version labels from the PR; || true absorbs grep's exit code when there
+# are no matches so set -euo pipefail doesn't kill the script prematurely
+version_labels=$(echo "${GITHUB_PR_LABELS}" | tr ',' '\n' | grep -E "v[0-9]+\.[0-9]+\.[0-9]+") || true
+if [[ -z "${version_labels}" ]]; then
   echo "Skipping as pull request contains no version labels"
   exit 0
 fi
 
+backport_branches=$(echo "${version_labels}" | sed -E 's/^v([0-9]+)\.([0-9]+)\.[0-9]+$/\1.\2/' | paste -sd, -)
+
 .ci/scripts/run-gradle.sh generateTransportVersion --backport-branches="${backport_branches}"
 
 if git diff --quiet -- "server/src/main/resources/transport/**"; then

AGENTS.md

@@ -12,6 +12,7 @@
 
 ## Verification & Lint Tasks
 - `./gradlew spotlessJavaCheck` / `spotlessApply` (or `:server:spotlessJavaCheck`): enforce formatter profile in `build-conventions/formatterConfig.xml`.
+- `spotlessApply` also prunes unused imports and reorders imports automatically. Run it instead of manually hunting for unused imports after refactoring.
 
 ## Project Structure
 The repository is organized into several key directories:

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

@@ -350,30 +350,13 @@ private static void configureEntitlements(Project project) {
                 nonInputSystemProperties.systemProperty("jdk.attach.allowAttachSelf", () -> agentFiles.isEmpty() ? "false" : "true");
 
                 // Bridge
-                String modulesContainingEntitlementInstrumentation = "java.logging,java.net.http,java.naming,jdk.net";
+                String modulesContainingEntitlementInstrumentation = "java.logging,java.net.http,java.naming,jdk.net,jdk.zipfs";
                 test.getInputs().files(bridgeFiles).optional(true);
                 // Tests may not be modular, but the JDK still is
                 test.jvmArgs(
                     "--add-exports=java.base/org.elasticsearch.entitlement.bridge=ALL-UNNAMED,"
                         + modulesContainingEntitlementInstrumentation
                 );
-
-                // Export internal JDK packages that are required (temporarily) to declare instrumentation
-                test.jvmArgs("--add-exports=jdk.jlink/jdk.tools.jlink.internal=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www.protocol.https=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.net.www.protocol.mailto=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/sun.nio.ch=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=java.net.http/jdk.internal.net.http=ALL-UNNAMED");
-                test.jvmArgs("--add-exports=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED");
             });
     }
 

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

@@ -175,35 +175,15 @@ private static Stream<String> maybeAttachEntitlementAgent(Path esHome, boolean u
             throw new IllegalStateException("Failed to list entitlement jars in: " + dir, e);
         }
 
-        var internalExports = Stream.of(
-            "--add-exports=jdk.jlink/jdk.tools.jlink.internal=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www.protocol.ftp=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www.protocol.file=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www.protocol.jar=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www.protocol.http=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www.protocol.https=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.net.www.protocol.mailto=org.elasticsearch.entitlement",
-            "--add-exports=java.base/sun.nio.ch=org.elasticsearch.entitlement",
-            "--add-exports=java.base/jdk.internal.foreign=org.elasticsearch.entitlement",
-            "--add-exports=java.base/jdk.internal.foreign.abi=org.elasticsearch.entitlement",
-            "--add-exports=java.base/jdk.internal.foreign.layout=org.elasticsearch.entitlement",
-            "--add-exports=java.net.http/jdk.internal.net.http=org.elasticsearch.entitlement",
-            "--add-exports=jdk.jdi/com.sun.tools.jdi=org.elasticsearch.entitlement"
-        );
-
         // We instrument classes in these modules to call the bridge. Because the bridge gets patched
         // into java.base, we must export the bridge from java.base to these modules, as a comma-separated list
-        String modulesContainingEntitlementInstrumentation = "java.logging,java.net.http,java.naming,jdk.net";
-        return Stream.concat(
-            Stream.of(
-                "-XX:+EnableDynamicAgentLoading",
-                "-Djdk.attach.allowAttachSelf=true",
-                "--patch-module=java.base=" + bridgeJar,
-                "--add-exports=java.base/org.elasticsearch.entitlement.bridge=org.elasticsearch.entitlement,"
-                    + modulesContainingEntitlementInstrumentation
-            ),
-            internalExports
+        String modulesContainingEntitlementInstrumentation = "java.logging,java.net.http,java.naming,jdk.net,jdk.zipfs";
+        return Stream.of(
+            "-XX:+EnableDynamicAgentLoading",
+            "-Djdk.attach.allowAttachSelf=true",
+            "--patch-module=java.base=" + bridgeJar,
+            "--add-exports=java.base/org.elasticsearch.entitlement.bridge=org.elasticsearch.entitlement,"
+                + modulesContainingEntitlementInstrumentation
         );
     }
 }

docs/changelog/146182.yaml

@@ -0,0 +1,5 @@
+area: Search
+issues: []
+pr: 146182
+summary: Ref count EQL `_source` (search hits and events)
+type: enhancement

docs/changelog/146868.yaml

@@ -0,0 +1,5 @@
+area: Search
+issues: []
+pr: 146868
+summary: Pool `ClientHit` PIT hits via ref-counting
+type: enhancement

docs/changelog/146928.yaml

@@ -0,0 +1,5 @@
+area: Allocation
+issues: []
+pr: 146928
+summary: Expose `DesiredBalanceStats` as metrics
+type: enhancement