gitgreen 0.1.1 → 1.0.1

package/dist/lib/aws/cloudwatch.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchCloudWatchTimeseries = void 0;
+const client_cloudwatch_1 = require("@aws-sdk/client-cloudwatch");
+const toTimeseries = (result) => {
+    if (!result)
+        return [];
+    const timestamps = result.Timestamps || [];
+    const values = result.Values || [];
+    const points = [];
+    const len = Math.min(timestamps.length, values.length);
+    for (let i = 0; i < len; i++) {
+        const value = values[i];
+        if (value === undefined || value === null)
+            continue;
+        const ts = timestamps[i];
+        points.push({
+            timestamp: ts instanceof Date ? ts.toISOString() : new Date(ts).toISOString(),
+            value: Number(value)
+        });
+    }
+    return points.sort((a, b) => new Date(a.timestamp).getTime() - new Date(b.timestamp).getTime());
+};
+const fetchCloudWatchTimeseries = async (opts) => {
+    const cw = new client_cloudwatch_1.CloudWatchClient({ region: opts.region });
+    const periodSeconds = opts.periodSeconds ?? 60;
+    const command = new client_cloudwatch_1.GetMetricDataCommand({
+        StartTime: opts.startTime,
+        EndTime: opts.endTime,
+        ScanBy: 'TimestampAscending',
+        MetricDataQueries: [
+            {
+                Id: 'cpu',
+                MetricStat: {
+                    Metric: {
+                        Namespace: 'AWS/EC2',
+                        MetricName: 'CPUUtilization',
+                        Dimensions: [{ Name: 'InstanceId', Value: opts.instanceId }]
+                    },
+                    Period: periodSeconds,
+                    Stat: 'Average'
+                },
+                ReturnData: true
+            },
+            {
+                Id: 'ramUsed',
+                MetricStat: {
+                    Metric: {
+                        Namespace: 'CWAgent',
+                        MetricName: 'mem_used',
+                        Dimensions: [{ Name: 'InstanceId', Value: opts.instanceId }]
+                    },
+                    Period: periodSeconds,
+                    Stat: 'Average'
+                },
+                ReturnData: true
+            },
+            {
+                Id: 'ramTotal',
+                MetricStat: {
+                    Metric: {
+                        Namespace: 'CWAgent',
+                        MetricName: 'mem_total',
+                        Dimensions: [{ Name: 'InstanceId', Value: opts.instanceId }]
+                    },
+                    Period: periodSeconds,
+                    Stat: 'Average'
+                },
+                ReturnData: true
+            },
+            {
+                Id: 'ramUsedPercent',
+                MetricStat: {
+                    Metric: {
+                        Namespace: 'CWAgent',
+                        MetricName: 'mem_used_percent',
+                        Dimensions: [{ Name: 'InstanceId', Value: opts.instanceId }]
+                    },
+                    Period: periodSeconds,
+                    Stat: 'Average'
+                },
+                ReturnData: true
+            }
+        ]
+    });
+    const resp = await cw.send(command);
+    const byId = new Map();
+    (resp.MetricDataResults || []).forEach(result => {
+        if (result.Id)
+            byId.set(result.Id, result);
+    });
+    const cpuUtilization = toTimeseries(byId.get('cpu'));
+    const ramUsed = toTimeseries(byId.get('ramUsed'));
+    let ramTotal = toTimeseries(byId.get('ramTotal'));
+    const ramUsedPercent = toTimeseries(byId.get('ramUsedPercent'));
+    let ramUsedSeries = ramUsed;
+    const fallbackTotal = ramTotal[0]?.value || opts.memoryBytesFallback;
+    if (!ramUsedSeries.length && ramUsedPercent.length && fallbackTotal) {
+        ramUsedSeries = ramUsedPercent.map(point => ({
+            timestamp: point.timestamp,
+            value: (point.value / 100) * fallbackTotal
+        }));
+    }
+    if (!ramTotal.length && fallbackTotal) {
+        const ts = ramUsedSeries[0]?.timestamp || new Date().toISOString();
+        ramTotal = [{ timestamp: ts, value: fallbackTotal }];
+    }
+    return { cpuUtilization, ramUsed: ramUsedSeries, ramTotal };
+};
+exports.fetchCloudWatchTimeseries = fetchCloudWatchTimeseries;

package/dist/lib/carbon/carbon-calculator.js

@@ -36,17 +36,19 @@ class CarbonCalculator {
         const cpuSorted = [...job.cpuTimeseries].sort((a, b) => this.parseTimestamp(a.timestamp) - this.parseTimestamp(b.timestamp));
         const ramUsedSorted = [...job.ramUsedTimeseries].sort((a, b) => this.parseTimestamp(a.timestamp) - this.parseTimestamp(b.timestamp));
         const ramSizeSorted = [...job.ramSizeTimeseries].sort((a, b) => this.parseTimestamp(a.timestamp) - this.parseTimestamp(b.timestamp));
-        // GCP reports metrics every 60 seconds
-        const GCP_INTERVAL_SECONDS = 60;
+        const DEFAULT_INTERVAL_SECONDS = 60;
         // Integrate CPU energy over timeseries
         let cpuEnergyKwh = 0;
         for (let i = 0; i < cpuSorted.length; i++) {
-            const cpuPercent = cpuSorted[i].value * 100; // GCP returns 0-1, convert to 0-100
+            const rawCpuValue = cpuSorted[i].value;
+            const cpuPercent = job.provider === 'aws'
+                ? (rawCpuValue <= 1 ? rawCpuValue * 100 : rawCpuValue)
+                : rawCpuValue * 100;
             const powerWatts = this.interpolatePower(cpuProfile, cpuPercent);
             // Calculate interval from timestamps, or use GCP interval for single point
             let intervalSeconds;
             if (cpuSorted.length === 1) {
-                intervalSeconds = GCP_INTERVAL_SECONDS;
+                intervalSeconds = DEFAULT_INTERVAL_SECONDS;
             }
             else if (i < cpuSorted.length - 1) {
                 intervalSeconds = this.parseTimestamp(cpuSorted[i + 1].timestamp) - this.parseTimestamp(cpuSorted[i].timestamp);
@@ -65,7 +67,7 @@ class CarbonCalculator {
             const powerWatts = ramUsedGb * RAM_WATTS_PER_GB;
             let intervalSeconds;
             if (ramUsedSorted.length === 1) {
-                intervalSeconds = GCP_INTERVAL_SECONDS;
+                intervalSeconds = DEFAULT_INTERVAL_SECONDS;
             }
             else if (i < ramUsedSorted.length - 1) {
                 intervalSeconds = this.parseTimestamp(ramUsedSorted[i + 1].timestamp) - this.parseTimestamp(ramUsedSorted[i].timestamp);
@@ -78,8 +80,8 @@ class CarbonCalculator {
         // Calculate total runtime from timeseries
         const firstTs = Math.min(cpuSorted.length > 0 ? this.parseTimestamp(cpuSorted[0].timestamp) : Infinity, ramUsedSorted.length > 0 ? this.parseTimestamp(ramUsedSorted[0].timestamp) : Infinity);
         const lastTs = Math.max(cpuSorted.length > 0 ? this.parseTimestamp(cpuSorted[cpuSorted.length - 1].timestamp) : 0, ramUsedSorted.length > 0 ? this.parseTimestamp(ramUsedSorted[ramUsedSorted.length - 1].timestamp) : 0);
-        // If single point, use GCP interval; otherwise use actual span
-        const runtimeSeconds = lastTs === firstTs ? GCP_INTERVAL_SECONDS : (lastTs - firstTs);
+        // If single point, use default interval; otherwise use actual span
+        const runtimeSeconds = lastTs === firstTs ? DEFAULT_INTERVAL_SECONDS : (lastTs - firstTs);
         const runtimeHours = runtimeSeconds / 3600;
         // Calculate emissions
         const cpuEmissions = cpuEnergyKwh * pue * carbonIntensity;

package/dist/lib/gitlab/report-formatter.js

@@ -64,7 +64,12 @@ const buildMarkdownReport = (result, job, budget) => {
     }
     // Add CPU chart (only if more than 1 point)
     if (cpuSorted.length > 1) {
-        const cpuValues = cpuSorted.map(p => p.value * 100);
+        const cpuValues = cpuSorted.map(p => {
+            if (job.provider === 'aws') {
+                return p.value <= 1 ? p.value * 100 : p.value;
+            }
+            return p.value * 100;
+        });
         lines.push('', '## CPU Utilization (%)', '```', asciichart_1.default.plot(cpuValues, { height: 6 }), '```');
     }
     // Add RAM chart (only if more than 1 point)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitgreen",
-  "version": "0.1.1",
+  "version": "1.0.1",
   "description": "GitGreen CLI for carbon reporting in GitLab pipelines (GCP/AWS)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",