Skip to content
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.

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

[EventHubs] uamqp switch support #25494

Merged
merged 25 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c546a02
add shared connection back into conn manager
swathipil Aug 1, 2022
a5f0a55
add uamqp switch changes
swathipil Aug 1, 2022
76e11d1
sync tests
swathipil Aug 1, 2022
5622e5b
update changelog
swathipil Aug 1, 2022
8de034d
fix reconn test
swathipil Aug 1, 2022
9625aad
add switch to async
swathipil Aug 2, 2022
0a6d1b8
fix bugs
swathipil Aug 2, 2022
4fbe9db
update consumer code to fix tests
swathipil Aug 2, 2022
0711b86
update conftest with uamqp_transport fixture
swathipil Aug 2, 2022
28a14a0
lint + mypy
swathipil Aug 2, 2022
bef9257
Merge branch 'main' into swathipil/eh/uamqp-switch-support
swathipil Aug 3, 2022
f9e9a28
address Anna/Libba/Kashifs comments
swathipil Aug 9, 2022
fb42f69
Merge branch 'swathipil/eh/uamqp-switch-support' of https://github.co…
swathipil Aug 9, 2022
e19a0d9
Annas comments
swathipil Aug 15, 2022
db695be
remove kwargs from EventDataBatch
swathipil Aug 15, 2022
792bd78
fix bugs
swathipil Aug 15, 2022
10fc8dd
Merge branch 'main' into swathipil/eh/uamqp-switch-support
swathipil Aug 15, 2022
2e4437d
fix lint, mypy, errors
swathipil Aug 15, 2022
ef68450
update tests to take uamqp TransportType as well
swathipil Aug 16, 2022
0ee220c
merge main
swathipil Aug 17, 2022
b2a5914
update changelog
swathipil Aug 17, 2022
40933b3
update uamqp min dep + release date
swathipil Aug 18, 2022
7e90936
Merge branch 'main' into swathipil/eh/uamqp-switch-support
swathipil Aug 18, 2022
73fdaa8
update message prop back to ivar
swathipil Aug 18, 2022
f05f362
set message ivar when creating ED._from_message
swathipil Aug 19, 2022
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
12 changes: 6 additions & 6 deletions sdk/eventhub/azure-eventhub/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Release History

## 5.10.1 (Unreleased)
## 5.10.1 (2022-08-18)

This version and all future versions will require Python 3.7+, Python 3.6 is no longer supported.

### Features Added

### Breaking Changes
### Bugs Fixed

- Fixed a bug in `BufferedProducer` that would block when flushing the queue causing the client to freeze up (issue #23510).

### Bugs Fixed
- Fixed a bug in the async `EventHubProducerClient` and `EventHubConsumerClient` that set the default value of the `transport_type` parameter in the constructors to `None` rather than `TransportType.Amqp`.

### Other Changes

- Internal refactoring to support upcoming Pure Python AMQP-based release.
swathipil marked this conversation as resolved.
Show resolved Hide resolved
- Updated uAMQP dependency to 1.6.0.

## 5.10.0 (2022-06-08)

### Features Added
Expand Down
4 changes: 1 addition & 3 deletions sdk/eventhub/azure-eventhub/azure/eventhub/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
from uamqp import constants
from ._common import EventData, EventDataBatch
from ._version import VERSION

__version__ = VERSION

from ._constants import TransportType
from ._producer_client import EventHubProducerClient
from ._consumer_client import EventHubConsumerClient
from ._client_base import EventHubSharedKeyCredential
Expand All @@ -19,8 +19,6 @@
EventHubConnectionStringProperties,
)

TransportType = constants.TransportType

__all__ = [
"EventData",
"EventDataBatch",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
from __future__ import annotations
import time
import queue
import logging
Expand All @@ -14,6 +15,7 @@
from ..exceptions import OperationTimeoutError

if TYPE_CHECKING:
from .._transport._base import AmqpTransport
from .._producer_client import SendEventTypes

_LOGGER = logging.getLogger(__name__)
Expand All @@ -30,8 +32,8 @@ def __init__(
max_message_size_on_link: int,
executor: ThreadPoolExecutor,
*,
max_wait_time: float = 1,
max_buffer_length: int
max_buffer_length: int,
max_wait_time: float = 1
):
self._buffered_queue: queue.Queue = queue.Queue()
self._max_buffer_len = max_buffer_length
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------
from __future__ import annotations
import logging
from threading import Lock
from concurrent.futures import ThreadPoolExecutor
Expand All @@ -14,6 +15,7 @@

if TYPE_CHECKING:
from .._producer_client import SendEventTypes
from .._transport._base import AmqpTransport

_LOGGER = logging.getLogger(__name__)

Expand Down
Loading