Disable Sending of ML Events by Default (#923)

* Disable sending of ML events by default. * Override settings for ML event testing. * Update scikit-learn tests with settings overrides. * Update all scikitlearn tests with enabled settings override. * Revert Update all scikitlearn tests with enabled settings override. * Formatting.
newrelic · Sep 20, 2023 · 3465cdd · 3465cdd
1 parent 86f0df8
commit 3465cdd
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/newrelic/core/config.py b/newrelic/core/config.py
@@ -717,7 +717,7 @@ def default_otlp_host(host):
 _settings.transaction_events.attributes.include = []
 
 _settings.custom_insights_events.enabled = True
-_settings.ml_insights_events.enabled = True
+_settings.ml_insights_events.enabled = False
 
 _settings.distributed_tracing.enabled = _environ_as_bool("NEW_RELIC_DISTRIBUTED_TRACING_ENABLED", default=True)
 _settings.distributed_tracing.exclude_newrelic_header = False
@@ -894,7 +894,7 @@ def default_otlp_host(host):
 _settings.application_logging.local_decorating.enabled = _environ_as_bool(
     "NEW_RELIC_APPLICATION_LOGGING_LOCAL_DECORATING_ENABLED", default=False
 )
-_settings.machine_learning.enabled = _environ_as_bool("NEW_RELIC_MACHINE_LEARNING_ENABLED", default=True)
+_settings.machine_learning.enabled = _environ_as_bool("NEW_RELIC_MACHINE_LEARNING_ENABLED", default=False)
 _settings.machine_learning.inference_events_value.enabled = _environ_as_bool(
     "NEW_RELIC_MACHINE_LEARNING_INFERENCE_EVENT_VALUE_ENABLED", default=True
 )

diff --git a/tests/agent_features/conftest.py b/tests/agent_features/conftest.py
@@ -30,6 +30,7 @@
     "debug.record_transaction_failure": True,
     "debug.log_autorum_middleware": True,
     "agent_limits.errors_per_harvest": 100,
+    "ml_insights_events.enabled": True
 }
 
 collector_agent_registration = collector_agent_registration_fixture(

diff --git a/tests/agent_features/test_ml_events.py b/tests/agent_features/test_ml_events.py
@@ -151,12 +151,11 @@ def test_record_ml_event_outside_transaction_params_not_a_dict():
 
 # Tests for ML Events configuration settings
 
-
 @override_application_settings({"ml_insights_events.enabled": False})
 @reset_core_stats_engine()
 @validate_ml_event_count(count=0)
 @background_task()
-def test_ml_event_settings_check_ml_insights_enabled():
+def test_ml_event_settings_check_ml_insights_disabled():
     record_ml_event("FooEvent", {"foo": "bar"})
 
 

diff --git a/tests/mlmodel_sklearn/conftest.py b/tests/mlmodel_sklearn/conftest.py
@@ -23,6 +23,9 @@
     "transaction_tracer.stack_trace_threshold": 0.0,
     "debug.log_data_collector_payloads": True,
     "debug.record_transaction_failure": True,
+    "machine_learning.enabled": True,
+    "machine_learning.inference_events_value.enabled": True,
+    "ml_insights_events.enabled": True
 }
 collector_agent_registration = collector_agent_registration_fixture(
     app_name="Python Agent Test (mlmodel_sklearn)",

diff --git a/tests/mlmodel_sklearn/test_ensemble_models.py b/tests/mlmodel_sklearn/test_ensemble_models.py
@@ -197,6 +197,7 @@ def _test():
     _test()
 
 
+
 @pytest.mark.skipif(SKLEARN_VERSION < (1, 1, 0), reason="Requires sklearn >= 1.1")
 @pytest.mark.parametrize(
     "ensemble_model_name",

diff --git a/tests/mlmodel_sklearn/test_inference_events.py b/tests/mlmodel_sklearn/test_inference_events.py
@@ -20,6 +20,7 @@
     override_application_settings,
     reset_core_stats_engine,
 )
+from testing_support.fixtures import override_application_settings
 from testing_support.validators.validate_ml_event_count import validate_ml_event_count
 from testing_support.validators.validate_ml_events import validate_ml_events
 
@@ -284,8 +285,15 @@ def _test():
 ]
 
 
+disabled_inference_value_settings = {
+    "machine_learning.enabled": True,
+    "machine_learning.inference_events_value.enabled": False,
+    "ml_insights_events.enabled": True
+}
+
+
+@override_application_settings(disabled_inference_value_settings)
 @reset_core_stats_engine()
-@override_application_settings({"machine_learning.inference_events_value.enabled": False})
 def test_does_not_include_value_when_inference_event_value_enabled_is_false():
     @validate_ml_events(numpy_str_recorded_custom_events_no_value)
     @validate_ml_event_count(count=1)
@@ -306,8 +314,15 @@ def _test():
     _test()
 
 
+disabled_ml_insights_settings = {
+    "machine_learning.enabled": True,
+    "machine_learning.inference_events_value.enabled": True,
+    "ml_insights_events.enabled": False
+}
+
+
+@override_application_settings(disabled_ml_insights_settings)
 @reset_core_stats_engine()
-@override_application_settings({"ml_insights_events.enabled": False})
 def test_does_not_include_events_when_ml_insights_events_enabled_is_false():
     """
     Verifies that all ml events can be disabled by setting
@@ -332,8 +347,15 @@ def _test():
     _test()
 
 
+disabled_ml_settings = {
+    "machine_learning.enabled": False,
+    "machine_learning.inference_events_value.enabled": True,
+    "ml_insights_events.enabled": True
+}
+
+
+@override_application_settings(disabled_ml_settings)
 @reset_core_stats_engine()
-@override_application_settings({"machine_learning.enabled": False})
 def test_does_not_include_events_when_machine_learning_enabled_is_false():
     @validate_ml_event_count(count=0)
     @background_task()