Merge branch 'master' into master

Author: srprash

aws_xray_sdk/core/async_recorder.py

@@ -53,7 +53,7 @@ def capture_async(self, name=None):
 
     def in_segment_async(self, name=None, **segment_kwargs):
         """
-        Return a segment async context manger.
+        Return a segment async context manager.
 
         :param str name: the name of the segment
         :param dict segment_kwargs: remaining arguments passed directly to `begin_segment`
@@ -62,7 +62,7 @@ def in_segment_async(self, name=None, **segment_kwargs):
 
     def in_subsegment_async(self, name=None, **subsegment_kwargs):
         """
-        Return a subsegment async context manger.
+        Return a subsegment async context manager.
 
         :param str name: the name of the segment
         :param dict segment_kwargs: remaining arguments passed directly to `begin_segment`

aws_xray_sdk/core/plugins/ec2_plugin.py

@@ -1,10 +1,10 @@
 import json
 import logging
 from future.standard_library import install_aliases
-from urllib.request import urlopen, Request
-
 install_aliases()
 
+from urllib.request import urlopen, Request
+
 log = logging.getLogger(__name__)
 
 SERVICE_NAME = 'ec2'

aws_xray_sdk/core/recorder.py

@@ -184,7 +184,7 @@ class to have your own implementation of the streaming process.
 
     def in_segment(self, name=None, **segment_kwargs):
         """
-        Return a segment context manger.
+        Return a segment context manager.
 
         :param str name: the name of the segment
         :param dict segment_kwargs: remaining arguments passed directly to `begin_segment`
@@ -193,7 +193,7 @@ def in_segment(self, name=None, **segment_kwargs):
 
     def in_subsegment(self, name=None, **subsegment_kwargs):
         """
-        Return a subsegment context manger.
+        Return a subsegment context manager.
 
         :param str name: the name of the subsegment
         :param dict subsegment_kwargs: remaining arguments passed directly to `begin_subsegment`