Fixes after merge

Author: felixbarny

x-pack/plugin/otel-data/src/javaRestTest/java/org/elasticsearch/action/otlp/OTLPMetricsIndexingRestIT.java

@@ -71,7 +71,7 @@ public class OTLPMetricsIndexingRestIT extends ESRestTestCase {
         .user(USER, PASS, "superuser", false)
         .setting("xpack.security.autoconfiguration.enabled", "false")
         .setting("xpack.license.self_generated.type", "trial")
-        .setting("xpack.security.enabled", "false")
+        .setting("xpack.ml.enabled", "false")
         .setting("xpack.watcher.enabled", "false")
         .build();
 
@@ -117,7 +117,7 @@ public void tearDown() throws Exception {
 
     public void testIngestMetricViaMeterProvider() throws Exception {
         Meter sampleMeter = meterProvider.get("io.opentelemetry.example.metrics");
-        long totalMemory = randomLong();
+        long totalMemory = 42;
 
         sampleMeter.gaugeBuilder("jvm.memory.total")
             .setDescription("Reports JVM memory usage.")
@@ -135,15 +135,14 @@ public void testIngestMetricViaMeterProvider() throws Exception {
         assertThat(ObjectPath.evaluate(source, "@timestamp"), isA(String.class));
         assertThat(ObjectPath.evaluate(source, "start_timestamp"), isA(String.class));
         assertThat(ObjectPath.evaluate(source, "_metric_names_hash"), isA(String.class));
-        assertThat(ObjectPath.evaluate(source, "metrics.jvm\\.memory\\.total").toString(), equalTo(Long.toString(totalMemory)));
+        assertThat(ObjectPath.<Number>evaluate(source, "metrics.jvm\\.memory\\.total").longValue(), equalTo(totalMemory));
         assertThat(ObjectPath.evaluate(source, "unit"), equalTo("By"));
-        assertThat(ObjectPath.evaluate(source, "resource.attributes.service\\.name"), equalTo("elasticsearch"));
         assertThat(ObjectPath.evaluate(source, "scope.name"), equalTo("io.opentelemetry.example.metrics"));
     }
 
     public void testIngestMetricDataViaMetricExporter() throws Exception {
         long now = Clock.getDefault().now();
-        long totalMemory = randomLong();
+        long totalMemory = 42;
         MetricData jvmMemoryMetricData = createLongGauge(TEST_RESOURCE, Attributes.empty(), "jvm.memory.total", totalMemory, "By", now);
 
         export(List.of(jvmMemoryMetricData));
@@ -153,7 +152,7 @@ public void testIngestMetricDataViaMetricExporter() throws Exception {
         assertThat(ObjectPath.evaluate(source, "@timestamp"), equalTo(timestampAsString(now)));
         assertThat(ObjectPath.evaluate(source, "start_timestamp"), equalTo(timestampAsString(now)));
         assertThat(ObjectPath.evaluate(source, "_metric_names_hash"), isA(String.class));
-        assertThat(ObjectPath.evaluate(source, "metrics.jvm\\.memory\\.total").toString(), equalTo(Long.toString(totalMemory)));
+        assertThat(ObjectPath.<Number>evaluate(source, "metrics.jvm\\.memory\\.total").longValue(), equalTo(totalMemory));
         assertThat(ObjectPath.evaluate(source, "unit"), equalTo("By"));
         assertThat(ObjectPath.evaluate(source, "resource.attributes.service\\.name"), equalTo("elasticsearch"));
         assertThat(ObjectPath.evaluate(source, "scope.name"), equalTo("io.opentelemetry.example.metrics"));

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

@@ -127,7 +127,7 @@ private void addIndexRequest(
         try (XContentBuilder xContentBuilder = XContentFactory.cborBuilder(new BytesStreamOutput())) {
             var dynamicTemplates = metricDocumentBuilder.buildMetricDocument(xContentBuilder, dataPointGroup);
             bulkRequestBuilder.add(
-                new IndexRequest(dataPointGroup.targetIndex().index()).opType(DocWriteRequest.OpType.CREATE)
+                new IndexRequest(dataPointGroup.targetIndex()).opType(DocWriteRequest.OpType.CREATE)
                     .setRequireDataStream(true)
                     .source(xContentBuilder)
                     // TODO uncomment after https://github.com/elastic/elasticsearch/pull/132566 has been merged