Merge branch 'master' into sqlalchemy_140_fix

Author: srprash

aws_xray_sdk/core/emitters/udp_emitter.py

@@ -32,12 +32,15 @@ def send_entity(self, entity):
 
         :param entity: a trace entity to send to the X-Ray daemon
         """
-        message = "%s%s%s" % (PROTOCOL_HEADER,
-                              PROTOCOL_DELIMITER,
-                              entity.serialize())
+        try:
+            message = "%s%s%s" % (PROTOCOL_HEADER,
+                                  PROTOCOL_DELIMITER,
+                                  entity.serialize())
 
-        log.debug("sending: %s to %s:%s." % (message, self._ip, self._port))
-        self._send_data(message)
+            log.debug("sending: %s to %s:%s." % (message, self._ip, self._port))
+            self._send_data(message)
+        except Exception:
+            log.exception("Failed to send entity to Daemon.")
 
     def set_daemon_address(self, address):
         """
@@ -57,12 +60,7 @@ def port(self):
         return self._port
 
     def _send_data(self, data):
-
-        try:
-            self._socket.sendto(data.encode('utf-8'), (self._ip,
-                                self._port))
-        except Exception:
-            log.exception('failed to send data to X-Ray daemon.')
+        self._socket.sendto(data.encode('utf-8'), (self._ip, self._port))
 
     def _parse_address(self, daemon_address):
         try:

aws_xray_sdk/core/models/entity.py

@@ -259,10 +259,7 @@ def serialize(self):
         Serialize to JSON document that can be accepted by the
         X-Ray backend service. It uses json to perform serialization.
         """
-        try:
-            return json.dumps(self.to_dict(), default=str)
-        except Exception:
-            log.exception("Failed to serialize %s", self.name)
+        return json.dumps(self.to_dict(), default=str)
 
     def to_dict(self):
         """

aws_xray_sdk/core/plugins/ec2_plugin.py

@@ -28,6 +28,10 @@ def initialize():
 
 
 def get_token():
+    """
+    Get the session token for IMDSv2 endpoint valid for 60 seconds
+    by specifying the X-aws-ec2-metadata-token-ttl-seconds header.
+    """
     token = None
     try:
         headers = {"X-aws-ec2-metadata-token-ttl-seconds": "60"}