Fix test failures

Author: Manpreet Singh

src/test/java/io/opentelemetry/contrib/generator/telemetry/TestAllGenerators.java

@@ -75,8 +75,6 @@ public void validatePacketCounts() {
         int metricPayloadCount = 10;
         int logsPayloadCount = 20;
         int expectedMetricPackets = METRIC_REPORTING_ENTITIES_COUNT * metricPayloadCount;
-        //Add packets for aggregating, non-reporting entities
-            expectedMetricPackets = expectedMetricPackets + 600;
         int expectedLogsPackets = LOG_REPORTING_ENTITIES_COUNT * logsPayloadCount;
         int expectedSpanPackets = 11518;
         Assert.assertEquals(testStore.getMetricsPacketCount(), expectedMetricPackets, "Mismatch in expected metric packets count");

src/test/java/io/opentelemetry/contrib/generator/telemetry/TestMetricsGenerator.java

@@ -59,12 +59,9 @@ public void generateData() {
     public void testPayloadAndPacketCounts() {
         //Check payload count = payload count * each of 8 types of entities
         int payloadCount = 8 * PAYLOAD_COUNT;
-        //Add payloads for aggregating, non-reporting entities
-        payloadCount = payloadCount + 19;
         Assert.assertEquals(testStore.getMetricPayloads().size(), payloadCount, "Mismatch in payload count");
         //Check packet count = payload count * number of entities
         int expectedPacketCount = REPORTING_ENTITIES_COUNT * PAYLOAD_COUNT;
-        expectedPacketCount = expectedPacketCount + 600;
         Assert.assertEquals(testStore.getMetricsPacketCount(), expectedPacketCount, "Mismatch in resource metrics packet count");
         //Check metric count for each metric = number of reporting entities * number of payloads
     }

src/test/java/io/opentelemetry/contrib/generator/telemetry/TestMetricsGeneratorWithOverrides.java

@@ -64,14 +64,11 @@ public void testPayloadAndPacketCounts() {
         int AWS_EBS_PAYLOADS = 15;
         int payloadCount = NW_IFC_PAYLOADS + CONTAINER_PAYLOADS + MACHINE_PAYLOADS + NODE_PAYLOADS + POD_PAYLOADS +
                 DISK_PAYLOADS + AWS_RDS_PAYLOADS + AWS_EBS_PAYLOADS;
-        //Add payloads for aggregating, non-reporting entities
-        payloadCount = payloadCount + 19;
         Assert.assertEquals(testStore.getMetricPayloads().size(), payloadCount, "Mismatch in payload count");
         //Check packet count = payload count * number of entities
         int expectedPacketCount = (NW_IFC_PAYLOADS * NETWORK_INTERFACE_COUNT) + (CONTAINER_PAYLOADS * CONTAINER_COUNT) +
                 (MACHINE_PAYLOADS * MACHINE_COUNT) + (NODE_PAYLOADS * NODE_COUNT) + (POD_PAYLOADS * POD_COUNT) +
                 (DISK_PAYLOADS * DISK_COUNT) + (AWS_RDS_PAYLOADS * AWS_RDS_COUNT) + (AWS_EBS_PAYLOADS * AWS_EBS_COUNT);
-        expectedPacketCount = expectedPacketCount + 600;
         Assert.assertEquals(testStore.getMetricsPacketCount(), expectedPacketCount, "Mismatch in resource metrics packet count");
         //Check metric count for each metric = number of reporting entities * number of payloads
     }