Merge pull request #40 from signalfx/instrumentation-and-force-flush

Add support for auto-instrumentation and flushing spans

Author: owais

README.rst

@@ -333,6 +333,36 @@ The tracing wrapper creates a span for the wrapper handler. This span contains t
 
 
 
+Auto-instrumentation packages
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The SignalFx Python Lambda Wrapper can automatically instrument supported packages. All you need to do is to install instrumentations you need in addition to `signalfx_lambda`. Below is a list of all instrumentation packages supported:
+
++--------------------------+----------------------------------------------------------------------------------------------------+
+| Library/Framework        | Instrumentation Package                                                                            |
++==========================+====================================================================================================+
+| celery                   | `https://github.com/signalfx/python-celery/tarball/0.0.1post0#egg=celery-opentracing`              |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| django                   | `https://github.com/signalfx/python-django/tarball/0.1.18post1#egg=django-opentracing`             |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| elasticsearch            | `https://github.com/signalfx/python-elasticsearch/tarball/0.1.4post#egg=elasticsearch-opentracing` |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| flask                    | `https://github.com/signalfx/python-flask/tarball/1.1.0post1#egg=flask_opentracing`                |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| psycopg                  | `https://github.com/signalfx/python-dbapi/tarball/v0.0.5post1#egg=dbapi-opentracing`               |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| pymongo                  | `https://github.com/signalfx/python-pymongo/tarball/v0.0.3post1#egg=pymongo-opentracing`           |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| pymysql                  | `https://github.com/signalfx/python-dbapi/tarball/v0.0.5post1#egg=dbapi-opentracing`               |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| redis                    | `https://github.com/signalfx/python-redis/tarball/v1.0.0post1#egg=redis-opentracing`               |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| requests                 | `https://github.com/signalfx/python-requests/archive/v0.2.0post1.zip#egg=requests-opentracing`     |
++--------------------------+----------------------------------------------------------------------------------------------------+
+| tornado                  | `https://github.com/signalfx/python-tornado/archive/1.0.1post1.zip#egg=tornado_opentracing`        |
++--------------------------+----------------------------------------------------------------------------------------------------+
+
+
 Test locally 
 ^^^^^^^^^^^^^^^^^
 If you would like to test changes to a wrapper, run the following commands in your command line: 

requirements.txt

@@ -1,3 +1,3 @@
 signalfx>=1.0.16
-sfx-jaeger-client>=3.13.1b0.dev4
+signalfx-tracing>=1.5.1
 six>=1.4.0

signalfx_lambda/tracing.py

@@ -3,6 +3,7 @@
 import logging
 import opentracing
 from opentracing.ext import tags as ext_tags
+from signalfx_tracing import auto_instrument
 from jaeger_client import Config
 
 from . import utils
@@ -33,13 +34,17 @@ def call(event, context):
             except BaseException as e:
                 raise
             finally:
-                tracer.close()
+                tracer.flush()
 
         return call
     return inner
 
 
 def init_jaeger_tracer(context):
+    global _tracer
+    if _tracer:
+        return _tracer
+
     endpoint = utils.get_tracing_url()
     service_name = os.getenv('SIGNALFX_SERVICE_NAME', context.function_name)
     access_token = utils.get_access_token()
@@ -63,8 +68,8 @@ def init_jaeger_tracer(context):
     config = Config(config=tracer_config, service_name=service_name)
 
     tracer = config.new_tracer()
-    global _tracer
     _tracer = opentracing.tracer = tracer
+    auto_instrument(_tracer)
 
     return tracer