Merge main branch into develop-hybrid-core-tracing

.github/.trivyignore

@@ -6,6 +6,7 @@
 CVE-2025-50181  # Requires misconfiguration of urllib3, which agent does not do without intervention
 CVE-2025-66418  # Malicious servers could cause high resource consumption
 CVE-2025-66471  # Malicious servers could cause high resource consumption
+CVE-2026-21441  # Improper Handling of Highly Compressed Data (Data Amplification)
 
 # =======================
 # Ignored Vulnerabilities

.github/workflows/mega-linter.yml

@@ -53,7 +53,7 @@ jobs:
       # MegaLinter
       - name: MegaLinter
         id: ml
-        uses: oxsecurity/megalinter/flavors/python@55a59b24a441e0e1943080d4a512d827710d4a9d # 9.2.0
+        uses: oxsecurity/megalinter/flavors/python@42bb470545e359597e7f12156947c436e4e3fb9a # 9.3.0
         env:
           # All available variables are described in documentation
           # https://megalinter.io/latest/configuration/

.github/workflows/tests.yml

@@ -301,7 +301,7 @@ jobs:
           git fetch --tags origin
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # 7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # 7.2.0
 
       - name: Install Python
         run: |
@@ -370,7 +370,7 @@ jobs:
           git fetch --tags origin
 
       - name: Install uv
-        uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # 7.1.6
+        uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # 7.2.0
 
       - name: Install Python
         run: |

.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@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # 4.31.9
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # 4.31.10
         with:
           sarif_file: "trivy-results.sarif"

newrelic/api/time_trace.py

@@ -362,15 +362,19 @@ def _observe_exception(self, exc_info=None, ignore=None, expected=None, status_c
     def notice_error(self, error=None, attributes=None, expected=None, ignore=None, status_code=None):
         attributes = attributes if attributes is not None else {}
 
-        # If no exception details provided, use current exception.
+        # If an exception instance is passed, attempt to unpack it into an exception tuple with traceback
+        if isinstance(error, BaseException):
+            error = (type(error), error, getattr(error, "__traceback__", None))
 
-        # Pull from sys.exc_info if no exception is passed
-        if not error or None in error:
+        # Use current exception from sys.exc_info() if no exception was passed,
+        # or if the exception tuple is missing components like the traceback
+        if not error or (isinstance(error, (tuple, list)) and None in error):
             error = sys.exc_info()
 
-            # If no exception to report, exit
-            if not error or None in error:
-                return
+        # Error should be a tuple or list of 3 elements by this point.
+        # If it's falsey or missing a component like the traceback, quietly exit early.
+        if not isinstance(error, (tuple, list)) or len(error) != 3 or None in error:
+            return
 
         exc, value, tb = error
 

newrelic/common/llm_utils.py

@@ -12,13 +12,97 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import itertools
+import logging
+
+from newrelic.api.transaction import current_transaction
+from newrelic.common.object_wrapper import ObjectProxy
+
+_logger = logging.getLogger(__name__)
+
 
 def _get_llm_metadata(transaction):
-    # Grab LLM-related custom attributes off of the transaction to store as metadata on LLM events
-    custom_attrs_dict = transaction._custom_params
-    llm_metadata_dict = {key: value for key, value in custom_attrs_dict.items() if key.startswith("llm.")}
-    llm_context_attrs = getattr(transaction, "_llm_context_attrs", None)
-    if llm_context_attrs:
-        llm_metadata_dict.update(llm_context_attrs)
+    if not transaction:
+        return {}
+    try:
+        # Grab LLM-related custom attributes off of the transaction to store as metadata on LLM events
+        custom_attrs_dict = getattr(transaction, "_custom_params", {})
+        llm_metadata_dict = {key: value for key, value in custom_attrs_dict.items() if key.startswith("llm.")}
+        llm_context_attrs = getattr(transaction, "_llm_context_attrs", None)
+        if llm_context_attrs:
+            llm_metadata_dict.update(llm_context_attrs)
+    except Exception:
+        _logger.warning("Unable to capture custom metadata attributes to record on LLM events.")
+        return {}
 
     return llm_metadata_dict
+
+
+class GeneratorProxy(ObjectProxy):
+    def __init__(self, wrapped, on_stop_iteration, on_error):
+        super().__init__(wrapped)
+        self._nr_on_stop_iteration = on_stop_iteration
+        self._nr_on_error = on_error
+
+    def __iter__(self):
+        self._nr_wrapped_iter = self.__wrapped__.__iter__()
+        return self
+
+    def __next__(self):
+        transaction = current_transaction()
+        if not transaction:
+            return self._nr_wrapped_iter.__next__()
+
+        return_val = None
+        try:
+            return_val = self._nr_wrapped_iter.__next__()
+        except StopIteration:
+            self._nr_on_stop_iteration(self, transaction)
+            raise
+        except Exception:
+            self._nr_on_error(self, transaction)
+            raise
+        return return_val
+
+    def close(self):
+        return self.__wrapped__.close()
+
+    def __copy__(self):
+        # Required to properly interface with itertool.tee, which can be called by LangChain on generators
+        self.__wrapped__, copy = itertools.tee(self.__wrapped__, 2)
+        return GeneratorProxy(copy, self._nr_on_stop_iteration, self._nr_on_error)
+
+
+class AsyncGeneratorProxy(ObjectProxy):
+    def __init__(self, wrapped, on_stop_iteration, on_error):
+        super().__init__(wrapped)
+        self._nr_on_stop_iteration = on_stop_iteration
+        self._nr_on_error = on_error
+
+    def __aiter__(self):
+        self._nr_wrapped_iter = self.__wrapped__.__aiter__()
+        return self
+
+    async def __anext__(self):
+        transaction = current_transaction()
+        if not transaction:
+            return await self._nr_wrapped_iter.__anext__()
+
+        return_val = None
+        try:
+            return_val = await self._nr_wrapped_iter.__anext__()
+        except StopAsyncIteration:
+            self._nr_on_stop_iteration(self, transaction)
+            raise
+        except Exception:
+            self._nr_on_error(self, transaction)
+            raise
+        return return_val
+
+    async def aclose(self):
+        return await self.__wrapped__.aclose()
+
+    def __copy__(self):
+        # Required to properly interface with itertool.tee, which can be called by LangChain on generators
+        self.__wrapped__, copy = itertools.tee(self.__wrapped__, n=2)
+        return AsyncGeneratorProxy(copy, self._nr_on_stop_iteration, self._nr_on_error)

newrelic/common/utilization.py

@@ -233,21 +233,29 @@ class AzureFunctionUtilization(CommonUtilization):
     HEADERS = {"Metadata": "true"}  # noqa: RUF012
     VENDOR_NAME = "azurefunction"
 
-    @staticmethod
-    def fetch():
+    @classmethod
+    def fetch(cls):
         cloud_region = os.environ.get("REGION_NAME")
         website_owner_name = os.environ.get("WEBSITE_OWNER_NAME")
         azure_function_app_name = os.environ.get("WEBSITE_SITE_NAME")
 
         if all((cloud_region, website_owner_name, azure_function_app_name)):
-            if website_owner_name.endswith("-Linux"):
-                resource_group_name = AZURE_RESOURCE_GROUP_NAME_RE.search(website_owner_name).group(1)
-            else:
-                resource_group_name = AZURE_RESOURCE_GROUP_NAME_PARTIAL_RE.search(website_owner_name).group(1)
-            subscription_id = re.search(r"(?:(?!\+).)*", website_owner_name).group(0)
-            faas_app_name = f"/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}/providers/Microsoft.Web/sites/{azure_function_app_name}"
-            # Only send if all values are present
-            return (faas_app_name, cloud_region)
+            try:
+                if website_owner_name.endswith("-Linux"):
+                    resource_group_name = AZURE_RESOURCE_GROUP_NAME_RE.search(website_owner_name).group(1)
+                else:
+                    resource_group_name = AZURE_RESOURCE_GROUP_NAME_PARTIAL_RE.search(website_owner_name).group(1)
+                subscription_id = re.search(r"(?:(?!\+).)*", website_owner_name).group(0)
+                faas_app_name = f"/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}/providers/Microsoft.Web/sites/{azure_function_app_name}"
+                # Only send if all values are present
+                return (faas_app_name, cloud_region)
+            except Exception:
+                _logger.debug(
+                    "Unable to determine Azure Functions subscription id from WEBSITE_OWNER_NAME. %r",
+                    website_owner_name,
+                )
+
+        return None
 
     @classmethod
     def get_values(cls, response):

newrelic/config.py

@@ -2088,6 +2088,10 @@ def _process_module_builtin_defaults():
 
     _process_module_definition("asyncio.runners", "newrelic.hooks.coroutines_asyncio", "instrument_asyncio_runners")
 
+    _process_module_definition(
+        "langgraph.prebuilt.tool_node", "newrelic.hooks.mlmodel_langgraph", "instrument_langgraph_prebuilt_tool_node"
+    )
+
     _process_module_definition(
         "langchain_core.runnables.base",
         "newrelic.hooks.mlmodel_langchain",
@@ -2099,13 +2103,19 @@ def _process_module_builtin_defaults():
         "instrument_langchain_core_runnables_config",
     )
     _process_module_definition(
-        "langchain.chains.base", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_chains_base"
+        "langchain_core.tools.structured",
+        "newrelic.hooks.mlmodel_langchain",
+        "instrument_langchain_core_tools_structured",
     )
+
     _process_module_definition(
-        "langchain_classic.chains.base", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_chains_base"
+        "langchain.agents.factory", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_agents_factory"
+    )
+    _process_module_definition(
+        "langchain.chains.base", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_chains_base"
     )
     _process_module_definition(
-        "langchain_core.callbacks.manager", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_callbacks_manager"
+        "langchain_classic.chains.base", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_chains_base"
     )
 
     # VectorStores with similarity_search method
@@ -2671,10 +2681,6 @@ def _process_module_builtin_defaults():
         "langchain_core.tools", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_core_tools"
     )
 
-    _process_module_definition(
-        "langchain_core.callbacks.manager", "newrelic.hooks.mlmodel_langchain", "instrument_langchain_callbacks_manager"
-    )
-
     _process_module_definition("asgiref.sync", "newrelic.hooks.adapter_asgiref", "instrument_asgiref_sync")
 
     _process_module_definition(
@@ -2957,6 +2963,9 @@ def _process_module_builtin_defaults():
     _process_module_definition(
         "strands.multiagent.swarm", "newrelic.hooks.mlmodel_strands", "instrument_strands_multiagent_swarm"
     )
+    _process_module_definition(
+        "strands.tools.decorator", "newrelic.hooks.mlmodel_strands", "instrument_strands_tools_decorator"
+    )
     _process_module_definition(
         "strands.tools.executors._executor",
         "newrelic.hooks.mlmodel_strands",

newrelic/core/stats_engine.py

@@ -678,7 +678,6 @@ def record_time_metrics(self, metrics):
     def notice_error(self, error=None, attributes=None, expected=None, ignore=None, status_code=None):
         attributes = attributes if attributes is not None else {}
         settings = self.__settings
-
         if not settings:
             return
 
@@ -690,13 +689,19 @@ def notice_error(self, error=None, attributes=None, expected=None, ignore=None,
         if not settings.collect_errors and not settings.collect_error_events:
             return
 
-        # Pull from sys.exc_info if no exception is passed
-        if not error or None in error:
+        # If an exception instance is passed, attempt to unpack it into an exception tuple with traceback
+        if isinstance(error, BaseException):
+            error = (type(error), error, getattr(error, "__traceback__", None))
+
+        # Use current exception from sys.exc_info() if no exception was passed,
+        # or if the exception tuple is missing components like the traceback
+        if not error or (isinstance(error, (tuple, list)) and None in error):
             error = sys.exc_info()
 
-            # If no exception to report, exit
-            if not error or None in error:
-                return
+        # Error should be a tuple or list of 3 elements by this point.
+        # If it's falsey or missing a component like the traceback, quietly exit early.
+        if not isinstance(error, (tuple, list)) or len(error) != 3 or None in error:
+            return
 
         exc, value, tb = error
 

newrelic/hooks/external_botocore.py

@@ -270,8 +270,6 @@ def create_chat_completion_message_event(
 
         if settings.ai_monitoring.record_content.enabled:
             chat_completion_message_dict["content"] = content
-        if request_timestamp:
-            chat_completion_message_dict["timestamp"] = request_timestamp
 
         chat_completion_message_dict.update(llm_metadata_dict)
 
@@ -1072,7 +1070,7 @@ def __next__(self):
         return return_val
 
     def close(self):
-        return super().close()
+        return self.__wrapped__.close()
 
 
 class AsyncEventStreamWrapper(ObjectProxy):
@@ -1110,7 +1108,7 @@ async def __anext__(self):
         return return_val
 
     async def aclose(self):
-        return await super().aclose()
+        return await self.__wrapped__.aclose()
 
 
 def handle_embedding_event(transaction, bedrock_attrs):

newrelic/hooks/mlmodel_gemini.py

@@ -564,8 +564,6 @@ def create_chat_completion_message_event(
 
                 if settings.ai_monitoring.record_content.enabled:
                     chat_completion_output_message_dict["content"] = message_content
-                if request_timestamp:
-                    chat_completion_output_message_dict["timestamp"] = request_timestamp
 
                 chat_completion_output_message_dict.update(llm_metadata)