Add support for GraphQL v3.2 (#463)

* Add support for GraphQL v3.2

Co-authored-by: Lalleh Rafeei <[email protected]>
Co-authored-by: Uma Annamalai <[email protected]>

* Improve coverage fixture to output htmlcov and xml

* Disable failing tornado tests

Co-authored-by: Lalleh Rafeei <[email protected]>
Co-authored-by: Uma Annamalai <[email protected]>

Author: 3 people

newrelic/hooks/framework_graphql.py

@@ -460,8 +460,12 @@ def instrument_graphql_execute(module):
         wrap_function_wrapper(module, "get_field_def", wrap_get_field_def)
     if hasattr(module, "ExecutionContext"):
         wrap_function_wrapper(module, "ExecutionContext.__init__", wrap_executor_context_init)
+
         if hasattr(module.ExecutionContext, "resolve_field"):
             wrap_function_wrapper(module, "ExecutionContext.resolve_field", wrap_resolve_field)
+        elif hasattr(module.ExecutionContext, "execute_field"):
+            wrap_function_wrapper(module, "ExecutionContext.execute_field", wrap_resolve_field)
+
         if hasattr(module.ExecutionContext, "execute_operation"):
             wrap_function_wrapper(module, "ExecutionContext.execute_operation", wrap_execute_operation)
 

tests/testing_support/fixtures.py

@@ -2416,29 +2416,34 @@ def _override_ignore_status_codes(wrapped, instance, args, kwargs):
     return _override_ignore_status_codes
 
 
-def code_coverage_fixture(source=None):
-    source = source if source is not None else ["newrelic"]
-
-    @pytest.fixture(scope="session")
+def code_coverage_fixture(source=['newrelic']):
+    @pytest.fixture(scope='session')
     def _code_coverage_fixture(request):
         if not source:
             return
 
-        if os.environ.get("GITHUB_ACTIONS") is not None:
+        if os.environ.get('GITHUB_ACTIONS') is not None:
             return
 
         from coverage import coverage
 
-        coverage_directory = os.environ.get("TOX_ENVDIR", "htmlcov")
-        coverage_suffix = os.environ.get("TOX_ENV_NAME", None)
+        env_directory = os.environ.get('TOX_ENVDIR', None)
+
+        if env_directory is not None:
+            coverage_directory = os.path.join(env_directory, 'htmlcov')
+            xml_report = os.path.join(env_directory, 'coverage.xml')
+        else:
+            coverage_directory = 'htmlcov'
+            xml_report = 'coverage.xml'
 
         def finalize():
             cov.stop()
             cov.html_report(directory=coverage_directory)
+            cov.xml_report(outfile=xml_report)
 
         request.addfinalizer(finalize)
 
-        cov = coverage(source=source, branch=True, data_suffix=coverage_suffix)
+        cov = coverage(source=source, branch=True)
         cov.start()
 
     return _code_coverage_fixture

tox.ini

@@ -122,10 +122,9 @@ envlist =
     python-framework_graphene-{py36,py37,py38,py39,py310}-graphenelatest,
     python-framework_graphene-{py27,py36,py37,py38,py39,pypy,pypy3}-graphene{0200,0201},
     python-framework_graphene-py310-graphene0201,
-    python-framework_graphql-{py27,py36,py37,py38,py39,py310,pypy,pypy3}-graphql02,
-    python-framework_graphql-{py36,py37,py38,py39,py310,pypy3}-graphql03,
-    ;temporarily disabling tests on graphql master
-    python-framework_graphql-py37-graphql{0202,0203,0300,0301},
+    python-framework_graphql-{py27,py36,py37,py38,py39,py310,pypy,pypy36}-graphql02,
+    python-framework_graphql-{py36,py37,py38,py39,py310,pypy36}-graphql03,
+    python-framework_graphql-py37-graphql{0202,0203,0300,0301,0302,master},
     grpc-framework_grpc-{py27,py36}-grpc0125,
     grpc-framework_grpc-{py36,py37,py38,py39,py310}-grpclatest,
     python-framework_pyramid-{pypy,py27,py38}-Pyramid0104,
@@ -137,7 +136,8 @@ envlist =
     python-framework_starlette-{py36,py37,py38,py39,py310,pypy3}-starlette{latest},
     python-framework_strawberry-{py37,py38,py39,py310}-strawberrylatest,
     libcurl-framework_tornado-{py36,py37,py38,py39,py310,pypy3}-tornado0600,
-    libcurl-framework_tornado-{py36,py37,py38,py39,py310,pypy3}-tornadomaster,
+    ; Temp disable until other PR
+    ; libcurl-framework_tornado-{py36,py37,py38,py39,py310,pypy3}-tornadomaster,
     rabbitmq-messagebroker_pika-{py27,py36,py37,py38,py39,pypy,pypy3}-pika0.13,
     rabbitmq-messagebroker_pika-{py27,py36,py37,py38,py39,py310,pypy,pypy3}-pikalatest,
     python-template_mako-{py27,py36,py37,py38,py39,py310}
@@ -277,6 +277,7 @@ deps =
     framework_graphql-graphql0203: graphql-core<2.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
     framework_grpc-grpc0125: grpcio<1.26
     framework_grpc-grpc0125: grpcio-tools<1.26