Skip to content

Commit 4c93ed9

Browse files
authored
Merge branch 'develop' into sign_event
2 parents 0ae0af4 + 7c72f8f commit 4c93ed9

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

codegen/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
2-
junit5 = "5.12.0"
2+
junit5 = "5.12.1"
33
smithy = "1.55.0"
44
test-logger-plugin = "4.0.0"
55
spotbugs = "6.0.22"
66
spotless = "7.0.2"
77
smithy-gradle-plugins = "1.2.0"
8-
dep-analysis = "2.11.0"
8+
dep-analysis = "2.12.0"
99

1010
[libraries]
1111
smithy-model = { module = "software.amazon.smithy:smithy-model", version.ref = "smithy" }

packages/aws-event-stream/src/aws_event_stream/_private/deserializers.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33
import asyncio
44
import datetime
5+
import logging
56
from collections.abc import Callable
67

78
from smithy_core.aio.interfaces import AsyncByteStream
@@ -25,6 +26,8 @@
2526
)
2627
from smithy_core.traits import EventHeaderTrait
2728

29+
logger = logging.getLogger(__name__)
30+
2831
INITIAL_MESSAGE_TYPES = (INITIAL_REQUEST_EVENT_TYPE, INITIAL_RESPONSE_EVENT_TYPE)
2932

3033

@@ -55,14 +58,17 @@ async def receive(self) -> E | None:
5558
raise
5659

5760
if event is None:
61+
logger.debug("No event received from the source.")
5862
return None
63+
logger.debug("Received raw event: %s", event)
5964

6065
deserializer = EventDeserializer(
6166
event=event,
6267
payload_codec=self._payload_codec,
6368
is_client_mode=self._is_client_mode,
6469
)
6570
result = self._deserializer(deserializer)
71+
logger.debug("Successfully deserialized event: %s", result)
6672
if isinstance(getattr(result, "value"), Exception):
6773
raise result.value # type: ignore
6874
return result

packages/aws-event-stream/src/aws_event_stream/_private/serializers.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# SPDX-License-Identifier: Apache-2.0
33
import asyncio
44
import datetime
5-
from collections.abc import Iterator
5+
import logging
6+
from collections.abc import Callable, Iterator
67
from contextlib import contextmanager
78
from io import BytesIO
89
from typing import Never, Protocol
@@ -29,6 +30,8 @@
2930
)
3031
from smithy_core.traits import ErrorTrait, EventHeaderTrait, MediaTypeTrait
3132

33+
logger = logging.getLogger(__name__)
34+
3235
_DEFAULT_STRING_CONTENT_TYPE = "text/plain"
3336
_DEFAULT_BLOB_CONTENT_TYPE = "application/octet-stream"
3437

@@ -62,6 +65,7 @@ def __init__(
6265
async def send(self, event: E) -> None:
6366
if self._closed:
6467
raise IOError("Attempted to write to closed stream.")
68+
logger.debug("Preparing to publish event: %s", event)
6569
event.serialize(self._serializer)
6670
result = self._serializer.get_result()
6771
if result is None:
@@ -78,6 +82,7 @@ async def send(self, event: E) -> None:
7882
assert isinstance(result, EventMessage)
7983
encoded_result: bytes = result.encode()
8084
try:
85+
logger.debug("Publishing serialized event: %s", result)
8186
await self._writer.write(encoded_result)
8287
except Exception as e:
8388
await self.close()

0 commit comments

Comments
 (0)