Conditional settings logic for instrumentation

Author: lrafeei

newrelic/hooks/hybridagent_opentelemetry.py

@@ -20,6 +20,7 @@
 from newrelic.api.transaction import Sentinel, current_transaction
 from newrelic.common.object_wrapper import wrap_function_wrapper
 from newrelic.common.signature import bind_args
+from newrelic.core.config import global_settings
 
 _logger = logging.getLogger(__name__)
 _TRACER_PROVIDER = None
@@ -34,6 +35,11 @@
 
 
 def wrap_set_tracer_provider(wrapped, instance, args, kwargs):
+    settings = global_settings()
+    
+    if not settings.otel_bridge.enabled:
+        return wrapped(*args, **kwargs)
+
     global _TRACER_PROVIDER
     bound_args = bind_args(wrapped, args, kwargs)
     tracer_provider = bound_args.get("tracer_provider", None)
@@ -44,6 +50,11 @@ def wrap_set_tracer_provider(wrapped, instance, args, kwargs):
 
 
 def wrap_get_tracer_provider(wrapped, instance, args, kwargs):
+    settings = global_settings()
+    
+    if not settings.otel_bridge.enabled:
+        return wrapped(*args, **kwargs)
+
     from newrelic.api.opentelemetry import TracerProvider
 
     # This needs to act as a singleton, like the agent instance.
@@ -70,6 +81,13 @@ def wrap_get_current_span(wrapped, instance, args, kwargs):
     if not transaction or isinstance(trace, Sentinel):
         return wrapped(*args, **kwargs)
 
+    # Do not allow the wrapper to continue if
+    # the Hybrid Agent setting is not enabled
+    settings = transaction.settings or global_settings()
+    
+    if not settings.otel_bridge.enabled:
+        return wrapped(*args, **kwargs)
+    
     # If a NR trace does exist, check to see if the current
     # OTel span corresponds to the current NR trace.  If so,
     # return the original function's result.
@@ -119,6 +137,13 @@ def wrap_start_internal_or_server_span(wrapped, instance, args, kwargs):
     # and put that into the attributes.  Keep the original
     # context_carrier intact.
 
+    # Do not allow the wrapper to continue if
+    # the Hybrid Agent setting is not enabled
+    settings = global_settings()
+    
+    if not settings.otel_bridge.enabled:
+        return wrapped(*args, **kwargs)
+    
     bound_args = bind_args(wrapped, args, kwargs)
     context_carrier = bound_args.get("context_carrier", None)
     attributes = bound_args.get("attributes", {})

tests/hybridagent_opentelemetry/conftest.py

@@ -24,6 +24,7 @@
     "transaction_tracer.stack_trace_threshold": 0.0,
     "debug.log_data_collector_payloads": True,
     "debug.record_transaction_failure": True,
+    "otel_bridge.enabled": True,
 }
 
 collector_agent_registration = collector_agent_registration_fixture(