Added support for filtering reporting resources for metrics

Author: preet-dev

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

@@ -120,7 +120,7 @@ private int getRuntimeResourcesCount(List<RuntimeModification> runtimeModificati
         int count = 0;
         for (RuntimeModification eachModification: CollectionUtils.emptyIfNull(runtimeModifications).stream()
                 .filter(modification -> !modification.getResourceModificationType().equals(ResourceModificationType.REMOVE))
-                .collect(Collectors.toList())) {
+                .toList()) {
             int newCount = ((eachModification.getEndAfterMinutes() - eachModification.getStartAfterMinutes())
                     / eachModification.getModificationFrequencyMinutes()) * eachModification.getModificationQuantity();
             count = count + newCount;
@@ -135,7 +135,7 @@ private void mapChildResources() {
         //We will do this only for resources that have some children defined
         for (ResourceDefinition parentType: allResources.values().stream()
                 .filter(resource -> !MapUtils.emptyIfNull(resource.getChildrenDistribution()).isEmpty())
-                .collect(Collectors.toList())) {
+                .toList()) {
             setParentToChildrenTypes(parentType.getName(), parentType.getChildrenDistribution().keySet());
             //For each childType-distribution expression pair
             for (Map.Entry<String, String> eachChildTypeExpr: parentType.getChildrenDistribution().entrySet()) {
@@ -192,6 +192,8 @@ private void executeAttributeOperations() {
                         jelProcessor.eval(expression);
                     }
                 }));
+        //We also want to set the evaluated attributes at this stage
+        resourceModel.values().forEach(resourceList -> resourceList.forEach(GeneratorResource::setEvaluatedAttributes));
     }
 
     private void setParentToChildrenTypes(String parentType, Set<String> childTypes) {
@@ -265,14 +267,15 @@ private int getResourceLevel(String resurceType) {
      */
     @SuppressWarnings("unused")
     public static void copyFromParent(String parentType, String attribute) {
-        for (GeneratorResource eachResource: resourceModel.get(ResourceModelExpressions.expressionsGlobalKey.split(":")[1]).stream()
+        for (GeneratorResource eachResource: resourceModel
+                .get(ResourceModelExpressions.expressionsGlobalKey.split(":")[1]).stream()
                 .filter(resource -> resource.getParentsByType()!=null)
                 .filter(resource -> resource.getParentsByType().containsKey(parentType))
-                .collect(Collectors.toList())) {
+                .toList()) {
             Optional<KeyValue> parentAttribute = eachResource.getParentsByType().get(parentType).get(0)
                     .getOTelResource().getAttributesList().stream()
                     .filter(attrKV -> attrKV.getKey().equals(attribute)).findAny();
-            String attributeValue = parentAttribute.isEmpty() ? "" : parentAttribute.get().getValue().getStringValue();
+            String attributeValue = parentAttribute.map(keyValue -> keyValue.getValue().getStringValue()).orElse("");
             eachResource.getOTelResourceBuilder().addAttributes(KeyValue.newBuilder()
                     .setKey(attribute)
                     .setValue(CommonUtils.buildAnyValue(attributeValue))
@@ -292,11 +295,12 @@ public static void copyFromParent(String parentType, String attribute) {
      */
     @SuppressWarnings("unused")
     public static void modifyFromParent(String parentType, String sourceAttribute, String targetAttribute, String suffixExpression) {
-        for (GeneratorResource eachResource: resourceModel.get(ResourceModelExpressions.expressionsGlobalKey.split(":")[1])) {
+        for (GeneratorResource eachResource: resourceModel.get(ResourceModelExpressions
+                .expressionsGlobalKey.split(":")[1])) {
             Optional<KeyValue> parentAttribute = eachResource.getParentsByType().get(parentType).get(0)
                     .getOTelResource().getAttributesList().stream()
                     .filter(attrKV -> attrKV.getKey().equals(sourceAttribute)).findAny();
-            String attributeValue = parentAttribute.isEmpty() ? "" : parentAttribute.get().getValue().getStringValue();
+            String attributeValue = parentAttribute.map(keyValue -> keyValue.getValue().getStringValue()).orElse("");
             if (suffixExpression.length() > 0) {
                 attributeValue = attributeValue + jelProcessor.eval(suffixExpression);
             }

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

@@ -69,14 +69,12 @@ public void run() {
                     && minsElapsed > eachModification.getStartAfterMinutes()
                     && minsElapsed <= eachModification.getEndAfterMinutes()) {
                 switch (eachModification.getResourceModificationType()) {
-                    case ADD:
-                        executeAddModification(eachModification.getResourceType(), eachModification.getModificationQuantity());
-                        break;
-                    case REMOVE:
-                        executeRemoveModification(eachModification.getResourceType(), eachModification.getModificationQuantity());
-                        break;
-                    case CHURN:
-                        executeChurnModification(eachModification.getResourceType(), eachModification.getModificationQuantity());
+                    case ADD ->
+                            executeAddModification(eachModification.getResourceType(), eachModification.getModificationQuantity());
+                    case REMOVE ->
+                            executeRemoveModification(eachModification.getResourceType(), eachModification.getModificationQuantity());
+                    case CHURN ->
+                            executeChurnModification(eachModification.getResourceType(), eachModification.getModificationQuantity());
                 }
                 modificationsUpdateTimestamps.put(eachModification.getModificationId(), currTime);
             }

src/main/java/io/opentelemetry/contrib/generator/core/dto/GeneratorResource.java

@@ -41,6 +41,7 @@ public class GeneratorResource {
     private String type; //type of this resource. There can be multiple resources of this type.
     private boolean isActive; //if this resource is currently reporting any MELT data
     private Resource.Builder otelResource; //OTel representation of the resource
+    private Map<String, String> evaluatedAttributes;
     private Map<String, List<GeneratorResource>> childrenByType; //list of all the child resources of this resource, grouped by type
     private Map<String, List<GeneratorResource>> parentsByType; //list of all the parent resources of this resource, grouped by type
 
@@ -66,6 +67,13 @@ public Map<String, Integer> getParentTypeCounts() {
         return parentTypeCounts;
     }
 
+    public void setEvaluatedAttributes() {
+        evaluatedAttributes = new HashMap<>();
+        for (KeyValue eachKv: CollectionUtils.emptyIfNull(otelResource.getAttributesList())) {
+            evaluatedAttributes.put(eachKv.getKey(), CommonUtils.anyValueToString(eachKv.getValue()));
+        }
+    }
+
     @Override
     public String toString() {
         var separator = ",\n";
@@ -102,10 +110,9 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object generatorResource) {
-        if (!(generatorResource instanceof GeneratorResource)) {
+        if (!(generatorResource instanceof GeneratorResource compareResource)) {
             return false;
         }
-        GeneratorResource compareResource = (GeneratorResource) generatorResource;
         if (!Objects.equals(this.type, compareResource.type)) {
             return false;
         }

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

@@ -22,6 +22,7 @@
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorState;
 import io.opentelemetry.contrib.generator.telemetry.jel.JELProvider;
 import io.opentelemetry.contrib.generator.telemetry.logs.dto.LogDefinition;
+import io.opentelemetry.contrib.generator.telemetry.misc.Constants;
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.common.v1.AnyValue;
@@ -82,8 +83,8 @@ public void run() {
                             .setResource(eachResource)
                             .addScopeLogs(ScopeLogs.newBuilder()
                                     .setScope(InstrumentationScope.newBuilder()
-                                            .setName("@opentelemetry/vodka-exporter")
-                                            .setVersion("22.10.0")
+                                            .setName(Constants.SELF_NAME)
+                                            .setVersion(Constants.SELF_VERSION)
                                             .build())
                                     .addAllLogRecords(otelLogs)
                                     .build())
@@ -120,7 +121,7 @@ private List<Resource> getResourceSubsetByPostCount(String resourceName, int res
         //resourceEndIndex is exclusive
         int resourceEndIndex;
         List<GeneratorResource> resourcesInResourceModel = ResourceModelProvider.getResourceModel(requestID).get(resourceName).stream()
-                .filter(GeneratorResource::isActive).collect(Collectors.toList());
+                .filter(GeneratorResource::isActive).toList();
         if (resourceCount >= resourcesInResourceModel.size()) {
             resourceEndIndex = resourcesInResourceModel.size();
         } else {

src/main/java/io/opentelemetry/contrib/generator/telemetry/logs/dto/Logs.java

@@ -22,7 +22,6 @@
 
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Data
 public class Logs {