Allow handling static string in expressions

Author: preet-dev

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

@@ -17,12 +17,12 @@
 package io.opentelemetry.contrib.generator.core;
 
 import io.opentelemetry.contrib.generator.core.dto.*;
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.core.jel.JELProvider;
 import io.opentelemetry.contrib.generator.core.jel.methods.ResourceModelExpressions;
 import io.opentelemetry.contrib.generator.core.utils.CommonUtils;
 import io.opentelemetry.proto.common.v1.KeyValue;
 import io.opentelemetry.proto.resource.v1.Resource;
-import jakarta.el.ELProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -47,7 +47,7 @@ public class ResourceModelGenerator {
 
     private final Map<String, ResourceDefinition> allResources; //input resource definitions
     private final String requestID;
-    private static final ELProcessor jelProcessor = JELProvider.getJelProcessor();
+    private static final ExpressionProcessor jelProcessor = JELProvider.getJelProcessor();
     private static Map<String, List<GeneratorResource>> resourceModel; //output resource model
     private Map<String, ResourceType> typeMappings; //stores parent & child types for each resource type
 
@@ -145,7 +145,7 @@ private void mapChildResources() {
                 var nextChildIndex = 0;
                 //For each resource of the parent type
                 for (var parentCounter = 0; parentCounter < parentType.getCountWithRuntimeModifications(); parentCounter++) {
-                    int count = (int) jelProcessor.eval(eachChildTypeExpr.getValue());
+                    int count = jelProcessor.eval(eachChildTypeExpr.getValue());
                     int childEndIndex = nextChildIndex + count;
                     if (childEndIndex > childrenSize) {
                         childEndIndex = childrenSize;

src/main/java/io/opentelemetry/contrib/generator/core/jel/ExpressionProcessor.java

@@ -0,0 +1,19 @@
+package io.opentelemetry.contrib.generator.core.jel;
+
+import jakarta.el.ELProcessor;
+import jakarta.el.PropertyNotFoundException;
+
+public class ExpressionProcessor extends ELProcessor {
+
+    public ExpressionProcessor() {
+        super();
+    }
+
+    public <T> T eval(String expression) {
+        try {
+            return super.eval(expression);
+        } catch (PropertyNotFoundException exception) {
+            return (T) expression;
+        }
+    }
+}

src/main/java/io/opentelemetry/contrib/generator/core/jel/JELProvider.java

@@ -17,7 +17,6 @@
 package io.opentelemetry.contrib.generator.core.jel;
 
 import io.opentelemetry.contrib.generator.core.exception.GeneratorException;
-import jakarta.el.ELProcessor;
 
 import java.util.Arrays;    
 import java.util.List;
@@ -27,13 +26,13 @@
  */
 public class JELProvider {
 
-    private static ELProcessor jelProcessor;
+    private static ExpressionProcessor jelProcessor;
 
     private JELProvider() {}
 
-    public static ELProcessor getJelProcessor() {
+    public static ExpressionProcessor getJelProcessor() {
         if (jelProcessor == null) {
-            jelProcessor = new ELProcessor();
+            jelProcessor = new ExpressionProcessor();
             var expressionsClass = "io.opentelemetry.contrib.generator.core.jel.methods.ResourceModelExpressions";
             List<String> methods = Arrays.asList("counter", "UUIDFromStringCounter", "roundRobin", "alphanumericSequenceFromEnv",
                     "alphanumericSequence", "IPv4Sequence", "distribution", "count", "getLong", "getDouble", "getBoolean");

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

@@ -16,6 +16,7 @@
 
 package io.opentelemetry.contrib.generator.core.jel.methods;
 
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.core.jel.JELProvider;
 import io.opentelemetry.contrib.generator.core.jel.helpers.AlphanumericHelper;
 import io.opentelemetry.contrib.generator.core.jel.helpers.IPHelper;
@@ -40,7 +41,7 @@ public class ResourceModelExpressions {
     private static final ConcurrentHashMap<String, Integer> counters = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, Double> doubleCounters = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, String> stringCounters = new ConcurrentHashMap<>();
-    private static final ELProcessor jelProcessor = JELProvider.getJelProcessor();
+    private static final ExpressionProcessor jelProcessor = JELProvider.getJelProcessor();
     public static String expressionsGlobalKey = ""; //Modified by the resource model generator every time a new resource/attribute is being processed
 
     private ResourceModelExpressions() {}

src/main/java/io/opentelemetry/contrib/generator/telemetry/jel/JELProvider.java

@@ -17,10 +17,10 @@
 package io.opentelemetry.contrib.generator.telemetry.jel;
 
 import io.opentelemetry.contrib.generator.core.exception.GeneratorException;
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.telemetry.jel.methods.LogSeverityGenerator;
 import io.opentelemetry.contrib.generator.telemetry.jel.methods.MetricValueGenerators;
 import io.opentelemetry.contrib.generator.telemetry.jel.methods.MELTAttributeGenerators;
-import jakarta.el.ELProcessor;
 
 import java.util.List;
 
@@ -29,13 +29,13 @@
  */
 public class JELProvider {
 
-    private static ELProcessor jelProcessor;
+    private static ExpressionProcessor jelProcessor;
 
     private JELProvider() {}
 
-    public static ELProcessor getJelProcessor() {
+    public static ExpressionProcessor getJelProcessor() {
         if (jelProcessor == null) {
-            jelProcessor = new ELProcessor();
+            jelProcessor = new ExpressionProcessor();
             defineMetricFunction("arithmeticSequence", String.class, String.class, double.class, double.class, String.class);
             defineMetricFunction("arithmeticSequenceSummary", String.class, String.class, double.class, double.class, String.class, int.class);
             defineMetricFunction("geometricSequence", String.class, String.class, double.class, double.class, String.class);

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

@@ -16,6 +16,7 @@
 
 package io.opentelemetry.contrib.generator.telemetry.jel.methods;
 
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.core.jel.helpers.AlphanumericHelper;
 import io.opentelemetry.contrib.generator.core.jel.helpers.IPHelper;
 import io.opentelemetry.contrib.generator.core.jel.methods.ResourceModelExpressions;
@@ -43,7 +44,7 @@ public class MELTAttributeGenerators {
     private static final ConcurrentHashMap<String, Integer> counters = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, Double> doubleCounters = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, String> stringCounters = new ConcurrentHashMap<>();
-    private static final ELProcessor jelProcessor = JELProvider.getJelProcessor();
+    private static final ExpressionProcessor jelProcessor = JELProvider.getJelProcessor();
 
     private MELTAttributeGenerators() {}
 

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

@@ -16,6 +16,7 @@
 
 package io.opentelemetry.contrib.generator.telemetry.jel.methods;
 
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.telemetry.GeneratorsStateProvider;
 import jakarta.el.ELProcessor;
 
@@ -35,7 +36,7 @@
 @SuppressWarnings("unused")
 public class MetricValueGenerators {
 
-    private static final ELProcessor jelProcessor = new ELProcessor();
+    private static final ExpressionProcessor jelProcessor = new ExpressionProcessor();
     private static final ConcurrentMap<String, Double> controlledRandom = new ConcurrentHashMap<>();
     private static final DecimalFormat formatter = new DecimalFormat("##.##");
 

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

@@ -17,6 +17,7 @@
 package io.opentelemetry.contrib.generator.telemetry.logs;
 
 import io.opentelemetry.contrib.generator.core.dto.GeneratorResource;
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.telemetry.ResourceModelProvider;
 import io.opentelemetry.contrib.generator.telemetry.GeneratorsStateProvider;
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorState;
@@ -31,7 +32,6 @@
 import io.opentelemetry.proto.logs.v1.ScopeLogs;
 import io.opentelemetry.proto.resource.v1.Resource;
 import io.opentelemetry.proto.logs.v1.LogRecord;
-import jakarta.el.ELProcessor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
@@ -53,7 +53,7 @@ public class LogGeneratorThread implements Runnable {
     private final LogDefinition logDefinition;
     private final PayloadHandler payloadHandler;
     private final GeneratorState<LogGeneratorThread> logGeneratorState;
-    private final ELProcessor jelProcessor;
+    private final ExpressionProcessor jelProcessor;
     private int currentPayloadCount;
 
     public LogGeneratorThread(LogDefinition logDefinition, PayloadHandler payloadHandler, String requestID) {

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

@@ -16,12 +16,12 @@
 
 package io.opentelemetry.contrib.generator.telemetry.metrics;
 
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.telemetry.metrics.dto.MetricDefinition;
 import io.opentelemetry.contrib.generator.telemetry.misc.GeneratorUtils;
 import io.opentelemetry.proto.metrics.v1.Gauge;
 import io.opentelemetry.proto.metrics.v1.Metric;
 import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
-import jakarta.el.ELProcessor;
 
 import java.util.concurrent.TimeUnit;
 
@@ -30,9 +30,9 @@
  */
 public class GaugeGenerator {
 
-    private final ELProcessor jelProcessor;
+    private final ExpressionProcessor jelProcessor;
 
-    public GaugeGenerator(ELProcessor jelProcessor) {
+    public GaugeGenerator(ExpressionProcessor jelProcessor) {
         this.jelProcessor = jelProcessor;
     }
 

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

@@ -17,6 +17,7 @@
 package io.opentelemetry.contrib.generator.telemetry.metrics;
 
 import io.opentelemetry.contrib.generator.core.dto.GeneratorResource;
+import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
 import io.opentelemetry.contrib.generator.telemetry.GeneratorsStateProvider;
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorState;
 import io.opentelemetry.contrib.generator.telemetry.misc.GeneratorUtils;
@@ -30,7 +31,6 @@
 import io.opentelemetry.proto.common.v1.KeyValue;
 import io.opentelemetry.proto.metrics.v1.*;
 import io.opentelemetry.proto.resource.v1.Resource;
-import jakarta.el.ELProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -62,7 +62,7 @@ public MetricGeneratorThread(String groupKey, List<MetricDefinition> metrics, Pa
         this.metrics = metrics.stream().collect(Collectors.toMap(MetricDefinition::getName, Function.identity()));
         this.payloadHandler = payloadHandler;
         this.metricGeneratorState = GeneratorsStateProvider.getMetricGeneratorState(requestID);
-        ELProcessor jelProcessor = JELProvider.getJelProcessor();
+        ExpressionProcessor jelProcessor = JELProvider.getJelProcessor();
         gaugeGenerator = new GaugeGenerator(jelProcessor);
         sumGenerator = new SumGenerator(requestID, jelProcessor);
         summaryGenerator = new SummaryGenerator(jelProcessor);