Add support for X-Ray tracing

ryandub · ryandub · commit 6f87712e223d · 2017-04-28T14:43:50.000-05:00
diff --git a/README.md b/README.md
@@ -53,6 +53,9 @@ Example `lambda.json` file:
     "security_groups": [
       "sg-00000000"
     ]
+  },
+  "tracing": {
+    "Mode": "Active"
   }
 }
 ```
diff --git a/README.rst b/README.rst
@@ -67,6 +67,9 @@ Example ``lambda.json`` file:
         "security_groups": [
           "sg-00000000"
         ]
+      },
+      "tracing": {
+        "Mode": "Active"
       }
     }
 
diff --git a/lambda_uploader/config.py b/lambda_uploader/config.py
@@ -29,12 +29,13 @@
 REQUIRED_KINESIS_SUBSCRIPTION_PARAMS = {u'stream': basestring,
                                         u'batch_size': int,
                                         u'starting_position': basestring}
+REQUIRED_TRACING_MODES = ['Active', 'PassThrough']
 
 DEFAULT_PARAMS = {u'requirements': [], u'publish': False,
                   u'alias': None, u'alias_description': None,
                   u'ignore': [], u'extra_files': [], u'vpc': None,
                   u's3_bucket': None, u's3_key': None, u'runtime': 'python2.7',
-                  u'variables': {}, u'subscription': {}}
+                  u'variables': {}, u'subscription': {}, u'tracing': {}}
 
 
 class Config(object):
@@ -51,6 +52,8 @@ def __init__(self, pth, config_file=None, role=None, variables=None):
             self._validate_vpc()
         if self._config['subscription']:
             self._validate_subscription()
+        if self._config['tracing']:
+            self._validate_tracing()
 
         for param, clss in REQUIRED_PARAMS.items():
             self._validate(param, cls=clss)
@@ -126,6 +129,16 @@ def _validate_vpc(self):
                                     " strings. '%s' contains something else"
                                     % param)
 
+    '''Validate the tracing configuration'''
+    def _validate_tracing(self):
+        if len(self._config['tracing']) > 1:
+            raise TypeError("Tracing Config can only contain one item")
+        if not self._config['tracing'].get('Mode'):
+            raise TypeError("Tracing Config must contain the `Mode` key")
+        if self._config['tracing']['Mode'] not in REQUIRED_TRACING_MODES:
+            raise TypeError("Tracing Config Mode must be one of {}".format(
+                ', '.join(REQUIRED_TRACING_MODES)))
+
     '''Validate the subscription configuration.
     All kinds of subscription will be validated here'''
     def _validate_subscription(self):
diff --git a/lambda_uploader/uploader.py b/lambda_uploader/uploader.py
@@ -71,6 +71,7 @@ def upload_existing(self, pkg):
             MemorySize=self._config.memory,
             VpcConfig=self._vpc_config,
             Environment=environment,
+            TracingConfig=self._config.tracing,
         )
         LOG.debug("AWS update_function_configuration response: %s"
                   % response)
@@ -117,6 +118,7 @@ def upload_new(self, pkg):
             Publish=self._config.publish,
             VpcConfig=self._vpc_config,
             Environment=environment,
+            TracingConfig=self._config.tracing,
         )
         LOG.debug("AWS create_function response: %s" % response)
 

Original file line number	Diff line number	Diff line change
@@ -53,6 +53,9 @@ Example `lambda.json` file:
`53`	`53`	`"security_groups": [`
`54`	`54`	`"sg-00000000"`
`55`	`55`	`]`
	`56`	`+ },`
	`57`	`+ "tracing": {`
	`58`	`+ "Mode": "Active"`
`56`	`59`	`}`
`57`	`60`	`}`
`58`	`61`	```
Original file line number	Diff line number	Diff line change
@@ -67,6 +67,9 @@ Example ``lambda.json`` file:
`67`	`67`	`"security_groups": [`
`68`	`68`	`"sg-00000000"`
`69`	`69`	`]`
	`70`	`+ },`
	`71`	`+ "tracing": {`
	`72`	`+ "Mode": "Active"`
`70`	`73`	`}`
`71`	`74`	`}`
`72`	`75`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ def upload_existing(self, pkg):`
`71`	`71`	`MemorySize=self._config.memory,`
`72`	`72`	`VpcConfig=self._vpc_config,`
`73`	`73`	`Environment=environment,`
	`74`	`+ TracingConfig=self._config.tracing,`
`74`	`75`	`)`
`75`	`76`	`LOG.debug("AWS update_function_configuration response: %s"`
`76`	`77`	`% response)`
`@@ -117,6 +118,7 @@ def upload_new(self, pkg):`
`117`	`118`	`Publish=self._config.publish,`
`118`	`119`	`VpcConfig=self._vpc_config,`
`119`	`120`	`Environment=environment,`
	`121`	`+ TracingConfig=self._config.tracing,`
`120`	`122`	`)`
`121`	`123`	`LOG.debug("AWS create_function response: %s" % response)`
`122`	`124`