[Profiling] Differential views based on same data show different values

elastic · Apr 29, 2024 · 61a5613 · 61a5613
1 parent 9035166
commit 61a5613
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/...ugins/observability_solution/profiling/public/views/functions/differential_topn/index.tsx b/...ugins/observability_solution/profiling/public/views/functions/differential_topn/index.tsx
@@ -173,7 +173,7 @@ export function DifferentialTopNFunctionsView() {
               baseValue={
                 state.data
                   ? {
-                      totalCount: state.data.TotalCount,
+                      totalCount: state.data.selfCPU,
                       scaleFactor: isNormalizedByTime ? baselineTime : baseline,
                       totalAnnualCO2Kgs: state.data.totalAnnualCO2Kgs,
                       totalAnnualCostUSD: state.data.totalAnnualCostUSD,
@@ -183,7 +183,7 @@ export function DifferentialTopNFunctionsView() {
               comparisonValue={
                 comparisonState.data
                   ? {
-                      totalCount: comparisonState.data.TotalCount,
+                      totalCount: comparisonState.data.selfCPU,
                       scaleFactor: isNormalizedByTime ? comparisonTime : comparison,
                       totalAnnualCO2Kgs: comparisonState.data.totalAnnualCO2Kgs,
                       totalAnnualCostUSD: comparisonState.data.totalAnnualCostUSD,

diff --git a/x-pack/plugins/observability_solution/profiling/server/routes/functions.ts b/x-pack/plugins/observability_solution/profiling/server/routes/functions.ts
@@ -67,21 +67,23 @@ export function registerTopNFunctionsSearchRoute({
         const useStacktracesAPI = await core.uiSettings.client.get<boolean>(
           profilingFetchTopNFunctionsFromStacktraces
         );
+        const totalSeconds = endSecs - startSecs;
 
         const topNFunctions = useStacktracesAPI
           ? await profilingDataAccess.services.fetchFunctions({
               core,
               esClient,
               startIndex,
               endIndex,
-              totalSeconds: endSecs - startSecs,
+              totalSeconds,
               query,
             })
           : await profilingDataAccess.services.fetchESFunctions({
               core,
               esClient,
               query,
               aggregationField: 'service.name',
+              totalSeconds,
             });
 
         return response.ok({

diff --git a/x-pack/plugins/observability_solution/profiling_data_access/common/profiling_es_client.ts b/x-pack/plugins/observability_solution/profiling_data_access/common/profiling_es_client.ts
@@ -65,5 +65,6 @@ export interface ProfilingESClient {
     awsCostDiscountRate?: number;
     azureCostDiscountRate?: number;
     costPervCPUPerHour?: number;
+    durationSeconds: number;
   }): Promise<ESTopNFunctions>;
 }
diff --git a/...ns/observability_solution/profiling_data_access/server/services/functions/es_functions.ts b/...ns/observability_solution/profiling_data_access/server/services/functions/es_functions.ts
@@ -33,6 +33,7 @@ export interface FetchFunctionsParams {
   query: QueryDslQueryContainer;
   aggregationField?: AggregationField;
   limit?: number;
+  totalSeconds: number;
 }
 
 const targetSampleSize = 20000; // minimum number of samples to get statistically sound results
@@ -46,6 +47,7 @@ export function createFetchESFunctions({ createProfilingEsClient }: RegisterServ
     query,
     aggregationField,
     limit,
+    totalSeconds,
   }: FetchFunctionsParams) => {
     const [
       co2PerKWH,
@@ -82,6 +84,7 @@ export function createFetchESFunctions({ createProfilingEsClient }: RegisterServ
       awsCostDiscountRate: percentToFactor(awsCostDiscountRate),
       costPervCPUPerHour,
       azureCostDiscountRate: percentToFactor(azureCostDiscountRate),
+      durationSeconds: totalSeconds,
     });
 
     return transformToKibanaTopNFunction(esTopNFunctions);

diff --git a/...s/observability_solution/profiling_data_access/server/utils/create_profiling_es_client.ts b/...s/observability_solution/profiling_data_access/server/utils/create_profiling_es_client.ts
@@ -165,6 +165,7 @@ export function createProfilingEsClient({
       azureCostDiscountRate,
       sampleSize,
       limit,
+      durationSeconds,
     }) {
       const controller = new AbortController();
 
@@ -187,6 +188,7 @@ export function createProfilingEsClient({
               aws_cost_factor: awsCostDiscountRate,
               cost_per_core_hour: costPervCPUPerHour,
               azure_cost_factor: azureCostDiscountRate,
+              requested_duration: durationSeconds,
             },
           },
           {