Cache Page import in global and move to django hook

Author: hmstepanek

newrelic/config.py

@@ -2995,10 +2995,7 @@ def _process_module_builtin_defaults():
     _process_module_definition("flask_restx.api", "newrelic.hooks.component_flask_rest", "instrument_flask_rest")
 
     _process_module_definition(
-        "wagtail.models.pages", "newrelic.hooks.framework_wagtail", "instrument_wagtail_models_pages"
-    )
-    _process_module_definition(
-        "wagtail.models.pages". "newrelic.hooks.framework_django", "instrument_wagtail_models_pages"
+        "wagtail.models.pages", "newrelic.hooks.framework_django", "instrument_wagtail_models_pages"
     )
 
     _process_module_definition("graphql_server", "newrelic.hooks.component_graphqlserver", "instrument_graphqlserver")

newrelic/hooks/framework_django.py

@@ -51,6 +51,8 @@
     "false": False,
     "off": False,
 }
+
+global WAGTAIL_PAGE
 WAGTAIL_PAGE = None
 
 
@@ -491,7 +493,8 @@ def wrapper(wrapped, instance, args, kwargs):
         # to override the priority set in other parts of this hook file so that the
         # more explicit name takes precedence.
         new_name = name
-        if WAGTAIL_PAGE and instance and isinstance(instance, Page):
+        global WAGTAIL_PAGE
+        if WAGTAIL_PAGE and instance and isinstance(instance, WAGTAIL_PAGE):
             new_name = f"{callable_name(instance)}.{wrapped.__name__}"
             transaction.set_transaction_name(new_name, priority=6)
         else:
@@ -1224,6 +1227,21 @@ def _bind_params(original_middleware, *args, **kwargs):
         return _nr_wrap_converted_middleware_(converted_middleware, name)
 
 
+def _nr_wrapper_route_for_request(wrapped, instance, args, kwargs):
+    transaction = current_transaction()
+
+    if not transaction:
+        return wrapped(*args, **kwargs)
+
+    route_result = wrapped(*args, **kwargs)
+    if route_result:
+        page, args, kwargs = route_result
+        name = callable_name(page.route)
+        transaction.set_transaction_name(name, priority=6)
+
+    return route_result
+
+
 def instrument_django_core_handlers_exception(module):
     if hasattr(module, "convert_exception_to_response"):
         wrap_function_wrapper(module, "convert_exception_to_response", _nr_wrapper_convert_exception_to_response_)
@@ -1242,6 +1260,10 @@ def instrument_django_core_handlers_asgi(module):
 
         wrap_asgi_application(module, "ASGIHandler.__call__", framework=framework)
 
+
 def instrument_wagtail_models_pages(module):
-    if hasattr(module, "Page")
+    if hasattr(module, "Page"):
+        global WAGTAIL_PAGE
         WAGTAIL_PAGE = module.Page
+        if hasattr(module.Page, "route_for_request"):
+            wrap_function_wrapper(module, "Page.route_for_request", _nr_wrapper_route_for_request)