Fix building tests

Author: rockdaboot

x-pack/plugin/profiling/src/test/java/org/elasticsearch/xpack/profiling/action/GetStackTracesResponseTests.java

@@ -27,10 +27,7 @@ private GetStackTracesResponse createTestInstance() {
                     new int[] { 1083999 },
                     new String[] { "QCCDqjSg3bMK1C4YRK6Tiw" },
                     new String[] { "QCCDqjSg3bMK1C4YRK6TiwAAAAAAEIpf" },
-                    new int[] { 2 },
-                    0.3d,
-                    2.7d,
-                    1
+                    new int[] { 2 }
                 )
             )
         );
@@ -49,7 +46,9 @@ private GetStackTracesResponse createTestInstance() {
         Map<String, String> executables = randomNullable(Map.of("QCCDqjSg3bMK1C4YRK6Tiw", "libc.so.6"));
         long totalSamples = randomLongBetween(1L, 200L);
         String stackTraceID = randomAlphaOfLength(12);
-        Map<String, TraceEvent> stackTraceEvents = randomNullable(Map.of(stackTraceID, new TraceEvent(stackTraceID, totalSamples)));
+        Map<TraceEventID, TraceEvent> stackTraceEvents = randomNullable(
+            Map.of(new TraceEventID("", "", "", stackTraceID), new TraceEvent(totalSamples))
+        );
 
         return new GetStackTracesResponse(stackTraces, stackFrames, executables, stackTraceEvents, totalFrames, 1.0, totalSamples);
     }

x-pack/plugin/profiling/src/test/java/org/elasticsearch/xpack/profiling/action/StackTraceTests.java

@@ -86,20 +86,14 @@ public void testToXContent() throws IOException {
             .array("file_ids", "AAAAAAAAAAUAAAAAAAAB3g")
             .array("frame_ids", "AAAAAAAAAAUAAAAAAAAB3gAAAAAAD67u")
             .array("type_ids", new int[] { 2 })
-            .field("annual_co2_tons", 0.3d)
-            .field("annual_costs_usd", 2.7d)
-            .field("count", 1)
             .endObject();
 
         XContentBuilder actualRequest = XContentFactory.contentBuilder(contentType);
         StackTrace stackTrace = new StackTrace(
             new int[] { 1027822 },
             new String[] { "AAAAAAAAAAUAAAAAAAAB3g" },
             new String[] { "AAAAAAAAAAUAAAAAAAAB3gAAAAAAD67u" },
-            new int[] { 2 },
-            0.3d,
-            2.7d,
-            1
+            new int[] { 2 }
         );
         stackTrace.toXContent(actualRequest, ToXContent.EMPTY_PARAMS);
 
@@ -111,10 +105,7 @@ public void testEquality() {
             new int[] { 102782 },
             new String[] { "AAAAAAAAAAUAAAAAAAAB3g" },
             new String[] { "AAAAAAAAAAUAAAAAAAAB3gAAAAAAD67u" },
-            new int[] { 2 },
-            0.3d,
-            2.7d,
-            1
+            new int[] { 2 }
         );
 
         EqualsHashCodeTestUtils.checkEqualsAndHashCode(
@@ -123,10 +114,7 @@ public void testEquality() {
                 Arrays.copyOf(o.addressOrLines, o.addressOrLines.length),
                 Arrays.copyOf(o.fileIds, o.fileIds.length),
                 Arrays.copyOf(o.frameIds, o.frameIds.length),
-                Arrays.copyOf(o.typeIds, o.typeIds.length),
-                0.3d,
-                2.7d,
-                1
+                Arrays.copyOf(o.typeIds, o.typeIds.length)
             ))
         );
     }

x-pack/plugin/profiling/src/test/java/org/elasticsearch/xpack/profiling/action/SubGroupCollectorTests.java

@@ -19,7 +19,7 @@
 public class SubGroupCollectorTests extends ESTestCase {
     public void testNoAggs() {
         TermsAggregationBuilder stackTraces = new TermsAggregationBuilder("stacktraces").field("stacktrace.id");
-        TraceEvent traceEvent = new TraceEvent("1");
+        TraceEvent traceEvent = new TraceEvent(1L);
 
         SubGroupCollector collector = SubGroupCollector.attach(stackTraces, new String[0], false);
         assertTrue("Sub aggregations attached", stackTraces.getSubAggregations().isEmpty());
@@ -32,7 +32,7 @@ public void testNoAggs() {
 
     public void testMultipleAggsInSingleStackTrace() {
         TermsAggregationBuilder stackTraces = new TermsAggregationBuilder("stacktraces").field("stacktrace.id");
-        TraceEvent traceEvent = new TraceEvent("1");
+        TraceEvent traceEvent = new TraceEvent(1L);
 
         SubGroupCollector collector = SubGroupCollector.attach(stackTraces, new String[] { "service.name", "transaction.name" }, false);
         assertFalse("No sub aggregations attached", stackTraces.getSubAggregations().isEmpty());
@@ -71,7 +71,7 @@ public void testMultipleAggsInSingleStackTrace() {
 
     public void testSingleAggInMultipleStackTraces() {
         TermsAggregationBuilder stackTraces = new TermsAggregationBuilder("stacktraces").field("stacktrace.id");
-        TraceEvent traceEvent = new TraceEvent("1");
+        TraceEvent traceEvent = new TraceEvent(1L);
 
         SubGroupCollector collector = SubGroupCollector.attach(stackTraces, new String[] { "service.name" }, false);
         assertFalse("No sub aggregations attached", stackTraces.getSubAggregations().isEmpty());

x-pack/plugin/profiling/src/test/java/org/elasticsearch/xpack/profiling/action/TransportGetFlamegraphActionTests.java

@@ -39,15 +39,12 @@ public void testCreateFlamegraph() {
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAAxjUZ",
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAA0Gra",
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAA-VK9" },
-                    new int[] { 3, 3, 3, 3, 3, 3, 3, 3, 3 },
-                    0.3d,
-                    2.7d,
-                    1
+                    new int[] { 3, 3, 3, 3, 3, 3, 3, 3, 3 }
                 )
             ),
             Map.of(),
             Map.of("fr28zxcZ2UDasxYuu6dV-w", "containerd"),
-            Map.of("2buqP1GpF-TXYmL4USW8gA", new TraceEvent("2buqP1GpF-TXYmL4USW8gA", 1L)),
+            Map.of(new TraceEventID("", "", "", "2buqP1GpF-TXYmL4USW8gA"), new TraceEvent(1L)),
             9,
             1.0d,
             1

x-pack/plugin/profiling/src/test/java/org/elasticsearch/xpack/profiling/action/TransportGetTopNFunctionsActionTests.java

@@ -39,15 +39,12 @@ public void testCreateAllTopNFunctions() {
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAAxjUZ",
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAA0Gra",
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAA-VK9" },
-                    new int[] { 3, 3, 3, 3, 3, 3, 3, 3, 3 },
-                    0.3d,
-                    2.7d,
-                    1
+                    new int[] { 3, 3, 3, 3, 3, 3, 3, 3, 3 }
                 )
             ),
             Map.of(),
             Map.of("fr28zxcZ2UDasxYuu6dV-w", "containerd"),
-            Map.of("2buqP1GpF-TXYmL4USW8gA", new TraceEvent("2buqP1GpF-TXYmL4USW8gA", 1L)),
+            Map.of(new TraceEventID("", "", "", "2buqP1GpF-TXYmL4USW8gA"), new TraceEvent(1L)),
             9,
             1.0d,
             1
@@ -104,15 +101,12 @@ public void testCreateTopNFunctionsWithLimit() {
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAAxjUZ",
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAA0Gra",
                         "fr28zxcZ2UDasxYuu6dV-wAAAAAA-VK9" },
-                    new int[] { 3, 3, 3, 3, 3, 3, 3, 3, 3 },
-                    0.3d,
-                    2.7d,
-                    1
+                    new int[] { 3, 3, 3, 3, 3, 3, 3, 3, 3 }
                 )
             ),
             Map.of(),
             Map.of("fr28zxcZ2UDasxYuu6dV-w", "containerd"),
-            Map.of("2buqP1GpF-TXYmL4USW8gA", new TraceEvent("2buqP1GpF-TXYmL4USW8gA", 1L)),
+            Map.of(new TraceEventID("", "", "", "2buqP1GpF-TXYmL4USW8gA"), new TraceEvent(1L)),
             9,
             1.0d,
             1