Tested and added examples

Author: preet-dev

example-definitions/json/metric-definition.json

@@ -91,14 +91,16 @@
     {
       "name": "container.cpu.used.utilization",
       "unit": "%",
-      "otelType": "summary",
-      "valueFunction": "arithmeticSequenceSummary(1, 2, \"\", 7)",
+      "otelType": "histogram",
+      "aggregationTemporality": "delta",
+      "valueFunction": "arithmeticSequenceSummary(5, 2, \"\", 7)",
       "isDouble": true,
-      "quantiles": [
-        0,
-        0.5,
-        0.75,
-        1
+      "bounds": [
+        10,
+        30,
+        50,
+        70,
+        90
       ],
       "reportingResources": [
         "container"

example-definitions/qa/metric-definition.yaml

@@ -63,10 +63,11 @@ metrics:
     reportingResources: [resource_quota]
   - name: container.cpu.used.utilization
     unit: "%"
-    otelType: summary
-    valueFunction: 'arithmeticSequenceSummary(1, 2, "", 7)'
+    otelType: histogram
+    aggregationTemporality: delta
+    valueFunction: 'arithmeticSequenceSummary(5, 2, "", 7)'
     isDouble: true
-    quantiles: [ 0, 0.5, 0.75, 1 ]
+    bounds: [10, 30, 50, 70, 90]
     reportingResources: [ container ]
   - name: cpu.usage
     unit: "{cores}"

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

@@ -1,6 +1,7 @@
 package io.opentelemetry.contrib.generator.telemetry.metrics;
 
 import io.opentelemetry.contrib.generator.core.jel.ExpressionProcessor;
+import io.opentelemetry.contrib.generator.telemetry.GeneratorsStateProvider;
 import io.opentelemetry.contrib.generator.telemetry.metrics.dto.MetricDefinition;
 import io.opentelemetry.contrib.generator.telemetry.misc.GeneratorUtils;
 import io.opentelemetry.proto.metrics.v1.*;
@@ -17,9 +18,11 @@
 @Slf4j
 public class HistogramGenerator {
 
+    private final String requestID;
     private final ExpressionProcessor jelProcessor;
 
-    public HistogramGenerator(ExpressionProcessor jelProcessor) {
+    public HistogramGenerator(String requestID, ExpressionProcessor jelProcessor) {
+        this.requestID = requestID;
         this.jelProcessor = jelProcessor;
     }
 
@@ -32,8 +35,7 @@ public Metric.Builder getOTelMetric(MetricDefinition metricDefinition) {
     }
 
     private Histogram getHistogramDataPoint(MetricDefinition metricDefinition) {
-        long[] times = GeneratorUtils.normalizeTimestamp(TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()),
-                metricDefinition.getPayloadFrequencySeconds());
+        long[] times = getTimes(metricDefinition);
         List<Double> values = getCountValues(metricDefinition);
         double sum = values.stream().mapToDouble(Double::doubleValue).sum();
         int count = (values.size());
@@ -51,6 +53,18 @@ private Histogram getHistogramDataPoint(MetricDefinition metricDefinition) {
                 .build();
     }
 
+    private long[] getTimes(MetricDefinition metricDefinition) {
+        long[] times = GeneratorUtils.normalizeTimestamp(TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis()),
+                metricDefinition.getPayloadFrequencySeconds());
+        if (metricDefinition.getAggregationTemporality() == AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE) {
+            if (GeneratorsStateProvider.getMetricGeneratorState(requestID).getFixedStartTime() == 0) {
+                GeneratorsStateProvider.getMetricGeneratorState(requestID).setFixedStartTime(times[0]);
+            }
+            times[0] = GeneratorsStateProvider.getMetricGeneratorState(requestID).getFixedStartTime();
+        }
+        return times;
+    }
+
     private List<Double> getCountValues(MetricDefinition metricDefinition) {
         Object value = jelProcessor.eval(metricDefinition.getValueFunction());
         List<Object> rawValues = value instanceof List<?> ? (List<Object>) value : Collections.nCopies(5, value);

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

@@ -52,6 +52,7 @@ public class MetricGeneratorThread implements Runnable {
     private final GeneratorState<MetricGeneratorThread> metricGeneratorState;
     private final GaugeGenerator gaugeGenerator;
     private final SumGenerator sumGenerator;
+    private final HistogramGenerator histogramGenerator;
     private final SummaryGenerator summaryGenerator;
     private int currentCount;
 
@@ -65,6 +66,7 @@ public MetricGeneratorThread(String groupKey, List<MetricDefinition> metrics, Pa
         ExpressionProcessor jelProcessor = JELProvider.getJelProcessor();
         gaugeGenerator = new GaugeGenerator(jelProcessor);
         sumGenerator = new SumGenerator(requestID, jelProcessor);
+        histogramGenerator = new HistogramGenerator(requestID, jelProcessor);
         summaryGenerator = new SummaryGenerator(jelProcessor);
         currentCount = 0;
     }
@@ -116,7 +118,7 @@ public void run() {
                         .addAllResourceMetrics(resourceMetricsList)
                         .build();
                 log.info(requestID + ": Sending payload for: " + groupKey);
-                //log.debug(requestID + ": Complete payload for " + groupKey + ": " + resourceMetrics);
+                log.debug(requestID + ": Complete payload for " + groupKey + ": " + resourceMetrics);
                 boolean responseStatus = payloadHandler.postPayload(resourceMetrics);
                 if (metricGeneratorState.getTransportStorage() != null) {
                     metricGeneratorState.getTransportStorage().store(groupKey, resourceMetrics, responseStatus);
@@ -131,6 +133,7 @@ private Metric.Builder getMetric(MetricDefinition metricDefinition) {
         return switch (metricDefinition.getOtelType()) {
             case Constants.GAUGE -> gaugeGenerator.getOTelMetric(metricDefinition);
             case Constants.SUM -> sumGenerator.getOTelMetric(metricDefinition);
+            case Constants.HISTOGRAM -> histogramGenerator.getOTelMetric(metricDefinition);
             default -> summaryGenerator.getOTelMetric(metricDefinition);
         };
     }
@@ -195,18 +198,29 @@ private Metric getMetricWithResourceAttributes(Metric.Builder partialMetric, Lis
                     .map(NumberDataPoint::toBuilder)
                     .map(bdp -> bdp.addAllAttributes(resourceAttributes).build())
                     .toList();
-            partialMetric.getSum().toBuilder()
+            Sum newSum = partialMetric.getSum().toBuilder()
                     .clearDataPoints()
                     .addAllDataPoints(dataPointsWAttrs)
                     .build();
-            Sum newSum = partialMetric.getSum().toBuilder()
+            return Metric.newBuilder()
+                    .setName(partialMetric.getName())
+                    .setUnit(partialMetric.getUnit())
+                    .setSum(newSum)
+                    .build();
+        } else if (metricType.equals(Metric.DataCase.HISTOGRAM)) {
+            List<HistogramDataPoint> dataPoints = partialMetric.getHistogram().getDataPointsList();
+            List<HistogramDataPoint> dataPointsWAttrs = dataPoints.stream()
+                    .map(HistogramDataPoint::toBuilder)
+                    .map(bdp -> bdp.addAllAttributes(resourceAttributes).build())
+                    .toList();
+            Histogram newHistogram = partialMetric.getHistogram().toBuilder()
                     .clearDataPoints()
                     .addAllDataPoints(dataPointsWAttrs)
                     .build();
             return Metric.newBuilder()
                     .setName(partialMetric.getName())
                     .setUnit(partialMetric.getUnit())
-                    .setSum(newSum)
+                    .setHistogram(newHistogram)
                     .build();
         } else {
             List<SummaryDataPoint> dataPoints = partialMetric.getSummary().getDataPointsList();

src/test/resources/test-definitions/metrics-test.yaml

@@ -19,10 +19,11 @@ payloadCount: 10
 metrics:
   - name: system.network.in.kb.sec
     unit: kBy/s
-    otelType: summary
+    otelType: histogram
     valueFunction: 'absoluteCosineSequenceSummary("*7000", 5)'
     isDouble: true
-    quantiles: [0, 50, 100]
+    aggregationTemporality: cumulative
+    bounds: [10, 100, 1000, 10000, 100000]
     reportingResources: [network_interface, container, machine]
     attributes:
       system.internal.ip: 'IPv4Sequence("10.134.1.34")'