Skip to content

Commit bb0a9f4

Browse files
Make xpack.otel_data.registry.enabled default to true (#113468) (#113871)
* Make xpack.otel_data.registry.enabled default to true * Update build.gradle * Disable otel-data plugin for tests where it's not relevant --------- Co-authored-by: Elastic Machine <[email protected]>
1 parent da102fc commit bb0a9f4

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/AbstractDataStreamIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public abstract class AbstractDataStreamIT extends ESRestTestCase {
4444
// Disable apm-data so the index templates it installs do not impact
4545
// tests such as testIgnoreDynamicBeyondLimit.
4646
.setting("xpack.apm_data.enabled", "false")
47+
.setting("xpack.otel_data.registry.enabled", "false")
4748
.build();
4849
protected RestClient client;
4950

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/LogsIndexModeCustomSettingsIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class LogsIndexModeCustomSettingsIT extends LogsIndexModeRestTestIT {
3737
.module("x-pack-aggregate-metric")
3838
.module("x-pack-stack")
3939
.setting("xpack.security.enabled", "false")
40+
.setting("xpack.otel_data.registry.enabled", "false")
4041
.setting("xpack.license.self_generated.type", "trial")
4142
.setting("cluster.logsdb.enabled", "true")
4243
.build();

x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ testClusters.configureEach {
5959
setting 'stack.templates.enabled', 'false'
6060
setting 'xpack.ent_search.enabled', 'false'
6161
setting 'xpack.apm_data.enabled', 'false'
62+
setting 'xpack.otel_data.registry.enabled', 'false'
6263
// To spice things up a bit, one of the nodes is not an ML node
6364
nodes.'javaRestTest-0'.setting 'node.roles', '["master","data","ingest"]'
6465
nodes.'javaRestTest-1'.setting 'node.roles', '["master","data","ingest","ml"]'

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public class OTelPlugin extends Plugin implements ActionPlugin {
3333
// This setting will be ignored if the plugin is disabled.
3434
static final Setting<Boolean> OTEL_DATA_REGISTRY_ENABLED = Setting.boolSetting(
3535
"xpack.otel_data.registry.enabled",
36-
// OTel-data is under development, and we start with opt-in first.
37-
// Furthermore, this could help with staged rollout in serverless
38-
false,
36+
true,
3937
Setting.Property.NodeScope,
4038
Setting.Property.Dynamic
4139
);

x-pack/plugin/otel-data/src/yamlRestTest/java/org/elasticsearch/xpack/oteldata/OTelYamlTestSuiteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class OTelYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
3535
.module("x-pack-stack")
3636
.module("mapper-version")
3737
.setting("ingest.geoip.downloader.enabled", "false")
38-
.setting("xpack.otel_data.registry.enabled", "true")
3938
.build();
4039

4140
public OTelYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

0 commit comments

Comments
 (0)