more test fixes

Author: smalyshev

server/src/test/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshotTests.java

@@ -325,6 +325,7 @@ public void testToXContent() throws IOException {
             XContentHelper.toXContent(snapshot, XContentType.JSON, randomBoolean()),
             XContentType.JSON
         );
+        assertToXContentEquivalent(new BytesArray(expectedJson), new BytesArray(snapshot.toString()), XContentType.JSON);
     }
 
     private String readJSONFromResource(String fileName) throws IOException {

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

@@ -440,7 +440,7 @@ public void testSearchesAgainstNonMatchingIndices() throws Exception {
                     List.of(
                         new ExpectedCluster(
                             LOCAL_CLUSTER,
-                            "alias-filtered-1*",
+                            localIndexName + "*",
                             EsqlExecutionInfo.Cluster.Status.SUCCESSFUL,
                             localNumShards
                         ),

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

@@ -118,24 +118,23 @@ public void testFailed() throws Exception {
 
         assertThat(telemetry.getTotalCount(), equalTo(1L));
         assertThat(telemetry.getSuccessCount(), equalTo(0L));
-        assertThat(telemetry.getByRemoteCluster().size(), equalTo(0));
+        assertThat(telemetry.getByRemoteCluster().size(), equalTo(1));
         assertThat(telemetry.getRemotesPerSearchAvg(), equalTo(2.0));
         assertThat(telemetry.getRemotesPerSearchMax(), equalTo(2L));
-        assertThat(telemetry.getSearchCountWithSkippedRemotes(), equalTo(0L));
+        assertThat(telemetry.getSearchCountWithSkippedRemotes(), equalTo(1L));
         Map<String, Long> expectedFailure = Map.of(CCSUsageTelemetry.Result.NOT_FOUND.getName(), 1L);
         assertThat(telemetry.getFailureReasons(), equalTo(expectedFailure));
 
-        // this is only for cluster-a so no skipped remotes
+        // this is only for cluster-a now
         telemetry = getTelemetryFromFailedQuery("from logs-*,cluster-a:no_such_index | stats sum (v)");
         assertThat(telemetry.getTotalCount(), equalTo(2L));
         assertThat(telemetry.getSuccessCount(), equalTo(0L));
-        assertThat(telemetry.getByRemoteCluster().size(), equalTo(0));
+        assertThat(telemetry.getByRemoteCluster().size(), equalTo(1));
         assertThat(telemetry.getRemotesPerSearchAvg(), equalTo(2.0));
         assertThat(telemetry.getRemotesPerSearchMax(), equalTo(2L));
-        assertThat(telemetry.getSearchCountWithSkippedRemotes(), equalTo(0L));
+        assertThat(telemetry.getSearchCountWithSkippedRemotes(), equalTo(1L));
         expectedFailure = Map.of(CCSUsageTelemetry.Result.NOT_FOUND.getName(), 2L);
         assertThat(telemetry.getFailureReasons(), equalTo(expectedFailure));
-        assertThat(telemetry.getByRemoteCluster().size(), equalTo(0));
     }
 
     public void testRemoteOnly() throws Exception {