Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
move logging to sdk layer
  • Loading branch information
swathipil committed Nov 1, 2024
commit caf86a37929942d361d2d5f6bcde0c006082d20c
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,6 @@ def _incoming_transfer(self, frame):
self._received_payload = bytearray()
else:
message = decode_payload(frame[11])
if self.network_trace and _LOGGER.isEnabledFor(logging.DEBUG):
seq_num = None
enqueued_time = None
locked_until = None
ttl = None
delivery_count = None
if message.message_annotations:
seq_num = message.message_annotations.get(b"x-opt-sequence-number")
try:
enqueued_time = message.message_annotations.get(b"x-opt-enqueued-time")
enqueued_time = datetime.fromtimestamp(enqueued_time/1000, tz=timezone.utc)
except TypeError:
enqueued_time = None
try:
locked_until = message.message_annotations.get(b"x-opt-locked-until")
enqueued_time = datetime.fromtimestamp(locked_until/1000, tz=timezone.utc)
except TypeError:
locked_until = None
if message.header:
ttl = message.header.ttl
delivery_count = message.header.delivery_count
_LOGGER.debug(
"Received message: seq-num: %r, enqd-utc: %r, lockd-til-utc: %r, ttl: %r, dlvry-cnt: %r",
seq_num,
enqueued_time,
locked_until,
ttl,
delivery_count,
extra=self.network_trace_params
)
delivery_state = self._process_incoming_message(self._first_frame, message)

if not frame[4] and delivery_state: # settled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import datetime
from datetime import timezone
from typing import Optional, Tuple, cast, List, TYPE_CHECKING, Any, Callable, Dict, Union, Iterator, Type
import logging

from .._pyamqp import (
utils,
Expand Down Expand Up @@ -102,6 +103,7 @@
from .._pyamqp.client import AMQPClient
from .._pyamqp.message import MessageDict

_LOGGER = logging.getLogger(__name__)

class _ServiceBusErrorPolicy(RetryPolicy):

Expand Down Expand Up @@ -743,6 +745,15 @@ def build_received_message(
amqp_transport=receiver._amqp_transport
)
receiver._last_received_sequenced_number = message.sequence_number
if receiver._config.logging_enable and _LOGGER.isEnabledFor(logging.DEBUG):
_LOGGER.debug(
"Received message: seq-num: %r, enqd-utc: %r, lockd-til-utc: %r, ttl: %r, dlvry-cnt: %r",
message.sequence_number,
message.enqueued_time_utc,
message.locked_until_utc,
message.time_to_live,
message.delivery_count,
)
return message

@staticmethod
Expand Down