Fix compile errors after merging

Author: felixbarny

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

@@ -277,7 +277,7 @@ public String getMetricNamesHash(BufferedMurmur3Hasher hasher) {
             return metricNamesHash;
         }
 
-        boolean addDataPoint(Set<String> ignoredDataPointMessages, DataPoint dataPoint) {
+        public boolean addDataPoint(Set<String> ignoredDataPointMessages, DataPoint dataPoint) {
             metricNamesHash = null; // reset the hash when adding a new data point
             if (metricNames.add(dataPoint.getMetricName()) == false) {
                 ignoredDataPointMessages.add(

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

@@ -77,8 +77,8 @@ public void testGroupingDifferentGroupUnit() throws Exception {
     public void testGroupingDuplicateNameSameTimeSeries() throws Exception {
         ExportMetricsServiceRequest metricsRequest = createMetricsRequest(
             List.of(
-                createGaugeMetric("system.cpu.usage", "{percent}", List.of(createDoubleDataPoint(nowUnixNanos, List.of()))),
-                createGaugeMetric("system.cpu.usage", "{percent}", List.of(createLongDataPoint(nowUnixNanos, List.of())))
+                createGaugeMetric("system.cpu.usage", "{percent}", List.of(createDoubleDataPoint(nowUnixNanos))),
+                createGaugeMetric("system.cpu.usage", "{percent}", List.of(createLongDataPoint(nowUnixNanos)))
             )
         );
         context.groupDataPoints(metricsRequest);
@@ -94,8 +94,8 @@ public void testGroupingDuplicateNameSameTimeSeries() throws Exception {
     public void testGroupingDuplicateNameDifferentTimeSeries() throws Exception {
         ExportMetricsServiceRequest metricsRequest = createMetricsRequest(
             List.of(
-                createGaugeMetric("system.cpu.usage", "", List.of(createDoubleDataPoint(nowUnixNanos, List.of()))),
-                createGaugeMetric("system.cpu.usage", "{percent}", List.of(createLongDataPoint(nowUnixNanos, List.of())))
+                createGaugeMetric("system.cpu.usage", "", List.of(createDoubleDataPoint(nowUnixNanos))),
+                createGaugeMetric("system.cpu.usage", "{percent}", List.of(createLongDataPoint(nowUnixNanos)))
             )
         );
         context.groupDataPoints(metricsRequest);

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

@@ -10,7 +10,6 @@
 import io.opentelemetry.proto.common.v1.InstrumentationScope;
 import io.opentelemetry.proto.common.v1.KeyValue;
 import io.opentelemetry.proto.metrics.v1.AggregationTemporality;
-import io.opentelemetry.proto.metrics.v1.NumberDataPoint;
 import io.opentelemetry.proto.resource.v1.Resource;
 
 import com.google.protobuf.ByteString;
@@ -30,6 +29,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import static org.elasticsearch.xpack.oteldata.otlp.OtlpUtils.createDoubleDataPoint;
@@ -66,11 +66,24 @@ public void testBuildMetricDocument() throws IOException {
 
         List<KeyValue> dataPointAttributes = List.of(keyValue("operation", "test"), (keyValue("environment", "production")));
 
-        List<DataPoint> dataPoints = List.of(
+        DataPointGroupingContext.DataPointGroup dataPointGroup = new DataPointGroupingContext.DataPointGroup(
+            resource,
+            resourceSchemaUrl,
+            scope,
+            scopeSchemaUrl,
+            dataPointAttributes,
+            "{test}",
+            "metrics-generic.otel-default"
+        );
+        dataPointGroup.addDataPoint(
+            Set.of(),
             new DataPoint.Number(
                 createDoubleDataPoint(timestamp, startTimestamp, dataPointAttributes),
                 createGaugeMetric("system.cpu.usage", "", List.of())
-            ),
+            )
+        );
+        dataPointGroup.addDataPoint(
+            Set.of(),
             new DataPoint.Number(
                 createLongDataPoint(timestamp, startTimestamp, dataPointAttributes),
                 createSumMetric(
@@ -82,16 +95,6 @@ public void testBuildMetricDocument() throws IOException {
                 )
             )
         );
-        DataPointGroupingContext.DataPointGroup dataPointGroup = new DataPointGroupingContext.DataPointGroup(
-            resource,
-            resourceSchemaUrl,
-            scope,
-            scopeSchemaUrl,
-            dataPointAttributes,
-            "{test}",
-            dataPoints,
-            "metrics-generic.otel-default"
-        );
 
         XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
         HashMap<String, String> dynamicTemplates = documentBuilder.buildMetricDocument(builder, dataPointGroup);
@@ -129,20 +132,19 @@ public void testAttributeTypes() throws IOException {
         Resource resource = Resource.newBuilder().addAllAttributes(resourceAttributes).build();
         InstrumentationScope scope = InstrumentationScope.newBuilder().build();
 
-        List<DataPoint> dataPoints = List.of(
-            new DataPoint.Number(createDoubleDataPoint(timestamp), createGaugeMetric("test.metric", "", List.of()))
-        );
-
         DataPointGroupingContext.DataPointGroup dataPointGroup = new DataPointGroupingContext.DataPointGroup(
             resource,
             null,
             scope,
             null,
             List.of(),
             "",
-            dataPoints,
             "metrics-generic.otel-default"
         );
+        dataPointGroup.addDataPoint(
+            Set.of(),
+            new DataPoint.Number(createDoubleDataPoint(timestamp), createGaugeMetric("test.metric", "", List.of()))
+        );
 
         XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
         documentBuilder.buildMetricDocument(builder, dataPointGroup);
@@ -162,21 +164,21 @@ public void testEmptyFields() throws IOException {
         Resource resource = Resource.newBuilder().build();
         InstrumentationScope scope = InstrumentationScope.newBuilder().build();
 
-        NumberDataPoint dataPoint = createDoubleDataPoint(timestamp);
-        var metric = createGaugeMetric("test.metric", "", List.of(dataPoint));
-        List<DataPoint> dataPoints = List.of(new DataPoint.Number(dataPoint, metric));
-
         DataPointGroupingContext.DataPointGroup dataPointGroup = new DataPointGroupingContext.DataPointGroup(
             resource,
             null,
             scope,
             null,
             List.of(),
             "",
-            dataPoints,
             "metrics-generic.otel-default"
         );
 
+        dataPointGroup.addDataPoint(
+            Set.of(),
+            new DataPoint.Number(createDoubleDataPoint(timestamp), createGaugeMetric("test.metric", "", List.of()))
+        );
+
         XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
         documentBuilder.buildMetricDocument(builder, dataPointGroup);