diff --git a/eng/tox/import_all.py b/eng/tox/import_all.py index e3e19129650c..9d30d3a84401 100644 --- a/eng/tox/import_all.py +++ b/eng/tox/import_all.py @@ -18,6 +18,7 @@ excluded_packages = [ "azure.core.tracing.opencensus", "azure.eventhub.checkpointstoreblob.aio", + "azure.identity", "azure.keyvault.certificates", # Github issue 7879 "azure.keyvault.keys", # Github issue 7879 "azure.keyvault.secrets", # Github issue 7879 diff --git a/sdk/identity/azure-identity/azure/identity/_authn_client.py b/sdk/identity/azure-identity/azure/identity/_authn_client.py index dd82ccd5e7c2..d07b0cdff082 100644 --- a/sdk/identity/azure-identity/azure/identity/_authn_client.py +++ b/sdk/identity/azure-identity/azure/identity/_authn_client.py @@ -14,6 +14,7 @@ from azure.core.pipeline import Pipeline from azure.core.pipeline.policies import ( ContentDecodePolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, ProxyPolicy, RetryPolicy, @@ -189,7 +190,8 @@ def __init__( ContentDecodePolicy(), config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + HttpLoggingPolicy(**kwargs), ] if not transport: transport = RequestsTransport(**kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py b/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py index b88b4b9fc60f..98166d588849 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/managed_identity.py @@ -11,6 +11,7 @@ ContentDecodePolicy, DistributedTracingPolicy, HeadersPolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, RetryPolicy, ) @@ -69,7 +70,8 @@ def __init__(self, endpoint, client_cls, config=None, client_id=None, **kwargs): config.headers_policy, config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + HttpLoggingPolicy(**kwargs), ] self._client = client_cls(endpoint=endpoint, config=config, policies=policies, **kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py index ba6f9cdb7096..9b8e587cb9db 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_transport_adapter.py @@ -12,6 +12,7 @@ from azure.core.pipeline.policies import ( ContentDecodePolicy, DistributedTracingPolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, ProxyPolicy, RetryPolicy, @@ -87,7 +88,8 @@ def _build_pipeline(self, config=None, policies=None, transport=None, **kwargs): ContentDecodePolicy(), config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + HttpLoggingPolicy(**kwargs), ] if not transport: transport = RequestsTransport(**kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py b/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py index 1585ade43123..0670dae23296 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_authn_client.py @@ -14,6 +14,7 @@ AsyncRetryPolicy, ContentDecodePolicy, DistributedTracingPolicy, + HttpLoggingPolicy, NetworkTraceLoggingPolicy, ProxyPolicy, ) @@ -43,7 +44,8 @@ def __init__( ContentDecodePolicy(), config.retry_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + HttpLoggingPolicy(**kwargs), ] if not transport: transport = AioHttpTransport(**kwargs) diff --git a/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py b/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py index a1be9df87c77..442ee6a8fdfe 100644 --- a/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py +++ b/sdk/identity/azure-identity/azure/identity/aio/_internal/msal_transport_adapter.py @@ -10,7 +10,12 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import AsyncRetryPolicy, DistributedTracingPolicy, NetworkTraceLoggingPolicy +from azure.core.pipeline.policies import ( + AsyncRetryPolicy, + DistributedTracingPolicy, + HttpLoggingPolicy, + NetworkTraceLoggingPolicy, +) from azure.core.pipeline.transport import AioHttpTransport, HttpRequest from azure.identity._internal import MsalTransportResponse @@ -34,7 +39,12 @@ def __init__( ) -> None: config = config or self._create_config(**kwargs) - policies = policies or [config.retry_policy, config.logging_policy, DistributedTracingPolicy()] + policies = policies or [ + config.retry_policy, + config.logging_policy, + DistributedTracingPolicy(**kwargs), + HttpLoggingPolicy(**kwargs), + ] self._transport = transport or AioHttpTransport(configuration=config) atexit.register(self._close_transport_session) # prevent aiohttp warnings self._pipeline = AsyncPipeline(transport=self._transport, policies=policies) diff --git a/sdk/identity/azure-identity/setup.py b/sdk/identity/azure-identity/setup.py index fedcf533e319..3c170e4f3702 100644 --- a/sdk/identity/azure-identity/setup.py +++ b/sdk/identity/azure-identity/setup.py @@ -70,7 +70,7 @@ ] ), install_requires=[ - "azure-core<2.0.0,>=1.0.0b2", + "azure-core<2.0.0,>=1.0.0b5", "cryptography>=2.1.4", "msal~=0.4.1", "msal-extensions~=0.1.1", diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py index 932aa8587184..eeafdd82c547 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import AsyncHttpTransport from ._generated import KeyVaultClient @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -88,7 +90,8 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index 835893198b27..6769cad95b3b 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING from azure.core.pipeline import Pipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import RequestsTransport from ._generated import KeyVaultClient from .challenge_auth_policy import ChallengeAuthPolicy @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint, credential, **kwargs): # pylint:disable=no-self-use def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -88,7 +90,8 @@ def _build_pipeline(self, config, transport, **kwargs): config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-certificates/setup.py b/sdk/keyvault/azure-keyvault-certificates/setup.py index ac43b02937a8..e4da99a1c89d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/setup.py +++ b/sdk/keyvault/azure-keyvault-certificates/setup.py @@ -78,7 +78,7 @@ "azure.keyvault", ] ), - install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"], + install_requires=["azure-core<2.0.0,>=1.0.0b5", "azure-common~=1.1", "msrest>=0.5.0"], extras_require={ ":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.4'": ["enum34>=1.0.4"], diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py index 932aa8587184..eeafdd82c547 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/async_client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import AsyncHttpTransport from ._generated import KeyVaultClient @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -88,7 +90,8 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index 904454386038..00791a935b43 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import Pipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import RequestsTransport from ._generated import KeyVaultClient from .challenge_auth_policy import ChallengeAuthPolicy @@ -81,6 +81,8 @@ def __init__(self, vault_endpoint, credential, **kwargs): # pylint:disable=no-self-use def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -89,7 +91,8 @@ def _build_pipeline(self, config, transport, **kwargs): config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-keys/setup.py b/sdk/keyvault/azure-keyvault-keys/setup.py index f5dfb2a9e6bf..133ad8d628f8 100644 --- a/sdk/keyvault/azure-keyvault-keys/setup.py +++ b/sdk/keyvault/azure-keyvault-keys/setup.py @@ -78,7 +78,7 @@ "azure.keyvault", ] ), - install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "cryptography>=2.1.4", "msrest>=0.5.0"], + install_requires=["azure-core<2.0.0,>=1.0.0b5", "azure-common~=1.1", "cryptography>=2.1.4", "msrest>=0.5.0"], extras_require={ ":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.4'": ["enum34>=1.0.4"], diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py index 932aa8587184..eeafdd82c547 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/async_client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import AsyncPipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import AsyncHttpTransport from ._generated import KeyVaultClient @@ -80,6 +80,8 @@ def __init__(self, vault_endpoint: str, credential: "TokenCredential", **kwargs: @staticmethod def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwargs: "**Any") -> AsyncPipeline: + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -88,7 +90,8 @@ def _build_pipeline(config: Configuration, transport: AsyncHttpTransport, **kwar config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index 904454386038..00791a935b43 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -6,7 +6,7 @@ from azure.core.configuration import Configuration from azure.core.pipeline import Pipeline -from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy +from azure.core.pipeline.policies import UserAgentPolicy, DistributedTracingPolicy, HttpLoggingPolicy from azure.core.pipeline.transport import RequestsTransport from ._generated import KeyVaultClient from .challenge_auth_policy import ChallengeAuthPolicy @@ -81,6 +81,8 @@ def __init__(self, vault_endpoint, credential, **kwargs): # pylint:disable=no-self-use def _build_pipeline(self, config, transport, **kwargs): # type: (Configuration, HttpTransport, **Any) -> Pipeline + logging_policy = HttpLoggingPolicy(**kwargs) + logging_policy.allowed_header_names.add("x-ms-keyvault-network-info") policies = [ config.headers_policy, config.user_agent_policy, @@ -89,7 +91,8 @@ def _build_pipeline(self, config, transport, **kwargs): config.retry_policy, config.authentication_policy, config.logging_policy, - DistributedTracingPolicy(), + DistributedTracingPolicy(**kwargs), + logging_policy, ] if transport is None: diff --git a/sdk/keyvault/azure-keyvault-secrets/setup.py b/sdk/keyvault/azure-keyvault-secrets/setup.py index ccecb514929d..8852ebe8228c 100644 --- a/sdk/keyvault/azure-keyvault-secrets/setup.py +++ b/sdk/keyvault/azure-keyvault-secrets/setup.py @@ -78,7 +78,7 @@ "azure.keyvault", ] ), - install_requires=["azure-core<2.0.0,>=1.0.0b2", "azure-common~=1.1", "msrest>=0.5.0"], + install_requires=["azure-core<2.0.0,>=1.0.0b5", "azure-common~=1.1", "msrest>=0.5.0"], extras_require={ ":python_version<'3.0'": ["azure-keyvault-nspkg"], ":python_version<'3.4'": ["enum34>=1.0.4"], diff --git a/shared_requirements.txt b/shared_requirements.txt index ded20019e56c..f454b03ea708 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -6,7 +6,7 @@ azure-cognitiveservices-language-nspkg azure-cognitiveservices-search-nspkg azure-cognitiveservices-vision-nspkg azure-common~=1.1 -azure-core<2.0.0,>=1.0.0b4 +azure-core<2.0.0,>=1.0.0b5 azure-cosmosdb-table~=1.0 azure-datalake-store~=0.0.18 azure-eventhub<6.0.0,>=5.0.0b3 @@ -114,10 +114,6 @@ opencensus>=0.6.0 opencensus-ext-threading opencensus-ext-azure>=0.3.1 #override azure-cognitiveservices-inkrecognizer azure-core<2.0.0,>=1.0.0b2 -#override azure-identity azure-core<2.0.0,>=1.0.0b2 -#override azure-keyvault-certificates azure-core<2.0.0,>=1.0.0b2 -#override azure-keyvault-keys azure-core<2.0.0,>=1.0.0b2 -#override azure-keyvault-secrets azure-core<2.0.0,>=1.0.0b2 #override azure-eventhub-checkpointstoreblob-aio azure-storage-blob<=12.0.0b4,>=12.0.0b2 #override azure-eventhub-checkpointstoreblob-aio aiohttp<4.0,>=3.0 #override azure-eventhub uamqp<2.0,>=1.2.3