Add missing defaults for AwS

RETIT · Sep 21, 2024 · 0b4d936 · 0b4d936
1 parent 5c61390
commit 0b4d936
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/...n/java/io/retit/opentelemetry/javaagent/extension/emissions/CloudCarbonFootprintData.java b/...n/java/io/retit/opentelemetry/javaagent/extension/emissions/CloudCarbonFootprintData.java
@@ -16,9 +16,9 @@
 
 package io.retit.opentelemetry.javaagent.extension.emissions;
 
+import io.retit.opentelemetry.javaagent.extension.commons.CSVParser;
 import io.retit.opentelemetry.javaagent.extension.commons.Constants;
 import io.retit.opentelemetry.javaagent.extension.commons.InstanceConfiguration;
-import io.retit.opentelemetry.javaagent.extension.commons.CSVParser;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -41,13 +41,6 @@ private CloudCarbonFootprintData() {
         init();
     }
 
-    void init() {
-        this.microarchitecture = InstanceConfiguration.getMicroarchitecture();
-        this.gridEmissionsFactor = initializeGridEmissionFactor(InstanceConfiguration.getCloudProviderRegion());
-        cloudInstanceDetails = initializeCloudInstanceDetails(InstanceConfiguration.getCloudProviderInstanceType());
-        this.pueValue = initializePueValue();
-    }
-
     /**
      * Returns the singleton instance of ConfigLoader.
      *
@@ -57,6 +50,13 @@ public static CloudCarbonFootprintData getConfigInstance() {
         return CONFIG_INSTANCE;
     }
 
+    void init() {
+        this.microarchitecture = InstanceConfiguration.getMicroarchitecture();
+        this.gridEmissionsFactor = initializeGridEmissionFactor(InstanceConfiguration.getCloudProviderRegion());
+        cloudInstanceDetails = initializeCloudInstanceDetails(InstanceConfiguration.getCloudProviderInstanceType());
+        this.pueValue = initializePueValue();
+    }
+
     public Double getGridEmissionsFactor() {
         return gridEmissionsFactor;
     }
@@ -238,6 +238,14 @@ private CloudCarbonFootprintInstanceData initializeCloudInstanceDetailsForAws(fi
             }
         }
 
+        if (cloudVMInstanceDetails.getCpuPowerConsumptionIdle() == DOUBLE_ZERO) {
+            cloudVMInstanceDetails.setCpuPowerConsumptionIdle(CloudCarbonFootprintCoefficients.AVERAGE_MIN_WATT_AWS);
+        }
+
+        if (cloudVMInstanceDetails.getCpuPowerConsumption100Percent() == DOUBLE_ZERO) {
+            cloudVMInstanceDetails.setCpuPowerConsumption100Percent(CloudCarbonFootprintCoefficients.AVERAGE_MAX_WATT_AWS);
+        }
+
         return cloudVMInstanceDetails;
     }