Merge branch 'main' into fix-manifests

Green-Software-Foundation · Sep 11, 2024 · 89a9d69 · 89a9d69
2 parents aefca76 + 22ed978
commit 89a9d69
Show file tree

Hide file tree

Showing 27 changed files with 803 additions and 223 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   "dependencies": {
     "@commitlint/cli": "^18.6.0",
     "@commitlint/config-conventional": "^18.6.0",
-    "@grnsft/if-core": "^0.0.20",
+    "@grnsft/if-core": "^0.0.22",
     "axios": "^1.7.2",
     "csv-parse": "^5.5.6",
     "csv-stringify": "^6.4.6",

diff --git a/src/__tests__/if-run/builtins/time-sync.test.ts b/src/__tests__/if-run/builtins/time-sync.test.ts
@@ -66,7 +66,10 @@ describe('builtins/time-sync:', () => {
       type: 'horizontal',
     };
     const convertedMetrics = metricStorage.metrics.map((metric: string) => ({
-      [metric]: AGGREGATION_METHODS[2],
+      [metric]: {
+        time: AGGREGATION_METHODS[2],
+        component: AGGREGATION_METHODS[2],
+      },
     }));
     storeAggregationMetrics(...convertedMetrics);
   });
@@ -463,12 +466,12 @@ describe('builtins/time-sync:', () => {
           {
             timestamp: '2023-12-12T00:00:00.000Z',
             duration: 1,
-            'cpu/utilization': null,
+            'cpu/utilization': 10,
           },
           {
             timestamp: '2023-12-12T00:00:01.000Z',
             duration: 1,
-            'cpu/utilization': null,
+            'cpu/utilization': 10,
           },
         ];
 
@@ -483,7 +486,12 @@ describe('builtins/time-sync:', () => {
           'allow-padding': true,
         };
 
-        storeAggregationMetrics({carbon: 'sum'});
+        storeAggregationMetrics({
+          carbon: {
+            time: 'sum',
+            component: 'sum',
+          },
+        });
 
         const timeModel = TimeSync(basicConfig, parametersMetadata, {});
 
@@ -578,12 +586,12 @@ describe('builtins/time-sync:', () => {
           {
             timestamp: '2023-12-12T00:00:00.000Z',
             duration: 5,
-            'resources-total': null,
+            'resources-total': 10,
           },
           {
             timestamp: '2023-12-12T00:00:05.000Z',
-            duration: 5,
-            'resources-total': null,
+            duration: 4,
+            'resources-total': 10,
           },
         ];
 
@@ -598,8 +606,18 @@ describe('builtins/time-sync:', () => {
           'allow-padding': true,
         };
 
-        storeAggregationMetrics({'time-reserved': 'avg'});
-        storeAggregationMetrics({'resources-total': 'sum'});
+        storeAggregationMetrics({
+          'time-reserved': {
+            time: 'avg',
+            component: 'avg',
+          },
+        });
+        storeAggregationMetrics({
+          'resources-total': {
+            time: 'sum',
+            component: 'sum',
+          },
+        });
 
         const timeModel = TimeSync(basicConfig, parametersMetadata, {});
 
@@ -627,9 +645,9 @@ describe('builtins/time-sync:', () => {
           },
           {
             timestamp: '2023-12-12T00:00:05.000Z',
-            duration: 5,
+            duration: 4,
             'resources-total': 10,
-            'time-reserved': 3.2,
+            'time-reserved': 3.75,
           },
         ];
 
@@ -647,8 +665,18 @@ describe('builtins/time-sync:', () => {
           'time-reserved': 'time-allocated',
         };
 
-        storeAggregationMetrics({'time-allocated': 'avg'});
-        storeAggregationMetrics({'resources-total': 'sum'});
+        storeAggregationMetrics({
+          'time-allocated': {
+            time: 'avg',
+            component: 'avg',
+          },
+        });
+        storeAggregationMetrics({
+          'resources-total': {
+            time: 'sum',
+            component: 'sum',
+          },
+        });
 
         const timeModel = TimeSync(basicConfig, parametersMetadata, mapping);
 
@@ -676,9 +704,9 @@ describe('builtins/time-sync:', () => {
           },
           {
             timestamp: '2023-12-12T00:00:05.000Z',
-            duration: 5,
+            duration: 4,
             'resources-total': 10,
-            'time-allocated': 3.2,
+            'time-allocated': 3.75,
           },
         ];
 
@@ -722,7 +750,12 @@ describe('builtins/time-sync:', () => {
           'allow-padding': true,
         };
 
-        storeAggregationMetrics({'resources-total': 'none'});
+        storeAggregationMetrics({
+          'resources-total': {
+            time: 'none',
+            component: 'none',
+          },
+        });
 
         const timeModel = TimeSync(basicConfig, parametersMetadata, {});
 

diff --git a/src/__tests__/if-run/lib/aggregate.test.ts b/src/__tests__/if-run/lib/aggregate.test.ts
@@ -15,15 +15,23 @@ describe('lib/aggregate: ', () => {
       type: 'horizontal',
     };
     const convertedMetrics = metricStorage.metrics.map((metric: string) => ({
-      [metric]: AGGREGATION_METHODS[2],
+      [metric]: {
+        time: AGGREGATION_METHODS[2],
+        component: AGGREGATION_METHODS[2],
+      },
     }));
 
     storeAggregationMetrics(...convertedMetrics);
   });
 
   describe('aggregate(): ', () => {
     beforeAll(() => {
-      storeAggregationMetrics({carbon: 'sum'});
+      storeAggregationMetrics({
+        carbon: {
+          time: 'sum',
+          component: 'sum',
+        },
+      });
     });
 
     it('returns tree if aggregation is missing.', () => {