Add logging supportability metrics (#554)

* Add logging supportability metrics

Co-authored-by: Lalleh Rafeei [email protected]
Co-authored-by: Uma Annamalai [email protected]
Co-authored-by: Tim Pansino [email protected]

* Unit test adjustments

Co-authored-by: Tim Pansino <[email protected]>

Author: lrafeei

newrelic/core/application.py

@@ -537,6 +537,14 @@ def connect_to_data_collector(self, activate_agent):
             )
             internal_metric("Supportability/Python/Application/Registration/Attempts", connect_attempts)
 
+            # Logging feature toggle supportability metrics
+            application_logging_metrics = configuration.application_logging.enabled and configuration.application_logging.metrics.enabled
+            application_logging_forwarding = configuration.application_logging.enabled and configuration.application_logging.forwarding.enabled
+            application_logging_local_decorating = configuration.application_logging.enabled and configuration.application_logging.local_decorating.enabled
+            internal_metric("Supportability/Logging/Forwarding/Python/%s" % ("enabled" if application_logging_forwarding else "disabled"), 1)
+            internal_metric("Supportability/Logging/LocalDecorating/Python/%s" % ("enabled" if application_logging_local_decorating else "disabled"), 1)
+            internal_metric("Supportability/Logging/Metrics/Python/%s" % ("enabled" if application_logging_metrics else "disabled"), 1)
+
         self._stats_engine.merge_custom_metrics(internal_metrics.metrics())
 
         # Update the active session in this object. This will the

tests/agent_unittests/test_agent_connect.py

@@ -12,12 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import pytest
 from newrelic.core.application import Application
 from newrelic.core.config import global_settings
 from newrelic.network.exceptions import ForceAgentDisconnect
 
-from testing_support.fixtures import (override_generic_settings,
-        failing_endpoint)
+from testing_support.fixtures import (
+    override_generic_settings,
+    validate_internal_metrics,
+    failing_endpoint
+)
+
 
 
 SETTINGS = global_settings()
@@ -34,3 +39,38 @@ def test_http_gone_stops_connect():
     # The agent must not reattempt a connection after a ForceAgentDisconnect.
     # If it does, we'll end up with a session here.
     assert not app._active_session
+
+
+_logging_settings_matrix = [
+    (True, True),
+    (True, False),
+    (False, True),
+    (False, False),
+]
+
+
+@override_generic_settings(SETTINGS, {
+    'developer_mode': True,
+})
+@pytest.mark.parametrize("feature_setting,subfeature_setting", _logging_settings_matrix)
+def test_logging_connect_supportability_metrics(feature_setting, subfeature_setting):
+    metric_value = "enabled" if feature_setting and subfeature_setting else "disabled"
+
+    @override_generic_settings(SETTINGS, {
+        "application_logging.enabled": feature_setting,
+        "application_logging.forwarding.enabled": subfeature_setting,
+        "application_logging.metrics.enabled": subfeature_setting,
+        "application_logging.local_decorating.enabled": subfeature_setting,
+    })
+    @validate_internal_metrics([
+        ("Supportability/Logging/Forwarding/Python/%s" % metric_value, 1),
+        ("Supportability/Logging/LocalDecorating/Python/%s" % metric_value, 1),
+        ("Supportability/Logging/Metrics/Python/%s" % metric_value, 1),
+    ])
+    def test():
+        app = Application('Python Agent Test (agent_unittests-connect)')
+        app.connect_to_data_collector(None)
+
+        assert app._active_session
+    
+    test()

tests/testing_support/fixtures.py

@@ -597,8 +597,14 @@ def _capture_transaction_metrics(wrapped, instance, args, kwargs):
 def validate_internal_metrics(metrics=None):
     metrics = metrics or []
 
+    def no_op(wrapped, instance, args, kwargs):
+        pass
+
     @function_wrapper
     def _validate_wrapper(wrapped, instance, args, kwargs):
+        # Apply no-op wrappers to prevent new internal trace contexts from being started, preventing capture
+        wrapped = transient_function_wrapper("newrelic.core.internal_metrics", "InternalTraceContext.__enter__")(no_op)(wrapped)
+        wrapped = transient_function_wrapper("newrelic.core.internal_metrics", "InternalTraceContext.__exit__")(no_op)(wrapped)
 
         captured_metrics = CustomMetrics()
         with InternalTraceContext(captured_metrics):