[ServiceBus] Fix mktime overflow and milliseconds miscalculation issue (Azure#19437)

* fix utc and milliseconds issue

* fix python2.7

* update uamqp dependency to 1.4.1

Author: yunhaoling

sdk/servicebus/azure-servicebus/CHANGELOG.md

@@ -2,9 +2,13 @@
 
 ## 7.3.1 (Unreleased)
 
-**Bug Fixes**
+### Fixed
 
-* Fixed a bug that when setting `ServiceBusMessage.partition_key`, input value should be not validated against `session_id` of None (PR #19233, thanks @bishnu-shb).
+- Fixed a bug that when setting `ServiceBusMessage.partition_key`, input value should be not validated against `session_id` of None (PR #19233, thanks @bishnu-shb).
+- Fixed a bug that setting `ServiceBusMessage.time_to_live` causes OverflowError error on Ubuntu 20.04.
+- Fixed a bug that `AmqpAnnotatedProperties.creation_time` and `AmqpAnnotatedProperties.absolute_expiry_time` should be calculated in the unit of milliseconds instead of seconds.
+- Updated uAMQP dependency to 1.4.1.
+  - Fixed a bug that attributes creation_time, absolute_expiry_time and group_sequence on MessageProperties should be compatible with integer types on Python 2.7.
 
 ## 7.3.0 (2021-06-08)
 

sdk/servicebus/azure-servicebus/azure/servicebus/_common/message.py

@@ -355,7 +355,7 @@ def time_to_live(self, value):
                 self._raw_amqp_message.header.time_to_live != MAX_DURATION_VALUE:
             if not self._raw_amqp_message.properties:
                 self._raw_amqp_message.properties = AmqpMessageProperties()
-            self._raw_amqp_message.properties.creation_time = int(time.mktime(utc_now().timetuple()))
+            self._raw_amqp_message.properties.creation_time = int(time.mktime(utc_now().timetuple())) * 1000
             self._raw_amqp_message.properties.absolute_expiry_time = min(
                 MAX_ABSOLUTE_EXPIRY_TIME,
                 self._raw_amqp_message.properties.creation_time + self._raw_amqp_message.header.time_to_live

sdk/servicebus/azure-servicebus/azure/servicebus/_common/utils.py

@@ -24,7 +24,7 @@
     cast
 )
 from contextlib import contextmanager
-from msrest.serialization import UTC
+from msrest.serialization import TZ_UTC
 
 try:
     from urlparse import urlparse
@@ -81,11 +81,11 @@
 
 
 def utc_from_timestamp(timestamp):
-    return datetime.datetime.fromtimestamp(timestamp, tz=UTC())
+    return datetime.datetime.fromtimestamp(timestamp, tz=TZ_UTC)
 
 
 def utc_now():
-    return datetime.datetime.now(UTC())
+    return datetime.datetime.now(TZ_UTC)
 
 
 def build_uri(address, entity):

sdk/servicebus/azure-servicebus/azure/servicebus/amqp/_amqp_message.py

@@ -8,7 +8,7 @@
 from datetime import datetime
 from typing import Optional, Any, cast, Mapping
 
-from msrest.serialization import UTC
+from msrest.serialization import TZ_UTC
 import uamqp
 
 from ._constants import AMQP_MESSAGE_BODY_TYPE_MAP, AmqpMessageBodyType
@@ -229,7 +229,7 @@ def _to_outgoing_amqp_message(self):
             message_header.priority = self.header.priority
             if self.header.time_to_live and self.header.time_to_live != MAX_DURATION_VALUE:
                 ttl_set = True
-                creation_time_from_ttl = int(time.mktime(datetime.now(UTC()).timetuple()))
+                creation_time_from_ttl = int(time.mktime(datetime.now(TZ_UTC).timetuple()) * 1000)
                 absolute_expiry_time_from_ttl = int(min(
                     MAX_ABSOLUTE_EXPIRY_TIME,
                     creation_time_from_ttl + self.header.time_to_live

sdk/servicebus/azure-servicebus/setup.py

@@ -79,7 +79,7 @@
         'azure',
     ]),
     install_requires=[
-        "uamqp>=1.4.0,<2.0.0",
+        "uamqp>=1.4.1,<2.0.0",
         'azure-common~=1.1',
         'msrest>=0.6.17,<2.0.0',
         'azure-core<2.0.0,>=1.14.0',

shared_requirements.txt

@@ -174,7 +174,7 @@ opentelemetry-sdk<2.0.0,>=1.0.0
 #override azure-eventhub uamqp>=1.4.0,<2.0.0
 #override azure-appconfiguration msrest>=0.6.10
 #override azure-mgmt-appconfiguration msrest>=0.6.21
-#override azure-servicebus uamqp>=1.4.0,<2.0.0
+#override azure-servicebus uamqp>=1.4.1,<2.0.0
 #override azure-servicebus msrest>=0.6.17,<2.0.0
 #override azure-servicebus azure-core<2.0.0,>=1.14.0
 #override azure-servicefabric msrest>=0.6.21