Merge pull request #5 from cisco-open/fix/static_analyis/issues

Fix test failures & issues identified from static analysis

Author: preet-dev

src/main/java/io/opentelemetry/contrib/generator/core/EntityModelGenerator.java

@@ -207,6 +207,7 @@ private void setParentToChildrenTypes(String parentType, Set<String> childTypes)
         entityModel.get(parentType).forEach(parentEntity -> parentEntity.setChildrenByType(new HashMap<>()));
     }
 
+    @SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
     private void setParentToChildren(GeneratorEntity parent, String childrenType, int childStartIndex, int childEndIndex) {
         List<GeneratorEntity> children = entityModel.get(childrenType).subList(childStartIndex, childEndIndex);
         if (!parent.getChildrenByType().containsKey(childrenType) || parent.getChildrenByType().get(childrenType) == null) {
@@ -262,6 +263,7 @@ private int getEntityLevel(String entityType) {
      * @param parentType - Entity type of the parent from which to copy the attribute
      * @param attribute - Name/Key of the attribute to copy
      */
+    @SuppressWarnings("unused")
     public static void copyFromParent(String parentType, String attribute) {
         for (GeneratorEntity eachEntity: entityModel.get(EntityModelExpressions.expressionsGlobalKey.split(":")[1]).stream()
                 .filter(entity -> entity.getParentsByType()!=null)
@@ -288,6 +290,7 @@ public static void copyFromParent(String parentType, String attribute) {
      * @param targetAttribute - Name of the attribute to be set in the current entity
      * @param suffixExpression - Expression to be evaluated for the suffix to the parent attribute value
      */
+    @SuppressWarnings("unused")
     public static void modifyFromParent(String parentType, String sourceAttribute, String targetAttribute, String suffixExpression) {
         for (GeneratorEntity eachEntity: entityModel.get(EntityModelExpressions.expressionsGlobalKey.split(":")[1])) {
             Optional<KeyValue> parentAttribute = eachEntity.getParentsByType().get(parentType).get(0)

src/main/java/io/opentelemetry/contrib/generator/core/jel/methods/EntityModelExpressions.java

@@ -34,6 +34,7 @@
  * in a standalone context to process the expressions, all the implementing methods have to be public static.
  * @see ELProcessor
  */
+@SuppressWarnings("unused")
 public class EntityModelExpressions {
 
     private static final ConcurrentHashMap<String, Integer> counters = new ConcurrentHashMap<>();

src/main/java/io/opentelemetry/contrib/generator/telemetry/jel/methods/LogSeverityGenerator.java

@@ -70,6 +70,7 @@ public static String severityDistributionCount(String requestID, String logName,
      * @param percentages corresponding list of percentages
      * @return severity
      */
+    @SuppressWarnings("unused")
     public static String severityDistributionPercentage(String requestID, String logName, List<String> severity, List<Long> percentages) {
         int totalPayloadCount = GeneratorsStateProvider.getLogGeneratorState(requestID).getGeneratorThreadMap()
                 .get(logName).getLogDefinition().getPayloadCount();

src/main/java/io/opentelemetry/contrib/generator/telemetry/jel/methods/MELTAttributeGenerators.java

@@ -36,6 +36,7 @@
  * {@link io.opentelemetry.contrib.generator.core.jel.methods.EntityModelExpressions} will not work.
  * @see ELProcessor
  */
+@SuppressWarnings("unused")
 public class MELTAttributeGenerators {
 
     private static final ConcurrentHashMap<String, Integer> counters = new ConcurrentHashMap<>();

src/main/java/io/opentelemetry/contrib/generator/telemetry/jel/methods/MetricValueGenerators.java

@@ -32,6 +32,7 @@
  * in a standalone context to process the expressions, all the implementing methods have to be public static.
  * @see ELProcessor
  */
+@SuppressWarnings("unused")
 public class MetricValueGenerators {
 
     private static final ELProcessor jelProcessor = new ELProcessor();

src/main/java/io/opentelemetry/contrib/generator/telemetry/logs/LogMessageProvider.java

@@ -38,7 +38,7 @@ public class LogMessageProvider {
     }
 
     public static String getLogMessage(String severity) {
-        List<String> possibleMessages = severityReasonsMap.entrySet().stream()
+        @SuppressWarnings("OptionalGetWithoutIsPresent") List<String> possibleMessages = severityReasonsMap.entrySet().stream()
                 .filter(severityMessages -> severityMessages.getKey().equalsIgnoreCase(severity))
                 .findFirst().get().getValue();
         String plainMessage = possibleMessages.get(ThreadLocalRandom.current().nextInt(possibleMessages.size()));

src/main/java/io/opentelemetry/contrib/generator/telemetry/metrics/SummaryGenerator.java

@@ -71,6 +71,7 @@ private Summary getDoubleSummaryDataPoint(MetricDefinition metricDefinition) {
     private List<Object> getCountValues(MetricDefinition metricDefinition) {
         Object value = jelProcessor.eval(metricDefinition.getValueFunction());
         if (value instanceof List) {
+            //noinspection unchecked
             return (List<Object>) value;
         }
         log.warn("Non summary variant used in valueFunction for summary metric '" + metricDefinition.getName() + "' " +

src/main/java/io/opentelemetry/contrib/generator/telemetry/traces/SpansGenerator.java

@@ -223,9 +223,7 @@ private int getSpanStatusCode(int spanIndex) {
 
     private ByteString[] getTraceIds(int count) {
         ByteString[] traceIds = new ByteString[count];
-        IntStream.range(0, count).forEach(i -> {
-            traceIds[i] = getId(true);
-        });
+        IntStream.range(0, count).forEach(i -> traceIds[i] = getId(true));
         return traceIds;
     }
 

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
     }