Skip to content

Commit 0b4d936

Browse files
author
brunnert
committed
Add missing defaults for AwS
1 parent 5c61390 commit 0b4d936

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

extension/src/main/java/io/retit/opentelemetry/javaagent/extension/emissions/CloudCarbonFootprintData.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package io.retit.opentelemetry.javaagent.extension.emissions;
1818

19+
import io.retit.opentelemetry.javaagent.extension.commons.CSVParser;
1920
import io.retit.opentelemetry.javaagent.extension.commons.Constants;
2021
import io.retit.opentelemetry.javaagent.extension.commons.InstanceConfiguration;
21-
import io.retit.opentelemetry.javaagent.extension.commons.CSVParser;
2222

2323
import java.math.BigDecimal;
2424
import java.util.List;
@@ -41,13 +41,6 @@ private CloudCarbonFootprintData() {
4141
init();
4242
}
4343

44-
void init() {
45-
this.microarchitecture = InstanceConfiguration.getMicroarchitecture();
46-
this.gridEmissionsFactor = initializeGridEmissionFactor(InstanceConfiguration.getCloudProviderRegion());
47-
cloudInstanceDetails = initializeCloudInstanceDetails(InstanceConfiguration.getCloudProviderInstanceType());
48-
this.pueValue = initializePueValue();
49-
}
50-
5144
/**
5245
* Returns the singleton instance of ConfigLoader.
5346
*
@@ -57,6 +50,13 @@ public static CloudCarbonFootprintData getConfigInstance() {
5750
return CONFIG_INSTANCE;
5851
}
5952

53+
void init() {
54+
this.microarchitecture = InstanceConfiguration.getMicroarchitecture();
55+
this.gridEmissionsFactor = initializeGridEmissionFactor(InstanceConfiguration.getCloudProviderRegion());
56+
cloudInstanceDetails = initializeCloudInstanceDetails(InstanceConfiguration.getCloudProviderInstanceType());
57+
this.pueValue = initializePueValue();
58+
}
59+
6060
public Double getGridEmissionsFactor() {
6161
return gridEmissionsFactor;
6262
}
@@ -238,6 +238,14 @@ private CloudCarbonFootprintInstanceData initializeCloudInstanceDetailsForAws(fi
238238
}
239239
}
240240

241+
if (cloudVMInstanceDetails.getCpuPowerConsumptionIdle() == DOUBLE_ZERO) {
242+
cloudVMInstanceDetails.setCpuPowerConsumptionIdle(CloudCarbonFootprintCoefficients.AVERAGE_MIN_WATT_AWS);
243+
}
244+
245+
if (cloudVMInstanceDetails.getCpuPowerConsumption100Percent() == DOUBLE_ZERO) {
246+
cloudVMInstanceDetails.setCpuPowerConsumption100Percent(CloudCarbonFootprintCoefficients.AVERAGE_MAX_WATT_AWS);
247+
}
248+
241249
return cloudVMInstanceDetails;
242250
}
243251

0 commit comments

Comments
 (0)