add tests

Signed-off-by: chrislai <[email protected]>

Author: chriswlai

.java-version

@@ -353,7 +353,7 @@ private MLCommonsSettings() {}
 
     // Feature flag for enabling telemetry tracer
     public static final Setting<Boolean> ML_COMMONS_AGENT_TRACING_FEATURE_ENABLED = Setting
-    .boolSetting("plugins.ml_commons.agent_tracing_feature_enabled", false, Setting.Property.NodeScope, Setting.Property.Final);
+        .boolSetting("plugins.ml_commons.agent_tracing_feature_enabled", false, Setting.Property.NodeScope, Setting.Property.Final);
 
     // Feature flag for enabling telemetry agent tracing
     public static final Setting<Boolean> ML_COMMONS_AGENT_TRACING_ENABLED = Setting

common/src/main/java/org/opensearch/ml/common/settings/MLCommonsSettings.java

@@ -8,6 +8,8 @@
 package org.opensearch.ml.common.settings;
 
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_FRAMEWORK_ENABLED;
+import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_TRACING_ENABLED;
+import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_TRACING_FEATURE_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONNECTOR_PRIVATE_IP_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_CONTROLLER_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_LOCAL_MODEL_ENABLED;
@@ -19,8 +21,6 @@
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_REMOTE_INFERENCE_ENABLED;
 import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED;
-import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_TRACING_FEATURE_ENABLED;
-import static org.opensearch.ml.common.settings.MLCommonsSettings.ML_COMMONS_AGENT_TRACING_ENABLED;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/org/opensearch/ml/common/settings/MLFeatureEnabledSetting.java

@@ -43,7 +43,9 @@ public void setUp() {
                     MLCommonsSettings.ML_COMMONS_MCP_SERVER_ENABLED,
                     MLCommonsSettings.ML_COMMONS_RAG_PIPELINE_FEATURE_ENABLED,
                     MLCommonsSettings.ML_COMMONS_METRIC_COLLECTION_ENABLED,
-                    MLCommonsSettings.ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED
+                    MLCommonsSettings.ML_COMMONS_STATIC_METRIC_COLLECTION_ENABLED,
+                    MLCommonsSettings.ML_COMMONS_AGENT_TRACING_FEATURE_ENABLED,
+                    MLCommonsSettings.ML_COMMONS_AGENT_TRACING_ENABLED
                 )
         );
         when(mockClusterService.getClusterSettings()).thenReturn(mockClusterSettings);
@@ -65,6 +67,8 @@ public void testDefaults_allFeaturesEnabled() {
             .put("plugins.ml_commons.rag_pipeline_feature_enabled", true)
             .put("plugins.ml_commons.metrics_collection_enabled", true)
             .put("plugins.ml_commons.metrics_static_collection_enabled", true)
+            .put("plugins.ml_commons.agent_tracing_feature_enabled", true)
+            .put("plugins.ml_commons.agent_tracing_enabled", true)
             .build();
 
         MLFeatureEnabledSetting setting = new MLFeatureEnabledSetting(mockClusterService, settings);
@@ -81,6 +85,8 @@ public void testDefaults_allFeaturesEnabled() {
         assertTrue(setting.isRagSearchPipelineEnabled());
         assertTrue(setting.isMetricCollectionEnabled());
         assertTrue(setting.isStaticMetricCollectionEnabled());
+        assertTrue(setting.isAgentTracingFeatureEnabled());
+        assertTrue(setting.isAgentTracingEnabled());
     }
 
     @Test
@@ -99,6 +105,8 @@ public void testDefaults_someFeaturesDisabled() {
             .put("plugins.ml_commons.rag_pipeline_feature_enabled", false)
             .put("plugins.ml_commons.metrics_collection_enabled", false)
             .put("plugins.ml_commons.metrics_static_collection_enabled", false)
+            .put("plugins.ml_commons.agent_tracing_feature_enabled", false)
+            .put("plugins.ml_commons.agent_tracing_enabled", false)
             .build();
 
         MLFeatureEnabledSetting setting = new MLFeatureEnabledSetting(mockClusterService, settings);
@@ -115,6 +123,8 @@ public void testDefaults_someFeaturesDisabled() {
         assertFalse(setting.isRagSearchPipelineEnabled());
         assertFalse(setting.isMetricCollectionEnabled());
         assertFalse(setting.isStaticMetricCollectionEnabled());
+        assertFalse(setting.isAgentTracingFeatureEnabled());
+        assertFalse(setting.isAgentTracingEnabled());
     }
 
     @Test

common/src/test/java/org/opensearch/ml/common/settings/MLFeatureEnabledSettingTests.java

@@ -106,4 +106,8 @@ public void endSpan(Span span) {
     public Tracer getTracer() {
         return tracer;
     }
+
+    static void resetForTest() {
+        instance = null;
+    }
 }