Merge branch 'elastic:main' into main

Author: fzowl

docs/changelog/119995.yaml

@@ -0,0 +1,5 @@
+pr: 119995
+summary: "apm-data: Use representative count as event.success_count if available"
+area: Ingest Node
+type: bug
+issues: []

muted-tests.yml

@@ -274,9 +274,6 @@ tests:
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
   method: test {yaml=reference/cat/health/cat-health-example}
   issue: https://github.com/elastic/elasticsearch/issues/122335
-- class: org.elasticsearch.xpack.esql.action.CrossClusterCancellationIT
-  method: testCloseSkipUnavailable
-  issue: https://github.com/elastic/elasticsearch/issues/122336
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
   method: test {yaml=reference/alias/line_260}
   issue: https://github.com/elastic/elasticsearch/issues/122343

x-pack/plugin/apm-data/src/main/resources/ingest-pipelines/[email protected]

@@ -30,13 +30,16 @@ processors:
     field: ["event.duration"]
     ignore_failure: true
     ignore_missing: true
-- set:
-    if: ctx.event?.outcome == 'success'
-    field: event.success_count
-    value: 1
 - set:
     if: ctx.event?.outcome == 'failure'
     field: event.success_count
     value: 0
+- set:
+    if: ctx.event?.outcome == 'success'
+    field: event.success_count
+    value: 1
+- script:
+    if: ctx.event?.outcome == 'success' && ctx[ctx.processor?.event]?.representative_count != null
+    source: ctx.event.success_count = ctx[ctx.processor?.event]?.representative_count;
 - pipeline:
     name: apm@pipeline

x-pack/plugin/apm-data/src/yamlRestTest/resources/rest-api-spec/test/20_traces_ingest.yml

@@ -80,7 +80,35 @@ setup:
           - '{"@timestamp": "2017-06-22", "event": {"outcome": "unknown"}}'
 
           - create: {}
-          - '{"@timestamp": "2017-06-22", "event": {"outcome": "success"}}'
+          - '{
+            "@timestamp": "2017-06-22",
+            "processor": {"event": "transaction"},
+            "event": {"outcome": "success"},
+            "transaction": {"representative_count": 2}
+          }'
+
+          - create: {}
+          - '{
+            "@timestamp": "2017-06-22",
+            "processor": {"event": "span"},
+            "event": {"outcome": "success"},
+            "span": {"representative_count": 3}
+          }'
+
+          - create: {}
+          - '{
+            "@timestamp": "2017-06-22",
+            "processor": {"event": "span"},
+            "event": {"outcome": "success"},
+            "span": {"representative_count": null}
+          }'
+
+          - create: {}
+          - '{
+            "@timestamp": "2017-06-22",
+            "processor": {"event": "transaction"},
+            "event": {"outcome": "success"}
+          }'
 
           - create: {}
           - '{"@timestamp": "2017-06-22", "event": {"outcome": "failure"}}'
@@ -92,8 +120,11 @@ setup:
         index: traces-apm-testing
         body:
           fields: ["event.success_count"]
-  - length: { hits.hits: 4 }
+  - length: { hits.hits: 7 }
   - match: { hits.hits.0.fields: null }
   - match: { hits.hits.1.fields: null }
-  - match: { hits.hits.2.fields: {"event.success_count": [1]} }
-  - match: { hits.hits.3.fields: {"event.success_count": [0]} }
+  - match: { hits.hits.2.fields: {"event.success_count": [2]} }
+  - match: { hits.hits.3.fields: {"event.success_count": [3]} }
+  - match: { hits.hits.4.fields: {"event.success_count": [1]} }
+  - match: { hits.hits.5.fields: {"event.success_count": [1]} }
+  - match: { hits.hits.6.fields: {"event.success_count": [0]} }

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterCancellationIT.java

@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.esql.action;
 
-import org.elasticsearch.Build;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
 import org.elasticsearch.action.admin.cluster.node.tasks.cancel.TransportCancelTasksAction;
@@ -287,44 +286,4 @@ public void testCancelSkipUnavailable() throws Exception {
         Exception error = expectThrows(Exception.class, requestFuture::actionGet);
         assertThat(error, instanceOf(TaskCancelledException.class));
     }
-
-    // Check that closing remote node with skip_unavailable=true produces partial
-    public void testCloseSkipUnavailable() throws Exception {
-        // We are using delay() here because closing cluster while inside pause fields doesn't seem to produce clean closure
-        assumeTrue("Only snapshot builds have delay()", Build.current().isSnapshot());
-        createRemoteIndex(between(1000, 5000));
-        createLocalIndex(10);
-        EsqlQueryRequest request = EsqlQueryRequest.syncEsqlQueryRequest();
-        request.query("""
-            FROM test*,cluster-a:test* METADATA _index
-            | EVAL cluster=MV_FIRST(SPLIT(_index, ":"))
-            | WHERE CASE(cluster == "cluster-a", delay(1ms), true)
-            | STATS total = sum(const) | LIMIT 1
-            """);
-        request.pragmas(randomPragmas());
-        var requestFuture = client().execute(EsqlQueryAction.INSTANCE, request);
-        assertTrue(SimplePauseFieldPlugin.startEmitting.await(30, TimeUnit.SECONDS));
-        SimplePauseFieldPlugin.allowEmitting.countDown();
-        cluster(REMOTE_CLUSTER).close();
-        try (var resp = requestFuture.actionGet()) {
-            EsqlExecutionInfo executionInfo = resp.getExecutionInfo();
-            assertNotNull(executionInfo);
-            assertThat(executionInfo.isPartial(), equalTo(true));
-
-            List<List<Object>> values = getValuesList(resp);
-            assertThat(values.get(0).size(), equalTo(1));
-            // We can't be sure of the exact value here as we don't know if any data from remote came in, but all local data should be there
-            assertThat((long) values.get(0).get(0), greaterThanOrEqualTo(10L));
-
-            EsqlExecutionInfo.Cluster cluster = executionInfo.getCluster(REMOTE_CLUSTER);
-            EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
-
-            assertThat(localCluster.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
-            assertThat(localCluster.getSuccessfulShards(), equalTo(1));
-
-            assertThat(cluster.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
-            assertThat(cluster.getSuccessfulShards(), equalTo(0));
-            assertThat(cluster.getFailures().size(), equalTo(1));
-        }
-    }
 }