diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py index c2c128e2bb2d..3d4379c447d6 100644 --- a/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py +++ b/sdk/core/azure-core/azure/core/pipeline/policies/_universal.py @@ -211,13 +211,14 @@ def __init__( self.overwrite: bool = kwargs.pop("user_agent_overwrite", False) self.use_env: bool = kwargs.pop("user_agent_use_env", True) application_id: Optional[str] = kwargs.pop("user_agent", None) - sdk_moniker: str = kwargs.pop("sdk_moniker", "core/{}".format(azcore_version)) + core_version = "core/{}".format(azcore_version) + sdk_moniker: str = kwargs.pop("sdk_moniker", core_version) if base_user_agent: self._user_agent = base_user_agent else: - self._user_agent = "azsdk-python-{} Python/{} ({})".format( - sdk_moniker, platform.python_version(), platform.platform() + self._user_agent = "azsdk-python-{} {} Python/{} ({})".format( + sdk_moniker, core_version, platform.python_version(), platform.platform() ) if application_id: diff --git a/sdk/core/azure-core/tests/test_user_agent_policy.py b/sdk/core/azure-core/tests/test_user_agent_policy.py index f4121d7eeffa..e463c5da65e2 100644 --- a/sdk/core/azure-core/tests/test_user_agent_policy.py +++ b/sdk/core/azure-core/tests/test_user_agent_policy.py @@ -20,7 +20,7 @@ def test_user_agent_policy(http_request): assert user_agent._user_agent == "foo" user_agent = UserAgentPolicy(sdk_moniker="foosdk/1.0.0") - assert user_agent._user_agent.startswith("azsdk-python-foosdk/1.0.0 Python") + assert user_agent._user_agent.startswith("azsdk-python-foosdk/1.0.0 core/") user_agent = UserAgentPolicy(base_user_agent="foo", user_agent="bar", user_agent_use_env=False) assert user_agent._user_agent == "bar foo"