Add UserAgent header to boto3 client (#558)

Author: BumaldaOverTheWater94

libs/aws/langchain_aws/__init__.py

@@ -35,6 +35,39 @@ def setup_logging():
 
 setup_logging()
 
+
+try:
+    import boto3
+    from botocore.config import Config
+
+    FRAMEWORK_UA = "x-client-framework:langchain-aws"
+    ORIGINAL_BOTO3_CLIENT = boto3.client
+    ORIGINAL_SESSION_CLIENT = boto3.session.Session.client
+
+    def _ensure_framework_ua(cfg: Config | None) -> Config:
+        """Return a Config guaranteed to contain our framework UA tag."""
+        if cfg is None:
+            return Config(user_agent_extra=FRAMEWORK_UA)
+        existing = getattr(cfg, "user_agent_extra", "") or ""
+        if FRAMEWORK_UA in existing:
+            return cfg
+        merged_extra = f"{existing} {FRAMEWORK_UA}".strip()
+        return cfg.merge(Config(user_agent_extra=merged_extra))
+
+    def _patched_boto3_client(*args, **kwargs):
+        kwargs["config"] = _ensure_framework_ua(kwargs.get("config"))
+        return ORIGINAL_BOTO3_CLIENT(*args, **kwargs)
+
+    def _patched_session_client(self, *args, **kwargs):
+        kwargs["config"] = _ensure_framework_ua(kwargs.get("config"))
+        return ORIGINAL_SESSION_CLIENT(self, *args, **kwargs)
+
+    boto3.client = _patched_boto3_client
+    boto3.session.Session.client = _patched_session_client
+except Exception:
+    pass
+
+
 __all__ = [
     "BedrockEmbeddings",
     "BedrockLLM",

libs/aws/langchain_aws/agents/utils.py

@@ -64,7 +64,8 @@ def get_boto_session(
     # Update user agent
     existing_user_agent = getattr(config, "user_agent_extra", "") or ""
     config.user_agent_extra = (
-        f"{existing_user_agent} md/sdk_user_agent/{SDK_USER_AGENT}".strip()
+        f"{existing_user_agent} x-client-framework:langchain-aws "
+        f"md/sdk_user_agent/{SDK_USER_AGENT}".strip()
     )
     client_params = {"config": config}
 

libs/langgraph-checkpoint-aws/langgraph_checkpoint_aws/utils.py

@@ -441,6 +441,9 @@ def create_client_config(config: Optional[Config] = None) -> Config:
     """
     config_kwargs = {}
     existing_user_agent = getattr(config, "user_agent_extra", "") if config else ""
-    new_user_agent = f"{existing_user_agent} md/sdk_user_agent/{SDK_USER_AGENT}".strip()
+    new_user_agent = (
+    f"{existing_user_agent} x-client-framework:langgraph-checkpoint-aws "
+    f"md/sdk_user_agent/{SDK_USER_AGENT}".strip()
+)
 
     return Config(user_agent_extra=new_user_agent, **config_kwargs)