OTLP: add support for histograms

x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/otlp/datapoint/DataPoint.java

@@ -8,6 +8,9 @@
 package org.elasticsearch.xpack.oteldata.otlp.datapoint;
 
 import io.opentelemetry.proto.common.v1.KeyValue;
+import io.opentelemetry.proto.metrics.v1.AggregationTemporality;
+import io.opentelemetry.proto.metrics.v1.ExponentialHistogramDataPoint;
+import io.opentelemetry.proto.metrics.v1.HistogramDataPoint;
 import io.opentelemetry.proto.metrics.v1.Metric;
 import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
 
@@ -134,4 +137,91 @@ public boolean isValid(Set<String> errors) {
             return true;
         }
     }
+
+    record ExponentialHistogram(ExponentialHistogramDataPoint dataPoint, Metric metric) implements DataPoint {
+
+        @Override
+        public long getTimestampUnixNano() {
+            return dataPoint.getTimeUnixNano();
+        }
+
+        @Override
+        public List<KeyValue> getAttributes() {
+            return dataPoint.getAttributesList();
+        }
+
+        @Override
+        public long getStartTimestampUnixNano() {
+            return dataPoint.getStartTimeUnixNano();
+        }
+
+        @Override
+        public String getUnit() {
+            return metric.getUnit();
+        }
+
+        @Override
+        public String getMetricName() {
+            return metric.getName();
+        }
+
+        @Override
+        public String getDynamicTemplate() {
+            return "histogram";
+        }
+
+        @Override
+        public boolean isValid(Set<String> errors) {
+            if (metric.getExponentialHistogram().getAggregationTemporality() != AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA) {
+                errors.add("cumulative exponential histogram metrics are not supported, ignoring " + metric.getName());
+                return false;
+            }
+            return true;
+        }
+    }
+
+    record Histogram(HistogramDataPoint dataPoint, Metric metric) implements DataPoint {
+        @Override
+        public long getTimestampUnixNano() {
+            return dataPoint.getTimeUnixNano();
+        }
+
+        @Override
+        public List<KeyValue> getAttributes() {
+            return dataPoint.getAttributesList();
+        }
+
+        @Override
+        public long getStartTimestampUnixNano() {
+            return dataPoint.getStartTimeUnixNano();
+        }
+
+        @Override
+        public String getUnit() {
+            return metric.getUnit();
+        }
+
+        @Override
+        public String getMetricName() {
+            return metric.getName();
+        }
+
+        @Override
+        public String getDynamicTemplate() {
+            return "histogram";
+        }
+
+        @Override
+        public boolean isValid(Set<String> errors) {
+            if (metric.getHistogram().getAggregationTemporality() == AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA == false) {
+                errors.add("cumulative histogram metrics are not supported, ignoring " + metric.getName());
+                return false;
+            }
+            if (dataPoint.getBucketCountsCount() == 1 && dataPoint.getExplicitBoundsCount() == 0) {
+                errors.add("histogram with a single bucket and no explicit bounds is not supported, ignoring " + metric.getName());
+                return false;
+            }
+            return true;
+        }
+    }
 }

x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/otlp/datapoint/DataPointGroupingContext.java

@@ -68,12 +68,14 @@ public void groupDataPoints(ExportMetricsServiceRequest exportMetricsServiceRequ
                             scopeGroup.addDataPoints(metric, metric.getGauge().getDataPointsList(), DataPoint.Number::new);
                             break;
                         case EXPONENTIAL_HISTOGRAM:
-                            ignoredDataPoints += metric.getExponentialHistogram().getDataPointsCount();
-                            ignoredDataPointMessages.add("Exponential histogram is not supported yet. Dropping " + metric.getName());
+                            scopeGroup.addDataPoints(
+                                metric,
+                                metric.getExponentialHistogram().getDataPointsList(),
+                                DataPoint.ExponentialHistogram::new
+                            );
                             break;
                         case HISTOGRAM:
-                            ignoredDataPoints += metric.getHistogram().getDataPointsCount();
-                            ignoredDataPointMessages.add("Histogram is not supported yet. Dropping " + metric.getName());
+                            scopeGroup.addDataPoints(metric, metric.getHistogram().getDataPointsList(), DataPoint.Histogram::new);
                             break;
                         case SUMMARY:
                             ignoredDataPoints += metric.getSummary().getDataPointsList().size();

x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/otlp/datapoint/HistogramConverter.java

@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.oteldata.otlp.datapoint;
+
+import io.opentelemetry.proto.metrics.v1.ExponentialHistogramDataPoint;
+import io.opentelemetry.proto.metrics.v1.HistogramDataPoint;
+
+import org.elasticsearch.exponentialhistogram.ExponentialScaleUtils;
+
+/**
+ * Utility class to convert OpenTelemetry histogram data points into counts and centroid values
+ * so that we can use it with the {@code histogram} field type.
+ * This class provides methods to extract counts and centroid values from both
+ * {@link ExponentialHistogramDataPoint} and {@link HistogramDataPoint}.
+ * The algorithm is ported over from the OpenTelemetry collector's Elasticsearch exporter.
+ * @see <a href="https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.132.0/exporter/elasticsearchexporter">
+ * Elasticsearch exporter on GitHub
+ * </a>
+ */
+class HistogramConverter {
+
+    static <E extends Exception> void counts(ExponentialHistogramDataPoint dp, CheckedLongConsumer<E> counts) throws E {
+        ExponentialHistogramDataPoint.Buckets negative = dp.getNegative();
+
+        for (int i = negative.getBucketCountsCount() - 1; i >= 0; i--) {
+            long count = negative.getBucketCounts(i);
+            if (count != 0) {
+                counts.accept(count);
+            }
+        }
+
+        long zeroCount = dp.getZeroCount();
+        if (zeroCount > 0) {
+            counts.accept(zeroCount);
+        }
+
+        ExponentialHistogramDataPoint.Buckets positive = dp.getPositive();
+        for (int i = 0; i < positive.getBucketCountsCount(); i++) {
+            long count = positive.getBucketCounts(i);
+            if (count != 0) {
+                counts.accept(count);
+            }
+        }
+    }
+
+    /**
+     * @see <a
+     * href="https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.132.0/exporter/elasticsearchexporter/internal/exphistogram/exphistogram.go">
+     * <code>ToTDigest</code> function
+     * </a>
+     */
+    static <E extends Exception> void centroidValues(ExponentialHistogramDataPoint dp, CheckedDoubleConsumer<E> values) throws E {
+        int scale = dp.getScale();
+        ExponentialHistogramDataPoint.Buckets negative = dp.getNegative();
+
+        int offset = negative.getOffset();
+        for (int i = negative.getBucketCountsCount() - 1; i >= 0; i--) {
+            long count = negative.getBucketCounts(i);
+            if (count != 0) {
+                double lb = -ExponentialScaleUtils.getUpperBucketBoundary(offset + i, scale);
+                double ub = -ExponentialScaleUtils.getLowerBucketBoundary(offset + i, scale);
+                values.accept(lb + (ub - lb) / 2);
+            }
+        }
+
+        long zeroCount = dp.getZeroCount();
+        if (zeroCount > 0) {
+            values.accept(0.0);
+        }
+
+        ExponentialHistogramDataPoint.Buckets positive = dp.getPositive();
+        offset = positive.getOffset();
+        for (int i = 0; i < positive.getBucketCountsCount(); i++) {
+            long count = positive.getBucketCounts(i);
+            if (count != 0) {
+                double lb = ExponentialScaleUtils.getLowerBucketBoundary(offset + i, scale);
+                double ub = ExponentialScaleUtils.getUpperBucketBoundary(offset + i, scale);
+                values.accept(lb + (ub - lb) / 2);
+            }
+        }
+    }
+
+    static <E extends Exception> void counts(HistogramDataPoint dp, CheckedLongConsumer<E> counts) throws E {
+        for (int i = 0; i < dp.getBucketCountsCount(); i++) {
+            long count = dp.getBucketCounts(i);
+            if (count != 0) {
+                counts.accept(count);
+            }
+        }
+    }
+
+    /**
+     * @see <a
+     * href="https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.132.0/exporter/elasticsearchexporter/internal/datapoints/histogram.go">
+     * <code>histogramToValue</code> function
+     * </a>
+     */
+    static <E extends Exception> void centroidValues(HistogramDataPoint dp, CheckedDoubleConsumer<E> values) throws E {
+        int size = dp.getBucketCountsCount();
+        for (int i = 0; i < size; i++) {
+            long count = dp.getBucketCounts(i);
+            if (count != 0) {
+                double value;
+                if (i == 0) {
+                    // (-infinity, explicit_bounds[i]]
+                    value = dp.getExplicitBounds(i);
+                    if (value > 0) {
+                        value /= 2;
+                    }
+                } else if (i == size - 1) {
+                    // (explicit_bounds[i], +infinity)
+                    value = dp.getExplicitBounds(i - 1);
+                } else {
+                    // [explicit_bounds[i-1], explicit_bounds[i])
+                    // Use the midpoint between the boundaries.
+                    value = dp.getExplicitBounds(i - 1) + (dp.getExplicitBounds(i) - dp.getExplicitBounds(i - 1)) / 2.0;
+                }
+                values.accept(value);
+            }
+        }
+    }
+
+    interface CheckedLongConsumer<E extends Exception> {
+        void accept(long value) throws E;
+    }
+
+    interface CheckedDoubleConsumer<E extends Exception> {
+        void accept(double value) throws E;
+    }
+}

x-pack/plugin/otel-data/src/test/java/org/elasticsearch/xpack/oteldata/otlp/OtlpUtils.java

@@ -13,7 +13,11 @@
 import io.opentelemetry.proto.common.v1.KeyValue;
 import io.opentelemetry.proto.common.v1.KeyValueList;
 import io.opentelemetry.proto.metrics.v1.AggregationTemporality;
+import io.opentelemetry.proto.metrics.v1.ExponentialHistogram;
+import io.opentelemetry.proto.metrics.v1.ExponentialHistogramDataPoint;
 import io.opentelemetry.proto.metrics.v1.Gauge;
+import io.opentelemetry.proto.metrics.v1.Histogram;
+import io.opentelemetry.proto.metrics.v1.HistogramDataPoint;
 import io.opentelemetry.proto.metrics.v1.Metric;
 import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
 import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
@@ -89,6 +93,34 @@ public static Metric createGaugeMetric(String name, String unit, List<NumberData
         return Metric.newBuilder().setName(name).setUnit(unit).setGauge(Gauge.newBuilder().addAllDataPoints(dataPoints).build()).build();
     }
 
+    public static Metric createExponentialHistogramMetric(
+        String name,
+        String unit,
+        List<ExponentialHistogramDataPoint> dataPoints,
+        AggregationTemporality temporality
+    ) {
+        return Metric.newBuilder()
+            .setName(name)
+            .setUnit(unit)
+            .setExponentialHistogram(
+                ExponentialHistogram.newBuilder().setAggregationTemporality(temporality).addAllDataPoints(dataPoints).build()
+            )
+            .build();
+    }
+
+    public static Metric createHistogramMetric(
+        String name,
+        String unit,
+        List<HistogramDataPoint> dataPoints,
+        AggregationTemporality temporality
+    ) {
+        return Metric.newBuilder()
+            .setName(name)
+            .setUnit(unit)
+            .setHistogram(Histogram.newBuilder().setAggregationTemporality(temporality).addAllDataPoints(dataPoints).build())
+            .build();
+    }
+
     public static Metric createSumMetric(
         String name,
         String unit,

x-pack/plugin/otel-data/src/test/java/org/elasticsearch/xpack/oteldata/otlp/datapoint/DataPointExponentialHistogramTests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.oteldata.otlp.datapoint;
+
+import io.opentelemetry.proto.metrics.v1.ExponentialHistogram;
+import io.opentelemetry.proto.metrics.v1.ExponentialHistogramDataPoint;
+import io.opentelemetry.proto.metrics.v1.Metric;
+
+import org.elasticsearch.test.ESTestCase;
+
+import java.util.HashSet;
+
+import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE;
+import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
+
+public class DataPointExponentialHistogramTests extends ESTestCase {
+
+    private final HashSet<String> validationErrors = new HashSet<>();
+
+    public void testExponentialHistogram() {
+        DataPoint.ExponentialHistogram doubleGauge = new DataPoint.ExponentialHistogram(
+            ExponentialHistogramDataPoint.newBuilder().build(),
+            Metric.newBuilder()
+                .setExponentialHistogram(ExponentialHistogram.newBuilder().setAggregationTemporality(AGGREGATION_TEMPORALITY_DELTA).build())
+                .build()
+        );
+        assertThat(doubleGauge.getDynamicTemplate(), equalTo("histogram"));
+        assertThat(doubleGauge.isValid(validationErrors), equalTo(true));
+        assertThat(validationErrors, empty());
+    }
+
+    public void testExponentialHistogramUnsupportedTemporality() {
+        DataPoint.ExponentialHistogram doubleGauge = new DataPoint.ExponentialHistogram(
+            ExponentialHistogramDataPoint.newBuilder().build(),
+            Metric.newBuilder()
+                .setExponentialHistogram(
+                    ExponentialHistogram.newBuilder().setAggregationTemporality(AGGREGATION_TEMPORALITY_CUMULATIVE).build()
+                )
+                .build()
+        );
+        assertThat(doubleGauge.getDynamicTemplate(), equalTo("histogram"));
+        assertThat(doubleGauge.isValid(validationErrors), equalTo(false));
+        assertThat(validationErrors, contains(containsString("cumulative exponential histogram metrics are not supported")));
+    }
+}