Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,16 @@
<sha256 value="2eaaac5f268b135f0e11dd30637d71df5751a0bb7ed6268659be57104d63122b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-api" version="1.53.0">
<artifact name="opentelemetry-api-1.53.0.jar">
<sha256 value="1991903b9fc76b27f1e6a70a5a97131668fb5f3ac9026178c450d510cbb1bef2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-common" version="1.53.0">
<artifact name="opentelemetry-common-1.53.0.jar">
<sha256 value="73a5181dd07e72c4312fadafc8328ad1046a32c050030e3a7b8c16113daad359" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-context" version="1.31.0">
<artifact name="opentelemetry-context-1.31.0.jar">
<sha256 value="664896a5c34bcda20c95c8f45198a95e8f97a1cd5e5c2923978f42dddada787d" origin="Generated by Gradle"/>
Expand All @@ -1766,11 +1776,61 @@
<sha256 value="76f9dfe1a6f74d5081e07bde1f7cb9a06879d317ec0ae0f61dd8fb2be9afad4f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-context" version="1.53.0">
<artifact name="opentelemetry-context-1.53.0.jar">
<sha256 value="88a780c5bb7b51e7c07071d61403e34f13277d092bf441a5cb49cf2ce9c756e9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-exporter-common" version="1.53.0">
<artifact name="opentelemetry-exporter-common-1.53.0.jar">
<sha256 value="d7f093f987547c9c2c2caa28baf1254507c59b4dbf97b49fee5c9cd1ceb6f8d5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-exporter-otlp" version="1.53.0">
<artifact name="opentelemetry-exporter-otlp-1.53.0.jar">
<sha256 value="0ce88bf35577894ee185f718f1b981938bbfc8981f3b7fcecbfd7b7c375bc236" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-exporter-otlp-common" version="1.53.0">
<artifact name="opentelemetry-exporter-otlp-common-1.53.0.jar">
<sha256 value="32bcf0e855110b09cffbb5aac59c69d2caaa35de646e07c0a5f7f50ab42d4c1f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-exporter-sender-jdk" version="1.53.0">
<artifact name="opentelemetry-exporter-sender-jdk-1.53.0.jar">
<sha256 value="d147fd99aa23be8b0ea8acbc06ffae2f091af2edfffeb44163ab79765f7e3b42" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-sdk" version="1.47.0">
<artifact name="opentelemetry-sdk-1.47.0.jar">
<sha256 value="4a09eb2ee484769973e14218a34e6da54f35955aa02b26dc5238b0c2ed6a801d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-sdk" version="1.53.0">
<artifact name="opentelemetry-sdk-1.53.0.jar">
<sha256 value="d58721063bca5d612bf1f6dccb883664210999c5aa470c149d1509672f13229c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-sdk-common" version="1.53.0">
<artifact name="opentelemetry-sdk-common-1.53.0.jar">
<sha256 value="a5d68aca0920aa0dc17b9ecc5510abe4c344e66eae9a4420c992298e4712d3bc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-sdk-extension-autoconfigure" version="1.53.0">
<artifact name="opentelemetry-sdk-extension-autoconfigure-1.53.0.jar">
<sha256 value="72becaccfb3d79d91c6486bf4e68f2474a1aa7742934fb675ea077e35a8dc3e1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-sdk-extension-autoconfigure-spi" version="1.53.0">
<artifact name="opentelemetry-sdk-extension-autoconfigure-spi-1.53.0.jar">
<sha256 value="e814e63dc2f8cbdf84574b6289eb543b89b06486d03cad1e697b06d802ce27bb" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-sdk-metrics" version="1.53.0">
<artifact name="opentelemetry-sdk-metrics-1.53.0.jar">
<sha256 value="3d7dbae6c03be035e7c4dbdd50442741b260be5463fa9aadca1b00af0efddee5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.opentelemetry" name="opentelemetry-semconv" version="1.21.0-alpha">
<artifact name="opentelemetry-semconv-1.21.0-alpha.jar">
<sha256 value="4a8f41b93eec51e85fa6b48e43de6785b742316fdd9c9baf595adbce6d5de6af" origin="Generated by Gradle"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
import org.elasticsearch.action.admin.indices.template.delete.TransportDeleteComponentTemplateAction;
import org.elasticsearch.action.admin.indices.template.delete.TransportDeleteComposableIndexTemplateAction;
import org.elasticsearch.action.admin.indices.template.get.GetComposableIndexTemplateAction;
import org.elasticsearch.action.datastreams.DeleteDataStreamAction;
import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.ingest.DeletePipelineRequest;
Expand Down Expand Up @@ -75,6 +76,7 @@
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -155,10 +157,28 @@ public void tearDown() throws Exception {
throw e;
}
}
var deleteComposableIndexTemplateRequest = new TransportDeleteComposableIndexTemplateAction.Request("*");
assertAcked(client().execute(TransportDeleteComposableIndexTemplateAction.TYPE, deleteComposableIndexTemplateRequest).actionGet());
var deleteComponentTemplateRequest = new TransportDeleteComponentTemplateAction.Request("*");
assertAcked(client().execute(TransportDeleteComponentTemplateAction.TYPE, deleteComponentTemplateRequest).actionGet());
var indexTemplates = client().execute(
GetComposableIndexTemplateAction.INSTANCE,
new GetComposableIndexTemplateAction.Request(TEST_REQUEST_TIMEOUT, "*")
).actionGet().indexTemplates();
var deleteComposableIndexTemplateRequest = new TransportDeleteComposableIndexTemplateAction.Request(
indexTemplates.keySet().stream().filter(Predicate.not(ESRestTestCase::isXPackTemplate)).toArray(String[]::new)
);
if (deleteComposableIndexTemplateRequest.names().length > 0) {
assertAcked(
client().execute(TransportDeleteComposableIndexTemplateAction.TYPE, deleteComposableIndexTemplateRequest).actionGet()
);
}
var componentTemplates = client().execute(
GetComposableIndexTemplateAction.INSTANCE,
new GetComposableIndexTemplateAction.Request(TEST_REQUEST_TIMEOUT, "*")
).actionGet().indexTemplates();
var deleteComponentTemplateRequest = new TransportDeleteComponentTemplateAction.Request(
componentTemplates.keySet().stream().filter(Predicate.not(ESRestTestCase::isXPackTemplate)).toArray(String[]::new)
);
if (deleteComponentTemplateRequest.names().length > 0) {
assertAcked(client().execute(TransportDeleteComponentTemplateAction.TYPE, deleteComponentTemplateRequest).actionGet());
}
assertAcked(indicesAdmin().prepareDelete("*").setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN).get());
Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
assertThat(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2283,7 +2283,7 @@ private static void assertAcked(String message, Response response) throws IOExce
/**
* Is this template one that is automatically created by xpack?
*/
protected static boolean isXPackTemplate(String name) {
public static boolean isXPackTemplate(String name) {
if (name.startsWith(".monitoring-")) {
return true;
}
Expand Down
38 changes: 36 additions & 2 deletions x-pack/plugin/otel-data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ dependencies {
});
opentelemetryProtobuf "open-telemetry:opentelemetry-proto:1.7.0@zip"

api project(":libs:exponential-histogram")
compileOnly project(path: xpackModule('core'))
testImplementation project(path: ':x-pack:plugin:stack')
testImplementation(testArtifact(project(xpackModule('core'))))
testImplementation project(':modules:data-streams')
// for yamlRestTest
clusterModules project(':modules:data-streams')
clusterModules project(':modules:ingest-common')
clusterModules project(':modules:ingest-geoip')
Expand All @@ -65,6 +65,40 @@ dependencies {
clusterModules project(xpackModule('stack'))
clusterModules project(xpackModule('wildcard'))
clusterModules project(xpackModule('mapper-version'))
// for internalClusterTest
testImplementation project(':modules:data-streams')
testImplementation project(':x-pack:plugin:esql')
testImplementation project(':x-pack:plugin:esql-core')
testImplementation project(':modules:data-streams')
testImplementation project(':modules:ingest-common')
testImplementation project(':modules:ingest-geoip')
testImplementation project(':modules:ingest-user-agent')
testImplementation project(':modules:lang-mustache')
testImplementation project(':modules:lang-painless')
testImplementation project(':modules:lang-painless:spi')
testImplementation project(':modules:mapper-extras')
testImplementation project(xpackModule('analytics'))
testImplementation project(xpackModule('ilm'))
testImplementation project(xpackModule('mapper-aggregate-metric'))
testImplementation project(xpackModule('mapper-constant-keyword'))
testImplementation project(xpackModule('mapper-counted-keyword'))
testImplementation project(xpackModule('stack'))
testImplementation project(xpackModule('wildcard'))
testImplementation project(xpackModule('mapper-version'))

def otelVersion = "1.53.0"
testImplementation "io.opentelemetry:opentelemetry-api:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-common:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-context:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-sdk:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-sdk-common:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-sdk-metrics:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-exporter-common:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-exporter-otlp:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-exporter-otlp-common:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-exporter-sender-jdk:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$otelVersion"
testImplementation "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:$otelVersion"

implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
// The protobuf plugin only adds a dependency for the variant relevant for the current platform.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
/*
* 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.action.otlp;

import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.exporter.internal.FailedExportException;
import io.opentelemetry.exporter.internal.grpc.GrpcExporterUtil;
import io.opentelemetry.exporter.otlp.http.metrics.OtlpHttpMetricExporter;
import io.opentelemetry.sdk.common.Clock;
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.data.MetricData;
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableDoublePointData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableGaugeData;
import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
import io.opentelemetry.sdk.resources.Resource;

import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.elasticsearch.action.admin.indices.template.get.GetComposableIndexTemplateAction;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.datastreams.DataStreamsPlugin;
import org.elasticsearch.http.HttpInfo;
import org.elasticsearch.index.mapper.extras.MapperExtrasPlugin;
import org.elasticsearch.ingest.common.IngestCommonPlugin;
import org.elasticsearch.painless.PainlessPlugin;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase;
import org.elasticsearch.test.InternalSettingsPlugin;
import org.elasticsearch.xpack.aggregatemetric.AggregateMetricMapperPlugin;
import org.elasticsearch.xpack.analytics.AnalyticsPlugin;
import org.elasticsearch.xpack.constantkeyword.ConstantKeywordMapperPlugin;
import org.elasticsearch.xpack.core.XPackPlugin;
import org.elasticsearch.xpack.countedkeyword.CountedKeywordMapperPlugin;
import org.elasticsearch.xpack.esql.plugin.EsqlPlugin;
import org.elasticsearch.xpack.ilm.IndexLifecycle;
import org.elasticsearch.xpack.oteldata.OTelPlugin;
import org.elasticsearch.xpack.stack.StackPlugin;
import org.elasticsearch.xpack.versionfield.VersionFieldPlugin;
import org.elasticsearch.xpack.wildcard.Wildcard;

import java.io.IOException;
import java.net.InetSocketAddress;
import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import static io.opentelemetry.api.common.AttributeKey.stringKey;
import static org.hamcrest.Matchers.anEmptyMap;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;

public class OTLPMetricsIndexingIT extends ESSingleNodeTestCase {

private static final Resource TEST_RESOURCE = Resource.create(Attributes.of(stringKey("service.name"), "elasticsearch"));
private static final InstrumentationScopeInfo TEST_SCOPE = InstrumentationScopeInfo.create("io.opentelemetry.example.metrics");
private OtlpHttpMetricExporter exporter;
private SdkMeterProvider meterProvider;

@Override
protected Collection<Class<? extends Plugin>> getPlugins() {
return List.of(
DataStreamsPlugin.class,
InternalSettingsPlugin.class,
OTelPlugin.class,
StackPlugin.class,
EsqlPlugin.class,
VersionFieldPlugin.class,
CountedKeywordMapperPlugin.class,
ConstantKeywordMapperPlugin.class,
MapperExtrasPlugin.class,
Wildcard.class,
IndexLifecycle.class,
IngestCommonPlugin.class,
XPackPlugin.class,
PainlessPlugin.class,
AnalyticsPlugin.class,
AggregateMetricMapperPlugin.class
);
}

@Override
protected Settings nodeSettings() {
Settings.Builder newSettings = Settings.builder();
newSettings.put(super.nodeSettings());
// This essentially disables the automatic updates to end_time settings of a data stream's latest backing index.
newSettings.put(DataStreamsPlugin.TIME_SERIES_POLL_INTERVAL.getKey(), "10m");
return newSettings.build();
}

@Override
protected boolean addMockHttpTransport() {
return false;
}

@Override
public void setUp() throws Exception {
super.setUp();
exporter = OtlpHttpMetricExporter.builder().setEndpoint("http://localhost:" + getHttpPort() + "/_otlp/v1/metrics").build();
meterProvider = SdkMeterProvider.builder()
.registerMetricReader(
PeriodicMetricReader.builder(exporter)
.setExecutor(Executors.newScheduledThreadPool(0))
.setInterval(Duration.ofNanos(Long.MAX_VALUE))
.build()
)
.build();
assertBusy(() -> {
GetComposableIndexTemplateAction.Request getReq = new GetComposableIndexTemplateAction.Request(TEST_REQUEST_TIMEOUT, "*");
var templates = client().execute(GetComposableIndexTemplateAction.INSTANCE, getReq).actionGet().indexTemplates();
assertThat(templates, not(anEmptyMap()));
});
}

private int getHttpPort() {
NodesInfoResponse nodesInfoResponse = client().admin().cluster().prepareNodesInfo().get();
assertFalse(nodesInfoResponse.hasFailures());
assertEquals(1, nodesInfoResponse.getNodes().size());
NodeInfo node = nodesInfoResponse.getNodes().getFirst();
assertNotNull(node.getInfo(HttpInfo.class));
TransportAddress publishAddress = node.getInfo(HttpInfo.class).address().publishAddress();
InetSocketAddress address = publishAddress.address();
return address.getPort();
}

@Override
public void tearDown() throws Exception {
meterProvider.close();
super.tearDown();
}

public void testIngestMetricDataViaMetricExporter() throws Exception {
MetricData jvmMemoryMetricData = createDoubleGauge(
TEST_RESOURCE,
Attributes.empty(),
"jvm.memory.total",
Runtime.getRuntime().totalMemory(),
"By",
Clock.getDefault().now()
);

assertThrows("OTLP metrics is not implemented yet", RuntimeException.class, () -> export(List.of(jvmMemoryMetricData)));
}

private void export(List<MetricData> metrics) throws IOException {
var result = exporter.export(metrics).join(10, TimeUnit.SECONDS);
Throwable failure = result.getFailureThrowable();
if (failure instanceof FailedExportException.HttpExportException httpExportException) {
throw new RuntimeException(GrpcExporterUtil.getStatusMessage(httpExportException.getResponse().responseBody()));
} else if (failure != null) {
throw new RuntimeException("Failed to export metrics", failure);
}
assertThat(result.isSuccess(), is(true));
admin().indices().prepareRefresh().execute().actionGet();
}

private static MetricData createDoubleGauge(
Resource resource,
Attributes attributes,
String name,
double value,
String unit,
long timeEpochNanos
) {
return ImmutableMetricData.createDoubleGauge(
resource,
TEST_SCOPE,
name,
"Your description could be here.",
unit,
ImmutableGaugeData.create(List.of(ImmutableDoublePointData.create(timeEpochNanos, timeEpochNanos, attributes, value)))
);
}
}
Loading