Flamegraph sub-aggregation by thread name

Author: rockdaboot

x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/GetStackTracesResponseBuilder.java

@@ -165,6 +165,7 @@ public GetStackTracesResponse build() {
                     StackTrace stackTrace = entry.getValue();
                     stackTrace.count = event.count;
                     stackTrace.executableName = event.executableName;
+                    stackTrace.threadName = event.threadName;
                     if (event.subGroups != null) {
                         stackTrace.subGroups = event.subGroups;
                     }

x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/StackTrace.java

@@ -31,6 +31,7 @@ final class StackTrace implements ToXContentObject {
     double annualCostsUSD;
     long count;
     String executableName;
+    String threadName;
 
     StackTrace(
         int[] addressOrLines,
@@ -49,6 +50,7 @@ final class StackTrace implements ToXContentObject {
         this.annualCostsUSD = annualCostsUSD;
         this.count = count;
         this.executableName = "";
+        this.threadName = "";
     }
 
     private static final int BASE64_FRAME_ID_LENGTH = 32;
@@ -232,6 +234,14 @@ public String getExecutableName() {
         return executableName;
     }
 
+    public String getThreadName() {
+        if (threadName.isEmpty()) {
+            // kernel threads are not associated with an executable
+            return executableName;
+        }
+        return threadName;
+    }
+
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
@@ -243,6 +253,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field("annual_costs_usd", this.annualCostsUSD);
         builder.field("count", this.count);
         builder.field("executable_name", this.executableName);
+        builder.field("thread_name", this.threadName);
         builder.endObject();
         return builder;
     }
@@ -258,7 +269,8 @@ public boolean equals(Object o) {
             && Arrays.equals(fileIds, that.fileIds)
             && Arrays.equals(frameIds, that.frameIds)
             && Arrays.equals(typeIds, that.typeIds)
-            && executableName.equals(that.executableName);
+            && executableName.equals(that.executableName)
+            && threadName.equals(that.threadName);
         // Don't compare metadata like annualized co2, annualized costs, subGroups and count.
     }
 
@@ -270,6 +282,7 @@ public int hashCode() {
         result = 31 * result + Arrays.hashCode(frameIds);
         result = 31 * result + Arrays.hashCode(typeIds);
         result = 31 * result + executableName.hashCode();
+        result = 31 * result + threadName.hashCode();
         return result;
     }
 }

x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TraceEvent.java

@@ -12,6 +12,7 @@
 final class TraceEvent {
     final String stacktraceID;
     String executableName;
+    String threadName;
     double annualCO2Tons;
     double annualCostsUSD;
     long count;
@@ -25,6 +26,7 @@ final class TraceEvent {
         this.stacktraceID = stacktraceID;
         this.count = count;
         this.executableName = "";
+        this.threadName = "";
     }
 
     @Override
@@ -53,6 +55,9 @@ public String toString() {
             + ", executableName='"
             + executableName
             + '\''
+            + ", threadName='"
+            + threadName
+            + '\''
             + ", annualCO2Tons="
             + annualCO2Tons
             + ", annualCostsUSD="

x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TransportGetFlamegraphAction.java

@@ -94,7 +94,7 @@ static GetFlamegraphResponse buildFlamegraph(GetStackTracesResponse response) {
                 annualCostsUSD,
                 FRAMETYPE_EXECUTABLE
             );
-            // builder.addOrUpdateAggregationNode(stackTrace.getThreadName(), samples, annualCO2Tons, annualCostsUSD, FRAMETYPE_THREAD);
+            builder.addOrUpdateAggregationNode(stackTrace.getThreadName(), samples, annualCO2Tons, annualCostsUSD, FRAMETYPE_THREAD);
 
             int frameCount = stackTrace.frameIds.length;
             for (int i = 0; i < frameCount; i++) {

x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/TransportGetStackTracesAction.java

@@ -337,6 +337,14 @@ private void searchEventGroupedByStackTrace(
             // Especially with high cardinality fields, this makes aggregations really slow.
             .executionHint("map")
             .subAggregation(groupByStackTraceId);
+        TermsAggregationBuilder groupByThreadName = new TermsAggregationBuilder("group_by")
+            // 'size' specifies the max number of host ID we support per request.
+            .size(MAX_TRACE_EVENTS_RESULT_SIZE)
+            .field("process.thread.name")
+            // 'execution_hint: map' skips the slow building of ordinals that we don't need.
+            // Especially with high cardinality fields, this makes aggregations really slow.
+            .executionHint("map")
+            .subAggregation(groupByHostId);
         SubGroupCollector subGroups = SubGroupCollector.attach(
             groupByStackTraceId,
             request.getAggregationFields(),
@@ -359,7 +367,7 @@ private void searchEventGroupedByStackTrace(
                     // 'execution_hint: map' skips the slow building of ordinals that we don't need.
                     // Especially with high cardinality fields, this makes aggregations really slow.
                     .executionHint("map")
-                    .subAggregation(groupByHostId)
+                    .subAggregation(groupByThreadName)
             )
             .addAggregation(new SumAggregationBuilder("total_count").field("Stacktrace.count"))
             .execute(handleEventsGroupedByStackTrace(submitTask, client, responseBuilder, submitListener, searchResponse -> {
@@ -379,39 +387,45 @@ private void searchEventGroupedByStackTrace(
                 for (Terms.Bucket executableBucket : executableNames.getBuckets()) {
                     String executableName = executableBucket.getKeyAsString();
 
-                    Terms hosts = executableBucket.getAggregations().get("group_by");
-                    for (Terms.Bucket hostBucket : hosts.getBuckets()) {
-                        String hostid = hostBucket.getKeyAsString();
-
-                        Terms stacktraces = hostBucket.getAggregations().get("group_by");
-                        for (Terms.Bucket stacktraceBucket : stacktraces.getBuckets()) {
-                            Sum count = stacktraceBucket.getAggregations().get("count");
-                            int finalCount = resampler.adjustSampleCount((int) count.value());
-                            if (finalCount <= 0) {
-                                continue;
+                    Terms threads = executableBucket.getAggregations().get("group_by");
+                    for (Terms.Bucket threadBucket : threads.getBuckets()) {
+                        String threadName = threadBucket.getKeyAsString();
+
+                        Terms hosts = threadBucket.getAggregations().get("group_by");
+                        for (Terms.Bucket hostBucket : hosts.getBuckets()) {
+                            String hostid = hostBucket.getKeyAsString();
+
+                            Terms stacktraces = hostBucket.getAggregations().get("group_by");
+                            for (Terms.Bucket stacktraceBucket : stacktraces.getBuckets()) {
+                                Sum count = stacktraceBucket.getAggregations().get("count");
+                                int finalCount = resampler.adjustSampleCount((int) count.value());
+                                if (finalCount <= 0) {
+                                    continue;
+                                }
+                                totalFinalCount += finalCount;
+
+                                String stackTraceID = stacktraceBucket.getKeyAsString();
+
+                                /*
+                                The same stacktraces may come from different hosts (eventually from different datacenters).
+                                We make a list of the triples here. As soon as we have the host metadata, we can calculate
+                                the CO2 emission and the costs for each TraceEvent.
+                                 */
+                                hostEventCounts.add(new HostEventCount(hostid, stackTraceID, finalCount));
+
+                                TraceEvent event = stackTraceEvents.get(stackTraceID);
+                                if (event == null) {
+                                    event = new TraceEvent(stackTraceID);
+                                    event.executableName = executableName; // THIS IS A HACK (need a proper data model)
+                                    event.threadName = threadName; // THIS IS A HACK (need a proper data model)
+                                    stackTraceEvents.put(stackTraceID, event);
+                                }
+                                event.count += finalCount;
+                                subGroups.collectResults(stacktraceBucket, event);
+
+                                TraceEventMetadata meta = new TraceEventMetadata(executableName, stackTraceID);
+                                executableEvents.putIfAbsent(meta, event);
                             }
-                            totalFinalCount += finalCount;
-
-                            String stackTraceID = stacktraceBucket.getKeyAsString();
-
-                            /*
-                            The same stacktraces may come from different hosts (eventually from different datacenters).
-                            We make a list of the triples here. As soon as we have the host metadata, we can calculate
-                            the CO2 emission and the costs for each TraceEvent.
-                             */
-                            hostEventCounts.add(new HostEventCount(hostid, stackTraceID, finalCount));
-
-                            TraceEvent event = stackTraceEvents.get(stackTraceID);
-                            if (event == null) {
-                                event = new TraceEvent(stackTraceID);
-                                event.executableName = executableName; // THIS IS A HACK (need a proper data model)
-                                stackTraceEvents.put(stackTraceID, event);
-                            }
-                            event.count += finalCount;
-                            subGroups.collectResults(stacktraceBucket, event);
-
-                            TraceEventMetadata meta = new TraceEventMetadata(executableName, stackTraceID);
-                            executableEvents.putIfAbsent(meta, event);
                         }
                     }
                 }