Skip to content

[Cosmos] Core pipeline integration #6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
annatisch merged 12 commits into from
Aug 29, 2019
Merged

[Cosmos] Core pipeline integration #6961

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b4031ec
Updated dependencies
annatisch Aug 27, 2019
9f30dd6
Added core pipeline
annatisch Aug 27, 2019
d2ec4b3
Ignore test config
annatisch Aug 27, 2019
81d0a62
Merge remote-tracking branch 'upstream/master' into cosmos-pipeline
annatisch Aug 27, 2019
d7394d7
Fixed indexes test
annatisch Aug 27, 2019
d628d91
Refactored request creation
annatisch Aug 28, 2019
8c091d8
Fixed index test
annatisch Aug 28, 2019
abc9030
Added trace decorators
annatisch Aug 28, 2019
f02ca0f
Bumped version
annatisch Aug 28, 2019
c9ae867
Updated policies
annatisch Aug 28, 2019
095f6f8
Renamed request_options -> request_params
annatisch Aug 28, 2019
6b88446
Merge remote-tracking branch 'upstream/master' into cosmos-pipeline
annatisch Aug 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated policies
  • Loading branch information
@annatisch
annatisch committed Aug 28, 2019
commit c9ae86799d45917f44d01c8b92544e59818c4fe6
12 changes: 9 additions & 3 deletions sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@

"""Document client class for the Azure Cosmos database service.
"""
import requests
import platform

import requests
import six
from azure.core import PipelineClient
from azure.core.pipeline.policies import (
Expand All @@ -50,6 +51,7 @@
from . import _session
from . import _utils
from .partition_key import _Undefined, _Empty
from .version import VERSION

# pylint: disable=protected-access

Expand Down Expand Up @@ -148,15 +150,19 @@ def __init__(
url = six.moves.urllib.parse.urlparse(host)
proxy = host if url.port else host + ":" + str(connection_policy.ProxyConfiguration.Port)
proxies = {url.scheme : proxy}
user_agent = "azsdk-python-cosmos/{} Python/{} ({})".format(
VERSION,
platform.python_version(),
platform.platform())

policies = [
HeadersPolicy(),
ProxyPolicy(proxies=proxies),
UserAgentPolicy(),
UserAgentPolicy(base_user_agent=user_agent),
ContentDecodePolicy(),
CustomHookPolicy(),
DistributedTracingPolicy(),
NetworkTraceLoggingPolicy(),
DistributedTracingPolicy()
]

self.pipeline_client = PipelineClient(url_connection, "empty-config", policies=policies)
Copy link
Member

@johanste johanste Aug 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still have the positional config parameter ("empty-config")in the PipelineClient?

Copy link
Member Author

@annatisch annatisch Aug 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah - I will submit a PR to at least make it optional - the current code doesn't seem to use it if policies is passed in explicitly
https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/core/azure-core/azure/core/pipeline_client.py#L83

Copy link
Member Author

@annatisch annatisch Aug 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#6972

Expand Down