diff --git a/docs/changelog/147811.yaml b/docs/changelog/147811.yaml new file mode 100644 index 0000000000000..81884d6f13255 --- /dev/null +++ b/docs/changelog/147811.yaml @@ -0,0 +1,5 @@ +area: Logs +issues: [] +pr: 147811 +summary: Enable OTLP logs and traces by default +type: enhancement diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java index 759ae2f709c76..4d64a3a6b1a9d 100644 --- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java +++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java @@ -30,9 +30,7 @@ public enum FeatureFlag { EXTENDED_DOC_VALUES_PARAMS("es.extended_doc_values_options_feature_flag_enabled=true", Version.fromString("9.3.0"), null), TSDB_NO_SEQNO("es.tsdb_no_tsbd_feature_flag_enabled=true", Version.fromString("9.4.0"), null), IGNORED_SOURCE_AS_DOC_VALUES_FF("es.ignored_source_as_doc_values_feature_flag_enabled=true", Version.fromString("9.4.0"), null), - PROMETHEUS_FEATURE_FLAG("es.prometheus_feature_flag_enabled=true", Version.fromString("9.4.0"), null), - OTLP_TRACES("es.otlp_traces_feature_flag_enabled=true", Version.fromString("9.4.0"), null), - OTLP_LOGS("es.otlp_logs_feature_flag_enabled=true", Version.fromString("9.4.0"), null); + PROMETHEUS_FEATURE_FLAG("es.prometheus_feature_flag_enabled=true", Version.fromString("9.4.0"), null); public final String systemProperty; public final Version from; diff --git a/x-pack/plugin/otel-data/src/javaRestTest/java/org/elasticsearch/xpack/oteldata/otlp/AbstractOTLPIndexingRestIT.java b/x-pack/plugin/otel-data/src/javaRestTest/java/org/elasticsearch/xpack/oteldata/otlp/AbstractOTLPIndexingRestIT.java index 6dd18d3e60b57..45cf1d5d86155 100644 --- a/x-pack/plugin/otel-data/src/javaRestTest/java/org/elasticsearch/xpack/oteldata/otlp/AbstractOTLPIndexingRestIT.java +++ b/x-pack/plugin/otel-data/src/javaRestTest/java/org/elasticsearch/xpack/oteldata/otlp/AbstractOTLPIndexingRestIT.java @@ -19,7 +19,6 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.test.cluster.ElasticsearchCluster; -import org.elasticsearch.test.cluster.FeatureFlag; import org.elasticsearch.test.cluster.local.distribution.DistributionType; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ObjectPath; @@ -50,8 +49,6 @@ public abstract class AbstractOTLPIndexingRestIT extends ESRestTestCase { .setting("xpack.license.self_generated.type", "trial") .setting("xpack.ml.enabled", "false") .setting("xpack.watcher.enabled", "false") - .feature(FeatureFlag.OTLP_TRACES) - .feature(FeatureFlag.OTLP_LOGS) .build(); @Override diff --git a/x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/OTelPlugin.java b/x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/OTelPlugin.java index 38258143f135a..f2c48ecdb3b20 100644 --- a/x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/OTelPlugin.java +++ b/x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/OTelPlugin.java @@ -14,7 +14,6 @@ import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.util.FeatureFlag; import org.elasticsearch.features.NodeFeature; import org.elasticsearch.http.HttpTransportSettings; import org.elasticsearch.index.IndexingPressure; @@ -62,8 +61,6 @@ public enum HistogramMappingSettingValues { private static final Logger logger = LogManager.getLogger(OTelPlugin.class); - private static final boolean OTLP_TRACES_ENABLED = new FeatureFlag("otlp_traces").isEnabled(); - private static final boolean OTLP_LOGS_ENABLED = new FeatureFlag("otlp_logs").isEnabled(); private final SetOnce registry = new SetOnce<>(); private final SetOnce indexingPressure = new SetOnce<>(); private final boolean enabled; @@ -83,12 +80,8 @@ public Collection getRestHandlers( assert indexingPressure.get() != null : "indexing pressure must be set"; List handlers = new ArrayList<>(3); handlers.add(new OTLPMetricsRestAction(indexingPressure.get(), maxProtobufContentLengthBytes)); - if (OTLP_TRACES_ENABLED) { - handlers.add(new OTLPTracesRestAction(indexingPressure.get(), maxProtobufContentLengthBytes)); - } - if (OTLP_LOGS_ENABLED) { - handlers.add(new OTLPLogsRestAction(indexingPressure.get(), maxProtobufContentLengthBytes)); - } + handlers.add(new OTLPTracesRestAction(indexingPressure.get(), maxProtobufContentLengthBytes)); + handlers.add(new OTLPLogsRestAction(indexingPressure.get(), maxProtobufContentLengthBytes)); return handlers; } @@ -123,12 +116,8 @@ public List> getSettings() { public Collection getActions() { List handlers = new ArrayList<>(3); handlers.add(new ActionHandler(OTLPMetricsTransportAction.TYPE, OTLPMetricsTransportAction.class)); - if (OTLP_TRACES_ENABLED) { - handlers.add(new ActionHandler(OTLPTracesTransportAction.TYPE, OTLPTracesTransportAction.class)); - } - if (OTLP_LOGS_ENABLED) { - handlers.add(new ActionHandler(OTLPLogsTransportAction.TYPE, OTLPLogsTransportAction.class)); - } + handlers.add(new ActionHandler(OTLPTracesTransportAction.TYPE, OTLPTracesTransportAction.class)); + handlers.add(new ActionHandler(OTLPLogsTransportAction.TYPE, OTLPLogsTransportAction.class)); return handlers; } }