Merge remote-tracking branch 'upstream/main' into diskbbq-posting-list-order

Author: benwtrent

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

@@ -329,7 +329,7 @@ static Path findAgentJar(String installDir) throws IOException, UserException {
 
         try (var apmStream = Files.list(apmModule)) {
             final List<Path> paths = apmStream.filter(
-                path -> path.getFileName().toString().matches("elastic-apm-agent-\\d+\\.\\d+\\.\\d+\\.jar")
+                path -> path.getFileName().toString().matches("elastic-apm-agent-java8-\\d+\\.\\d+\\.\\d+\\.jar")
             ).toList();
 
             if (paths.size() > 1) {

distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java

@@ -141,7 +141,7 @@ private Path makeFakeAgentJar() throws IOException {
         Path tempFile = createTempFile();
         Path apmPathDir = tempFile.getParent().resolve("modules").resolve("apm");
         Files.createDirectories(apmPathDir);
-        Path apmAgentFile = apmPathDir.resolve("elastic-apm-agent-0.0.0.jar");
+        Path apmAgentFile = apmPathDir.resolve("elastic-apm-agent-java8-0.0.0.jar");
         Files.move(tempFile, apmAgentFile);
 
         return tempFile.getParent();

docs/changelog/132131.yaml

@@ -0,0 +1,7 @@
+pr: 132131
+summary: Updating `TransportSimulateIndexTemplateAction.resolveTemplate()` to account
+  for data stream overrides
+area: Indices APIs
+type: bug
+issues:
+ - 131425

docs/changelog/132651.yaml

@@ -0,0 +1,5 @@
+pr: 132651
+summary: Use java8 variant of apm-agent
+area: Infra/Core
+type: upgrade
+issues: []

gradle/verification-metadata.xml

@@ -76,9 +76,9 @@
             <sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="co.elastic.apm" name="elastic-apm-agent" version="1.55.0">
-         <artifact name="elastic-apm-agent-1.55.0.jar">
-            <sha256 value="3cbba96a64593c14568399dbc816fc36a5647e39449e1d4cf1eedce9880a9d3e" origin="Generated by Gradle"/>
+      <component group="co.elastic.apm" name="elastic-apm-agent-java8" version="1.55.0">
+         <artifact name="elastic-apm-agent-java8-1.55.0.jar">
+            <sha256 value="a4f3ae98e180dd5138cc8c719889366fe7d3afcecdb618da6db0b144a1717ac8" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0">

modules/apm/build.gradle

@@ -20,7 +20,7 @@ dependencies {
   implementation "io.opentelemetry:opentelemetry-api:${otelVersion}"
   implementation "io.opentelemetry:opentelemetry-context:${otelVersion}"
   implementation "io.opentelemetry:opentelemetry-semconv:${otelSemconvVersion}"
-  runtimeOnly    "co.elastic.apm:elastic-apm-agent:1.55.0"
+  runtimeOnly    "co.elastic.apm:elastic-apm-agent-java8:1.55.0"
 
   javaRestTestImplementation project(':modules:apm')
   javaRestTestImplementation project(':test:framework')

…m/licenses/elastic-apm-agent-LICENSE.txt …nses/elastic-apm-agent-java8-LICENSE.txtmodules/apm/licenses/elastic-apm-agent-LICENSE.txt renamed to modules/apm/licenses/elastic-apm-agent-java8-LICENSE.txt modules/apm/licenses/elastic-apm-agent-LICENSE.txt renamed to modules/apm/licenses/elastic-apm-agent-java8-LICENSE.txt

@@ -214,9 +214,6 @@ tests:
 - class: org.elasticsearch.action.RejectionActionIT
   method: testSimulatedSearchRejectionLoad
   issue: https://github.com/elastic/elasticsearch/issues/125901
-- class: org.elasticsearch.search.CCSDuelIT
-  method: testTerminateAfter
-  issue: https://github.com/elastic/elasticsearch/issues/126085
 - class: org.elasticsearch.search.basic.SearchWithRandomDisconnectsIT
   method: testSearchWithRandomDisconnects
   issue: https://github.com/elastic/elasticsearch/issues/122707

…pm/licenses/elastic-apm-agent-NOTICE.txt …enses/elastic-apm-agent-java8-NOTICE.txtmodules/apm/licenses/elastic-apm-agent-NOTICE.txt renamed to modules/apm/licenses/elastic-apm-agent-java8-NOTICE.txt modules/apm/licenses/elastic-apm-agent-NOTICE.txt renamed to modules/apm/licenses/elastic-apm-agent-java8-NOTICE.txt

@@ -1333,6 +1333,7 @@ private static Map<String, Object> responseToMap(ObjectPath response) throws IOE
         Map<String, Object> responseMap = XContentHelper.convertToMap(bytesReference, false, XContentType.JSON).v2();
         assertNotNull(responseMap.put("took", -1));
         responseMap.remove("num_reduce_phases");
+        responseMap.remove("terminated_early");
         Map<String, Object> profile = (Map<String, Object>) responseMap.get("profile");
         if (profile != null) {
             List<Map<String, Object>> shards = (List<Map<String, Object>>) profile.get("shards");