Merge branch 'main' into feature-distributed-ci-image-build

Author: mergify[bot]

.github/workflows/tests.yml

@@ -100,7 +100,7 @@ jobs:
           coverage xml
 
       - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # 5.4.3
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # 5.5.0
         with:
           files: coverage.xml
           fail_ci_if_error: true
@@ -1022,7 +1022,7 @@ jobs:
           - 2181:2181
 
       kafka:
-        image: bitnami/kafka:3.6.1
+        image: bitnamilegacy/kafka:3.3.2
         ports:
           - 8080:8080
           - 8082:8082

.github/workflows/trivy.yml

@@ -61,6 +61,6 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: ${{ github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # 3.29.10
+        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # 3.29.11
         with:
           sarif_file: "trivy-results.sarif"

newrelic/api/web_transaction.py

@@ -665,13 +665,22 @@ def __init__(self, application, environ, source=None):
         self._request_uri = request_uri
 
         if self._request_uri is not None:
-            # Need to make sure we drop off any query string
-            # arguments on the path if we have to fallback
-            # to using the original REQUEST_URI. Can't use
-            # attribute access on result as only support for
-            # Python 2.5+.
-
-            self._request_uri = urlparse.urlparse(self._request_uri)[2]
+            # This try/except logic is to handle cases where
+            # `REQUEST_URI` is malformed or contains invalid
+            # characters.  This can happen at this point if
+            # a malformed request is passed in and for versions
+            # of `urllib` in the Python standard library older
+            # than what has been released Jan 31, 2025.
+            try:
+                # Need to make sure we drop off any query string
+                # arguments on the path if we have to fallback
+                # to using the original REQUEST_URI. Can't use
+                # attribute access on result as only support for
+                # Python 2.5+.
+                self._request_uri = urlparse.urlparse(self._request_uri)[2]
+            except:
+                # If `self._request_uri` is invalid, set to `None`
+                self._request_uri = None
 
         if script_name is not None or path_info is not None:
             if path_info is None:

newrelic/config.py

@@ -215,6 +215,10 @@ def _map_inc_excl_attributes(s):
     return newrelic.core.config._parse_attributes(s)
 
 
+def _map_inc_excl_middleware(s):
+    return newrelic.core.config._parse_attributes(s, middleware=True)
+
+
 def _map_case_insensitive_excl_labels(s):
     return [v.lower() for v in newrelic.core.config._parse_attributes(s)]
 
@@ -510,6 +514,9 @@ def _process_configuration(section):
         section, "instrumentation.kombu.ignored_exchanges", "get", newrelic.core.config.parse_space_separated_into_list
     )
     _process_setting(section, "instrumentation.kombu.consumer.enabled", "getboolean", None)
+    _process_setting(section, "instrumentation.middleware.django.enabled", "getboolean", None)
+    _process_setting(section, "instrumentation.middleware.django.exclude", "get", _map_inc_excl_middleware)
+    _process_setting(section, "instrumentation.middleware.django.include", "get", _map_inc_excl_middleware)
 
 
 # Loading of configuration from specified file and for specified
@@ -2700,6 +2707,10 @@ def _process_module_builtin_defaults():
         "graphene.types.schema", "newrelic.hooks.framework_graphene", "instrument_graphene_types_schema"
     )
 
+    _process_module_definition(
+        "graphene_django.views", "newrelic.hooks.component_graphenedjango", "instrument_graphene_django_views"
+    )
+
     _process_module_definition("graphql.graphql", "newrelic.hooks.framework_graphql", "instrument_graphql")
     _process_module_definition(
         "graphql.execution.execute", "newrelic.hooks.framework_graphql", "instrument_graphql_execute"

newrelic/core/config.py

@@ -320,6 +320,14 @@ class SpanEventAttributesSettings(Settings):
     pass
 
 
+class InstrumentationMiddlewareSettings(Settings):
+    pass
+
+
+class InstrumentationDjangoMiddlewareSettings(Settings):
+    pass
+
+
 class DistributedTracingSettings(Settings):
     pass
 
@@ -507,6 +515,8 @@ class EventHarvestConfigHarvestLimitSettings(Settings):
 _settings.instrumentation.kombu = InstrumentationKombuSettings()
 _settings.instrumentation.kombu.ignored_exchanges = InstrumentationKombuIgnoredExchangesSettings()
 _settings.instrumentation.kombu.consumer = InstrumentationKombuConsumerSettings()
+_settings.instrumentation.middleware = InstrumentationMiddlewareSettings()
+_settings.instrumentation.middleware.django = InstrumentationDjangoMiddlewareSettings()
 _settings.message_tracer = MessageTracerSettings()
 _settings.process_host = ProcessHostSettings()
 _settings.rum = RumSettings()
@@ -634,11 +644,15 @@ def _parse_status_codes(value, target):
     return target
 
 
-def _parse_attributes(s):
+# Called from newrelic.config.py to parse
+# attributes and django middleware lists
+def _parse_attributes(s, middleware=False):
     valid = []
     for item in s.split():
         if "*" not in item[:-1] and len(item.encode("utf-8")) < 256:
             valid.append(item)
+        elif middleware:
+            _logger.warning("Improperly formatted middleware: %r", item)
         else:
             _logger.warning("Improperly formatted attribute: %r", item)
     return valid
@@ -904,6 +918,12 @@ def default_otlp_host(host):
     "NEW_RELIC_INSTRUMENTATION_KOMBU_CONSUMER_ENABLED", default=False
 )
 
+_settings.instrumentation.middleware.django.enabled = _environ_as_bool(
+    "NEW_RELIC_INSTRUMENTATION_DJANGO_MIDDLEWARE_ENABLED", default=True
+)
+_settings.instrumentation.middleware.django.exclude = []
+_settings.instrumentation.middleware.django.include = []
+
 _settings.event_harvest_config.harvest_limits.analytic_event_data = _environ_as_int(
     "NEW_RELIC_ANALYTICS_EVENTS_MAX_SAMPLES_STORED", DEFAULT_RESERVOIR_SIZE
 )

newrelic/hooks/component_graphenedjango.py

@@ -0,0 +1,102 @@
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import functools
+import sys
+from inspect import isawaitable
+
+from newrelic.api.error_trace import ErrorTrace
+from newrelic.api.graphql_trace import GraphQLOperationTrace
+from newrelic.api.transaction import current_transaction
+from newrelic.common.object_names import callable_name
+from newrelic.common.object_wrapper import wrap_function_wrapper
+from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.signature import bind_args
+from newrelic.core.graphql_utils import graphql_statement
+from newrelic.hooks.framework_graphql import GRAPHQL_VERSION, ignore_graphql_duplicate_exception
+
+GRAPHENE_DJANGO_VERSION = get_package_version("graphene_django")
+graphene_django_version_tuple = tuple(map(int, GRAPHENE_DJANGO_VERSION.split(".")))
+
+
+# Implementation from `newrelic.hooks.framework_graphql_py3`
+def nr_coro_execute_graphql_request_wrapper(wrapped, trace, ignore, result):
+    @functools.wraps(wrapped)
+    async def _nr_coro_execute_graphql_request_wrapper():
+        try:
+            with ErrorTrace(ignore=ignore):
+                result_ = await result
+        except:
+            trace.__exit__(*sys.exc_info())
+            raise
+        else:
+            trace.__exit__(None, None, None)
+            return result_
+
+    return _nr_coro_execute_graphql_request_wrapper()
+
+
+def wrap_GraphQLView_execute_graphql_request(wrapped, instance, args, kwargs):
+    transaction = current_transaction()
+
+    if not transaction:
+        return wrapped(*args, **kwargs)
+
+    transaction.add_framework_info(name="GraphQL", version=GRAPHQL_VERSION)
+    transaction.add_framework_info(name="GrapheneDjango", version=GRAPHENE_DJANGO_VERSION)
+    bound_args = bind_args(wrapped, args, kwargs)
+
+    try:
+        schema = instance.schema.graphql_schema
+        query = bound_args.get("query", None)
+    except TypeError:
+        return wrapped(*args, **kwargs)
+
+    transaction.set_transaction_name(callable_name(wrapped), "GraphQL", priority=11)
+
+    trace = GraphQLOperationTrace()
+
+    trace.statement = graphql_statement(query)
+    trace.product = "GrapheneDjango"
+
+    # Handle Schemas created from frameworks
+    if hasattr(schema, "_nr_framework"):
+        framework = schema._nr_framework
+        transaction.add_framework_info(name=framework[0], version=framework[1])
+
+    # Trace must be manually started and stopped to ensure it exists prior to and during the entire duration of the query.
+    # Otherwise subsequent instrumentation will not be able to find an operation trace and will have issues.
+    trace.__enter__()
+    try:
+        with ErrorTrace(ignore=ignore_graphql_duplicate_exception):
+            result = wrapped(*args, **kwargs)
+    except Exception:
+        # Execution finished synchronously, exit immediately.
+        trace.__exit__(*sys.exc_info())
+        raise
+    else:
+        trace.set_transaction_name(priority=14)
+        if isawaitable(result):
+            # Asynchronous implementations
+            # Return a coroutine that handles closing the operation trace
+            return nr_coro_execute_graphql_request_wrapper(wrapped, trace, ignore_graphql_duplicate_exception, result)
+        else:
+            # Execution finished synchronously, exit immediately.
+            trace.__exit__(None, None, None)
+            return result
+
+
+def instrument_graphene_django_views(module):
+    if hasattr(module, "GraphQLView") and hasattr(module.GraphQLView, "execute_graphql_request"):
+        wrap_function_wrapper(module, "GraphQLView.execute_graphql_request", wrap_GraphQLView_execute_graphql_request)