Add global_settings fallback in ES instrumentation (#1454)

* Fallback to global_settings in elasticsearch

* Fallback to global_settings in graphql

* Fixup: ruff lint

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: hmstepanek

newrelic/api/datastore_trace.py

@@ -17,6 +17,7 @@
 from newrelic.api.time_trace import TimeTrace, current_trace
 from newrelic.common.async_wrapper import async_wrapper as get_async_wrapper
 from newrelic.common.object_wrapper import FunctionWrapper, wrap_object
+from newrelic.core.config import global_settings
 from newrelic.core.datastore_node import DatastoreNode
 
 
@@ -86,7 +87,8 @@ def __enter__(self):
             self.port_path_or_id = transaction._intern_string(self.port_path_or_id)
             self.database_name = transaction._intern_string(self.database_name)
 
-            datastore_tracer_settings = transaction.settings.datastore_tracer
+            settings = transaction.settings or global_settings()
+            datastore_tracer_settings = settings.datastore_tracer
             self.instance_reporting_enabled = datastore_tracer_settings.instance_reporting.enabled
             self.database_name_enabled = datastore_tracer_settings.database_name_reporting.enabled
         return result

newrelic/api/graphql_trace.py

@@ -18,6 +18,7 @@
 from newrelic.api.transaction import current_transaction
 from newrelic.common.async_wrapper import async_wrapper as get_async_wrapper
 from newrelic.common.object_wrapper import FunctionWrapper, wrap_object
+from newrelic.core.config import global_settings
 from newrelic.core.graphql_node import GraphQLOperationNode, GraphQLResolverNode
 
 
@@ -49,7 +50,7 @@ def formatted(self):
         transaction = current_transaction(active_only=False)
 
         # Record SQL settings
-        settings = transaction.settings
+        settings = transaction.settings or global_settings()
         tt = settings.transaction_tracer
         self.graphql_format = tt.record_sql
 

newrelic/hooks/datastore_elasticsearch.py

@@ -16,6 +16,7 @@
 from newrelic.api.transaction import current_transaction
 from newrelic.common.object_wrapper import function_wrapper, wrap_function_wrapper
 from newrelic.common.package_version_utils import get_package_version_tuple
+from newrelic.core.config import global_settings
 
 # An index name can be a string, None or a sequence. In the case of None
 # an empty string or '*', it is the same as using '_all'. When a string
@@ -139,7 +140,8 @@ def _nr_wrapper_Elasticsearch_method_(wrapped, instance, args, kwargs):
         with trace:
             result = wrapped(*args, **kwargs)
 
-            tracer_settings = trace.settings.datastore_tracer
+            settings = trace.settings or global_settings()
+            tracer_settings = settings.datastore_tracer
 
             if tracer_settings.instance_reporting.enabled:
                 try:
@@ -182,7 +184,8 @@ async def _nr_wrapper_AsyncElasticsearch_method_(wrapped, instance, args, kwargs
         with trace:
             result = await wrapped(*args, **kwargs)
 
-            tracer_settings = trace.settings.datastore_tracer
+            settings = trace.settings or global_settings()
+            tracer_settings = settings.datastore_tracer
 
             if tracer_settings.instance_reporting.enabled:
                 try:
@@ -783,7 +786,8 @@ def _nr_get_connection_wrapper(wrapped, instance, args, kwargs):
 
     host = port_path_or_id = "unknown"
     try:
-        tracer_settings = trace.settings.datastore_tracer
+        settings = trace.settings or global_settings()
+        tracer_settings = settings.datastore_tracer
 
         if tracer_settings.instance_reporting.enabled:
             host, port_path_or_id = conn._nr_host_port

tests/datastore_elasticsearch/test_async_elasticsearch.py

@@ -20,6 +20,7 @@
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
+from newrelic.api.transaction import current_transaction
 
 # Settings
 
@@ -193,5 +194,24 @@ def test_async_elasticsearch_operation_enabled(async_client, loop):
     loop.run_until_complete(_exercise_es(async_client))
 
 
+@validate_transaction_errors(errors=[])
+@validate_transaction_metrics(
+    "test_async_elasticsearch:test_async_elasticsearch_operation_enabled_empty_transaction_settings",
+    scoped_metrics=_enable_scoped_metrics,
+    rollup_metrics=_enable_rollup_metrics,
+    background_task=True,
+)
+@override_application_settings(_enable_instance_settings)
+@background_task()
+def test_async_elasticsearch_operation_enabled_empty_transaction_settings(async_client, loop):
+    transaction = current_transaction()
+    settings = transaction._settings
+    transaction._settings = None
+
+    loop.run_until_complete(_exercise_es(async_client))
+
+    transaction._settings = settings
+
+
 def test_async_elasticsearch_no_transaction(async_client, loop):
     loop.run_until_complete(_exercise_es(async_client))

tests/datastore_elasticsearch/test_elasticsearch.py

@@ -20,6 +20,7 @@
 from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
 
 from newrelic.api.background_task import background_task
+from newrelic.api.transaction import current_transaction
 
 # Settings
 
@@ -189,5 +190,24 @@ def test_elasticsearch_operation_enabled(client):
     _exercise_es(client)
 
 
+@validate_transaction_errors(errors=[])
+@validate_transaction_metrics(
+    "test_elasticsearch:test_elasticsearch_operation_enabled_empty_transaction_settings",
+    scoped_metrics=_enable_scoped_metrics,
+    rollup_metrics=_enable_rollup_metrics,
+    background_task=True,
+)
+@override_application_settings(_enable_instance_settings)
+@background_task()
+def test_elasticsearch_operation_enabled_empty_transaction_settings(client):
+    transaction = current_transaction()
+    settings = transaction._settings
+    transaction._settings = None
+
+    _exercise_es(client)
+
+    transaction._settings = settings
+
+
 def test_elasticsearch_no_transaction(client):
     _exercise_es(client)

tests/framework_graphql/test_application.py

@@ -22,6 +22,7 @@
 
 from framework_graphql.test_application_async import error_middleware_async, example_middleware_async
 from newrelic.api.background_task import background_task
+from newrelic.api.transaction import current_transaction
 from newrelic.common.object_names import callable_name
 from newrelic.common.package_version_utils import get_package_version
 
@@ -110,6 +111,29 @@ def _test():
     _test()
 
 
+def test_transaction_empty_settings(target_application):
+    framework, version, target_application, is_bg, schema_type, extra_spans = target_application
+
+    @validate_transaction_metrics(
+        "query/<anonymous>/hello",
+        "GraphQL",
+        rollup_metrics=_graphql_base_rollup_metrics(framework, version, True),
+        background_task=True,
+    )
+    @background_task()
+    def _test():
+        transaction = current_transaction()
+        settings = transaction._settings
+        transaction._settings = None
+
+        response = target_application("{ hello }")
+        assert response["hello"] == "Hello!"
+
+        transaction._settings = settings
+
+    _test()
+
+
 @dt_enabled
 def test_query_and_mutation(target_application):
     framework, version, target_application, is_bg, schema_type, extra_spans = target_application