Merge branch 'main' into fix-verison-check

Author: mergify[bot]

newrelic/config.py

@@ -2886,6 +2886,12 @@ def _process_module_builtin_defaults():
         "instrument_graphql_validate",
     )
 
+    _process_module_definition(
+        "graphql.type.schema",
+        "newrelic.hooks.framework_graphql",
+        "instrument_graphql_schema_get_field",
+    )
+
     _process_module_definition(
         "google.cloud.firestore_v1.base_client",
         "newrelic.hooks.datastore_firestore",

newrelic/hooks/framework_graphql.py

@@ -89,10 +89,6 @@ def wrap_executor_context_init(wrapped, instance, args, kwargs):
     return result
 
 
-def bind_operation_v3(operation, root_value):
-    return operation
-
-
 def wrap_execute_operation(wrapped, instance, args, kwargs):
     transaction = current_transaction()
     trace = current_trace()
@@ -106,13 +102,14 @@ def wrap_execute_operation(wrapped, instance, args, kwargs):
         )
         return wrapped(*args, **kwargs)
 
+    execution_context = instance
+
     try:
-        operation = bind_operation_v3(*args, **kwargs)
-    except TypeError:
+        # Works for both v3.2 and v3.3+
+        operation = execution_context.operation
+    except (TypeError, AttributeError):
         return wrapped(*args, **kwargs)
 
-    execution_context = instance
-
     trace.operation_name = get_node_value(operation, "name") or "<anonymous>"
 
     trace.operation_type = get_node_value(operation, "operation", "name").lower() or "<unknown>"
@@ -270,6 +267,7 @@ def wrap_get_field_resolver(wrapped, instance, args, kwargs):
 
 
 def wrap_get_field_def(wrapped, instance, args, kwargs):
+    """In v3.3+ this is called `get_field` and it is called from schema itself"""
     result = wrapped(*args, **kwargs)
 
     if hasattr(result, "resolve"):
@@ -353,24 +351,24 @@ def wrap_parse(wrapped, instance, args, kwargs):
         return wrapped(*args, **kwargs)
 
 
-def bind_resolve_field_v3(parent_type, source, field_nodes, path):
+def bind_resolve_field(parent_type, source, field_nodes, path, *args, **kwargs):
+    """This is called execute_field in GraphQL-core v3.3+"""
     return parent_type, field_nodes, path
 
 
 def wrap_resolve_field(wrapped, instance, args, kwargs):
+    """This is called execute_field in GraphQL-core v3.3+"""
     transaction = current_transaction()
     if transaction is None:
         return wrapped(*args, **kwargs)
 
-    bind_resolve_field = bind_resolve_field_v3
-
     try:
         parent_type, field_asts, field_path = bind_resolve_field(*args, **kwargs)
     except TypeError:
         return wrapped(*args, **kwargs)
 
     field_name = field_asts[0].name.value
-    field_def = parent_type.fields.get(field_name)
+    field_def = parent_type.fields.get(field_name, None)
     field_return_type = str(field_def.type) if field_def else "<unknown>"
     if isinstance(field_path, list):
         field_path = field_path[0]
@@ -470,6 +468,11 @@ def wrap_graphql_impl(wrapped, instance, args, kwargs):
             return result
 
 
+def instrument_graphql_schema_get_field(module):
+    if hasattr(module, "GraphQLSchema") and hasattr(module.GraphQLSchema, "get_field"):
+        wrap_function_wrapper(module, "GraphQLSchema.get_field", wrap_get_field_def)
+
+
 def instrument_graphql_execute(module):
     if hasattr(module, "get_field_def"):
         wrap_function_wrapper(module, "get_field_def", wrap_get_field_def)

tests/framework_graphql/test_application.py

@@ -36,9 +36,9 @@
 from newrelic.common.object_names import callable_name
 from newrelic.common.package_version_utils import get_package_version
 
-
 graphql_version = get_package_version("graphql-core")
 
+
 def conditional_decorator(decorator, condition):
     def _conditional_decorator(func):
         if not condition:
@@ -150,7 +150,6 @@ def test_query_and_mutation(target_application):
         ("GraphQL/resolve/%s/storage" % framework, 1),
         ("GraphQL/operation/%s/query/<anonymous>/storage" % framework, 1),
     ]
-
     _expected_mutation_operation_attributes = {
         "graphql.operation.type": "mutation",
         "graphql.operation.name": "<anonymous>",

tox.ini

@@ -132,9 +132,8 @@ envlist =
     python-framework_flask-{py38,py39,py310,py311,py312,pypy310}-flask{020205,latest,master},
     python-framework_graphene-{py37,py38,py39,py310,py311,py312}-graphenelatest,
     python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy310}-graphql03,
-    ; temporarily disabling graphqlmaster tests
-    python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy310}-graphqllatest,
-    python-framework_graphql-py37-graphql{0300,0301,0302},
+    python-framework_graphql-{py37,py38,py39,py310,py311,py312,pypy310}-graphql{latest,master},
+    python-framework_graphql-py37-graphql{0301,0302},
     python-framework_pyramid-{py37,py38,py39,py310,py311,py312,pypy310}-Pyramidlatest,
     python-framework_pyramid-{py37,py38,py39,py310,py311,py312,pypy310}-Pyramid0110-cornice,
     python-framework_sanic-{py37,py38,py39,py310,py311,py312,pypy310}-saniclatest,
@@ -323,7 +322,6 @@ deps =
     framework_graphene-graphenelatest: graphene
     framework_graphql-graphqllatest: graphql-core
     framework_graphql-graphql03: graphql-core<4
-    framework_graphql-graphql0300: graphql-core<3.1
     framework_graphql-graphql0301: graphql-core<3.2
     framework_graphql-graphql0302: graphql-core<3.3
     framework_graphql-graphqlmaster: https://github.com/graphql-python/graphql-core/archive/main.zip