Skip to content

Enable OTLP logs and traces by default #147811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixbarny merged 3 commits into from
May 5, 2026
Merged

Enable OTLP logs and traces by default #147811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d05c00
Enable OTLP logs and traces by default
felixbarny Apr 29, 2026
26a006c
Update docs/changelog/147811.yaml
felixbarny Apr 29, 2026
5193452
Merge branch 'main' into otlp-remove-feature-flags
felixbarny Apr 30, 2026
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
5 changes: 5 additions & 0 deletions docs/changelog/147811.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
area: Logs
issues: []
pr: 147811
summary: Enable OTLP logs and traces by default
type: enhancement
4 changes: 1 addition & 3 deletions test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions ...c/javaRestTest/java/org/elasticsearch/xpack/oteldata/otlp/AbstractOTLPIndexingRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
19 changes: 4 additions & 15 deletions x-pack/plugin/otel-data/src/main/java/org/elasticsearch/xpack/oteldata/OTelPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<OTelIndexTemplateRegistry> registry = new SetOnce<>();
private final SetOnce<IndexingPressure> indexingPressure = new SetOnce<>();
private final boolean enabled;
Expand All @@ -83,12 +80,8 @@ public Collection<RestHandler> getRestHandlers(
assert indexingPressure.get() != null : "indexing pressure must be set";
List<RestHandler> 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;
}

Expand Down Expand Up @@ -123,12 +116,8 @@ public List<Setting<?>> getSettings() {
public Collection<ActionHandler> getActions() {
List<ActionHandler> 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;
}
}
Loading