From 57554833a315a7d5727872c26a1b720dd641b0e2 Mon Sep 17 00:00:00 2001 From: Harshit Jain Date: Wed, 18 Feb 2026 18:52:56 +0530 Subject: [PATCH] fix(datadog): use .get() for safe team tag extraction --- .../datadog/datadog_cost_management.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/litellm/integrations/datadog/datadog_cost_management.py b/litellm/integrations/datadog/datadog_cost_management.py index 9559c82c928..a961d4f9244 100644 --- a/litellm/integrations/datadog/datadog_cost_management.py +++ b/litellm/integrations/datadog/datadog_cost_management.py @@ -169,16 +169,20 @@ class DatadogCostManagementLogger(CustomBatchLogger): metadata = log.get("metadata", {}) if metadata: # Add user info - if "user_api_key_alias" in metadata: + # Add user info + if metadata.get("user_api_key_alias"): tags["user"] = str(metadata["user_api_key_alias"]) - if "user_api_key_team_alias" in metadata: - tags["team"] = str(metadata["user_api_key_team_alias"]) - elif "team_alias" in metadata: - tags["team"] = str(metadata["team_alias"]) - elif "user_api_key_team_id" in metadata: - tags["team"] = str(metadata["user_api_key_team_id"]) - elif "team_id" in metadata: - tags["team"] = str(metadata["team_id"]) + + # Add Team Tag + team_tag = ( + metadata.get("user_api_key_team_alias") + or metadata.get("team_alias") # type: ignore + or metadata.get("user_api_key_team_id") + or metadata.get("team_id") # type: ignore + ) + + if team_tag: + tags["team"] = str(team_tag) # model_group is not in StandardLoggingMetadata TypedDict, so we need to access it via dict.get() model_group = metadata.get("model_group") # type: ignore[misc] if model_group: