Skip to content

Commit f1aad5f

Browse files
ericywlericywl
authored
Merge branch '8.19' into update-8.19-apm-data-resource-version
2 parents be95776 + f244912 commit f1aad5f

File tree

46 files changed

+904
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+904
-138
lines changed

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

Lines changed: 104 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434
import java.io.File;
3535
import java.util.List;
3636
import java.util.Map;
37+
import java.util.stream.Stream;
3738

3839
import javax.inject.Inject;
3940

41+
import static java.util.stream.Collectors.joining;
4042
import static org.elasticsearch.gradle.internal.util.ParamsUtils.loadBuildParams;
4143
import static org.elasticsearch.gradle.util.FileUtils.mkdirs;
4244
import static org.elasticsearch.gradle.util.GradleUtils.maybeConfigure;
@@ -172,6 +174,16 @@ public void execute(Task t) {
172174
// we use 'temp' relative to CWD since this is per JVM and tests are forbidden from writing to CWD
173175
nonInputProperties.systemProperty("java.io.tmpdir", test.getWorkingDir().toPath().resolve("temp"));
174176

177+
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
178+
SourceSet mainSourceSet = sourceSets.findByName(SourceSet.MAIN_SOURCE_SET_NAME);
179+
SourceSet testSourceSet = sourceSets.findByName(SourceSet.TEST_SOURCE_SET_NAME);
180+
if ("test".equals(test.getName()) && mainSourceSet != null && testSourceSet != null) {
181+
FileCollection mainRuntime = mainSourceSet.getRuntimeClasspath();
182+
FileCollection testRuntime = testSourceSet.getRuntimeClasspath();
183+
FileCollection testOnlyFiles = testRuntime.minus(mainRuntime);
184+
test.doFirst(task -> test.environment("es.entitlement.testOnlyPath", testOnlyFiles.getAsPath()));
185+
}
186+
175187
test.systemProperties(getProviderFactory().systemPropertiesPrefixedBy("tests.").get());
176188
test.systemProperties(getProviderFactory().systemPropertiesPrefixedBy("es.").get());
177189

@@ -204,46 +216,122 @@ public void execute(Task t) {
204216
}
205217

206218
/*
207-
* If this project builds a shadow JAR than any unit tests should test against that artifact instead of
219+
* If this project builds a shadow JAR then any unit tests should test against that artifact instead of
208220
* compiled class output and dependency jars. This better emulates the runtime environment of consumers.
209221
*/
210222
project.getPluginManager().withPlugin("com.gradleup.shadow", p -> {
211223
if (test.getName().equals(JavaPlugin.TEST_TASK_NAME)) {
212224
// Remove output class files and any other dependencies from the test classpath, since the shadow JAR includes these
213-
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
214-
FileCollection mainRuntime = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getRuntimeClasspath();
215225
// Add any "shadow" dependencies. These are dependencies that are *not* bundled into the shadow JAR
216226
Configuration shadowConfig = project.getConfigurations().getByName(ShadowBasePlugin.CONFIGURATION_NAME);
217227
// Add the shadow JAR artifact itself
218228
FileCollection shadowJar = project.files(project.getTasks().named("shadowJar"));
219-
FileCollection testRuntime = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME).getRuntimeClasspath();
229+
FileCollection mainRuntime = mainSourceSet.getRuntimeClasspath();
230+
FileCollection testRuntime = testSourceSet.getRuntimeClasspath();
220231
test.setClasspath(testRuntime.minus(mainRuntime).plus(shadowConfig).plus(shadowJar));
221232
}
222233
});
223234
});
224-
configureImmutableCollectionsPatch(project);
235+
configureJavaBaseModuleOptions(project);
236+
configureEntitlements(project);
237+
}
238+
239+
/**
240+
* Computes and sets the {@code --patch-module=java.base} and {@code --add-opens=java.base} JVM command line options.
241+
*/
242+
private void configureJavaBaseModuleOptions(Project project) {
243+
project.getTasks().withType(Test.class).matching(task -> task.getName().equals("test")).configureEach(test -> {
244+
FileCollection patchedImmutableCollections = patchedImmutableCollections(project);
245+
if (patchedImmutableCollections != null) {
246+
test.getInputs().files(patchedImmutableCollections);
247+
test.systemProperty("tests.hackImmutableCollections", "true");
248+
}
249+
250+
FileCollection entitlementBridge = entitlementBridge(project);
251+
if (entitlementBridge != null) {
252+
test.getInputs().files(entitlementBridge);
253+
}
254+
255+
test.getJvmArgumentProviders().add(() -> {
256+
String javaBasePatch = Stream.concat(
257+
singleFilePath(patchedImmutableCollections).map(str -> str + "/java.base"),
258+
singleFilePath(entitlementBridge)
259+
).collect(joining(File.pathSeparator));
260+
261+
return javaBasePatch.isEmpty()
262+
? List.of()
263+
: List.of("--patch-module=java.base=" + javaBasePatch, "--add-opens=java.base/java.util=ALL-UNNAMED");
264+
});
265+
});
225266
}
226267

227-
private void configureImmutableCollectionsPatch(Project project) {
268+
private Stream<String> singleFilePath(FileCollection collection) {
269+
return Stream.ofNullable(collection).filter(fc -> fc.isEmpty() == false).map(FileCollection::getSingleFile).map(File::toString);
270+
}
271+
272+
private static FileCollection patchedImmutableCollections(Project project) {
228273
String patchProject = ":test:immutable-collections-patch";
229274
if (project.findProject(patchProject) == null) {
230-
return; // build tests may not have this project, just skip
275+
return null; // build tests may not have this project, just skip
231276
}
232277
String configurationName = "immutableCollectionsPatch";
233278
FileCollection patchedFileCollection = project.getConfigurations()
234279
.create(configurationName, config -> config.setCanBeConsumed(false));
235280
var deps = project.getDependencies();
236281
deps.add(configurationName, deps.project(Map.of("path", patchProject, "configuration", "patch")));
237-
project.getTasks().withType(Test.class).matching(task -> task.getName().equals("test")).configureEach(test -> {
238-
test.getInputs().files(patchedFileCollection);
239-
test.systemProperty("tests.hackImmutableCollections", "true");
240-
test.getJvmArgumentProviders()
241-
.add(
242-
() -> List.of(
243-
"--patch-module=java.base=" + patchedFileCollection.getSingleFile() + "/java.base",
244-
"--add-opens=java.base/java.util=ALL-UNNAMED"
245-
)
282+
return patchedFileCollection;
283+
}
284+
285+
private static FileCollection entitlementBridge(Project project) {
286+
return project.getConfigurations().findByName("entitlementBridge");
287+
}
288+
289+
/**
290+
* Sets the required JVM options and system properties to enable entitlement enforcement on tests.
291+
* <p>
292+
* One command line option is set in {@link #configureJavaBaseModuleOptions} out of necessity,
293+
* since the command line can have only one {@code --patch-module} option for a given module.
294+
*/
295+
private static void configureEntitlements(Project project) {
296+
Configuration agentConfig = project.getConfigurations().create("entitlementAgent");
297+
Project agent = project.findProject(":libs:entitlement:agent");
298+
if (agent != null) {
299+
agentConfig.defaultDependencies(
300+
deps -> { deps.add(project.getDependencies().project(Map.of("path", ":libs:entitlement:agent"))); }
301+
);
302+
}
303+
FileCollection agentFiles = agentConfig;
304+
305+
Configuration bridgeConfig = project.getConfigurations().create("entitlementBridge");
306+
Project bridge = project.findProject(":libs:entitlement:bridge");
307+
if (bridge != null) {
308+
bridgeConfig.defaultDependencies(
309+
deps -> { deps.add(project.getDependencies().project(Map.of("path", ":libs:entitlement:bridge"))); }
310+
);
311+
}
312+
FileCollection bridgeFiles = bridgeConfig;
313+
314+
project.getTasks().withType(Test.class).configureEach(test -> {
315+
// See also SystemJvmOptions.maybeAttachEntitlementAgent.
316+
317+
// Agent
318+
if (agentFiles.isEmpty() == false) {
319+
test.getInputs().files(agentFiles);
320+
test.systemProperty("es.entitlement.agentJar", agentFiles.getAsPath());
321+
test.systemProperty("jdk.attach.allowAttachSelf", true);
322+
}
323+
324+
// Bridge
325+
if (bridgeFiles.isEmpty() == false) {
326+
String modulesContainingEntitlementInstrumentation = "java.logging,java.net.http,java.naming,jdk.net";
327+
test.getInputs().files(bridgeFiles);
328+
// Tests may not be modular, but the JDK still is
329+
test.jvmArgs(
330+
"--add-exports=java.base/org.elasticsearch.entitlement.bridge=ALL-UNNAMED,"
331+
+ modulesContainingEntitlementInstrumentation
246332
);
333+
}
247334
});
248335
}
336+
249337
}

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ private List<ChangelogEntry> buildEntries(int seed, int count) {
105105
}
106106

107107
private String getResource(String name) throws Exception {
108-
return Files.readString(Paths.get(Objects.requireNonNull(this.getClass().getResource(name)).toURI()), StandardCharsets.UTF_8);
108+
return Files.readString(Paths.get(Objects.requireNonNull(this.getClass().getResource(name)).toURI()), StandardCharsets.UTF_8).replace("\r", "");
109109
}
110110
}

‎build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
import org.gradle.api.provider.ProviderFactory;
1919
import org.gradle.api.tasks.SourceSet;
2020
import org.gradle.api.tasks.SourceSetContainer;
21+
import org.gradle.api.tasks.testing.Test;
2122
import org.gradle.language.jvm.tasks.ProcessResources;
2223

24+
import java.util.List;
25+
2326
import javax.inject.Inject;
2427

2528
/**
@@ -53,5 +56,11 @@ public void apply(Project project) {
5356
project.getTasks().withType(ProcessResources.class).named("processResources").configure(task -> {
5457
task.into("META-INF", copy -> copy.from(testBuildInfoTask));
5558
});
59+
60+
if (project.getRootProject().getName().equals("elasticsearch")) {
61+
project.getTasks().withType(Test.class).matching(test -> List.of("test").contains(test.getName())).configureEach(test -> {
62+
test.systemProperty("es.entitlement.enableForTests", "true");
63+
});
64+
}
5665
}
5766
}

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:7f2cebdfa7fd6dff440bfe56e9806bb75c474bf5b7de0906f1ccde4839fac1d3 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:adf4b56554418b863b4f959121d0c0c1ed6ea3fa0fe8119e3f6816f15ea88808 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:7f2cebdfa7fd6dff440bfe56e9806bb75c474bf5b7de0906f1ccde4839fac1d3
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:adf4b56554418b863b4f959121d0c0c1ed6ea3fa0fe8119e3f6816f15ea88808
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:a02075b9fd57b4c0ad04232054569eccbcab254159deba01cc4c9fcbeb800411 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4bc8373d8e709148943dcc526561d0f16e05956eb436e9f4b3e283cbad93327b AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -67,7 +67,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
6767
# Add entrypoint
6868
################################################################################
6969

70-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:a02075b9fd57b4c0ad04232054569eccbcab254159deba01cc4c9fcbeb800411
70+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4bc8373d8e709148943dcc526561d0f16e05956eb436e9f4b3e283cbad93327b
7171

7272
RUN <%= retry.loop(package_manager,
7373
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/changelog/127797.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎docs/changelog/130303.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130303
2+
summary: Drain responses on completion for `TransportNodesAction`
3+
area: Distributed
4+
type: bug
5+
issues: []

‎docs/changelog/130421.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130421
2+
summary: Support avg on aggregate metric double
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎libs/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,14 @@ configure(childProjects.values()) {
4545
*/
4646
apply plugin: 'elasticsearch.build'
4747
}
48+
49+
// This is for any code potentially included in the server at runtime.
50+
// Omit oddball libraries that aren't in server.
51+
def nonServerLibs = ['plugin-scanner']
52+
if (false == nonServerLibs.contains(project.name)) {
53+
project.getTasks().withType(Test.class).matching(test -> ['test'].contains(test.name)).configureEach(test -> {
54+
test.systemProperty('es.entitlement.enableForTests', 'true')
55+
})
56+
}
57+
4858
}

‎libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyCheckerImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private void neverEntitled(Class<?> callerClass, Supplier<String> operationDescr
135135
Strings.format(
136136
"component [%s], module [%s], class [%s], operation [%s]",
137137
entitlements.componentName(),
138-
PolicyCheckerImpl.getModuleName(requestingClass),
138+
entitlements.moduleName(),
139139
requestingClass,
140140
operationDescription.get()
141141
),
@@ -247,7 +247,7 @@ public void checkFileRead(Class<?> callerClass, Path path, boolean followLinks)
247247
Strings.format(
248248
"component [%s], module [%s], class [%s], entitlement [file], operation [read], path [%s]",
249249
entitlements.componentName(),
250-
PolicyCheckerImpl.getModuleName(requestingClass),
250+
entitlements.moduleName(),
251251
requestingClass,
252252
realPath == null ? path : Strings.format("%s -> %s", path, realPath)
253253
),
@@ -279,7 +279,7 @@ public void checkFileWrite(Class<?> callerClass, Path path) {
279279
Strings.format(
280280
"component [%s], module [%s], class [%s], entitlement [file], operation [write], path [%s]",
281281
entitlements.componentName(),
282-
PolicyCheckerImpl.getModuleName(requestingClass),
282+
entitlements.moduleName(),
283283
requestingClass,
284284
path
285285
),
@@ -383,7 +383,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
383383
() -> Strings.format(
384384
"Entitled: component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]",
385385
entitlements.componentName(),
386-
PolicyCheckerImpl.getModuleName(requestingClass),
386+
entitlements.moduleName(),
387387
requestingClass,
388388
property
389389
)
@@ -394,7 +394,7 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
394394
Strings.format(
395395
"component [%s], module [%s], class [%s], entitlement [write_system_properties], property [%s]",
396396
entitlements.componentName(),
397-
PolicyCheckerImpl.getModuleName(requestingClass),
397+
entitlements.moduleName(),
398398
requestingClass,
399399
property
400400
),
@@ -447,7 +447,7 @@ private void checkFlagEntitlement(
447447
Strings.format(
448448
"component [%s], module [%s], class [%s], entitlement [%s]",
449449
classEntitlements.componentName(),
450-
PolicyCheckerImpl.getModuleName(requestingClass),
450+
classEntitlements.moduleName(),
451451
requestingClass,
452452
PolicyParser.buildEntitlementNameFromClass(entitlementClass)
453453
),
@@ -460,7 +460,7 @@ private void checkFlagEntitlement(
460460
() -> Strings.format(
461461
"Entitled: component [%s], module [%s], class [%s], entitlement [%s]",
462462
classEntitlements.componentName(),
463-
PolicyCheckerImpl.getModuleName(requestingClass),
463+
classEntitlements.moduleName(),
464464
requestingClass,
465465
PolicyParser.buildEntitlementNameFromClass(entitlementClass)
466466
)

0 commit comments

Comments
 (0)