Use python lambda wrapper (signalfx#24)

* Update example to use wrapper

* Remove wait for flushed spans

* Use the common-endpoint SIGNALFX_ENDPOINT_URL in readme

Author: achandras

aws-lambda/jaeger-python/README.md

@@ -1,6 +1,6 @@
 # OpenTracing and Jaeger in AWS Lambda Python Runtime
 
-This is an example of a simple, traced Lambda function using the Jaeger Python tracer with SignalFx.
+This is an example of a simple, traced Lambda function using the SignalFx Lambda Wrapper and Jaeger Python tracer with SignalFx.
 See [example.py](./example.py) for the example code.
 
 ## Building and creating a Deployment Package
@@ -24,8 +24,10 @@ $ zip -r my_traced_python_lambda.zip *
 
 The resulting `my_traced_python_lambda.zip` can be uploaded to S3 or in your browser via the AWS Console
 during function creation. Register your handler as `example.request_handler` and don't forget to set the
-`SIGNALFX_INGEST_URL` environment variable to point to your Gateway.  You should be able test the application
-with the following test event:
+`SIGNALFX_ENDPOINT_URL` environment variable to point to your Gateway. Set
+`SIGNALFX_SERVICE_NAME` to `signalfx-lambda-python-example` or something else
+descriptive. You should be able test the application with the following test
+event:
 
 ```
 {

aws-lambda/jaeger-python/example.py

@@ -17,7 +17,9 @@
 import time
 
 from jaeger_client import Config
+import opentracing
 from opentracing.ext import tags
+import signalfx_lambda
 
 
 # Roulette address/position maps, helpful for "00"
@@ -43,7 +45,7 @@ def __init__(self):
         # idempotent Tracer registration and access per AWS Lambda best practices:
         # https://docs.aws.amazon.com/lambda/latest/dg/best-practices.html#function-code
         # https://docs.aws.amazon.com/lambda/latest/dg/running-lambda-code.html
-        self.tracer = self.create_tracer()  # Create a tracer for the lifetime of the request
+        self.tracer = opentracing.tracer  # get the OpenTracing global tracer that was set by the lambda wrapper
 
     def handle_request(self, event, context):
         # Create the root span, specifying a span.kind tag in the
@@ -84,41 +86,8 @@ def handle_request(self, event, context):
             span.set_tag(tags.HTTP_STATUS_CODE, status_code)
             response = dict(statusCode=status_code, body=json.dumps(response_body))
 
-        # Known issue with Jaeger's Python client
-        # https://github.com/jaegertracing/jaeger-client-python/issues/50
-        self.wait_for_flushed_spans()
-
         return response
 
-    def create_tracer(self):
-        access_token = os.getenv('SIGNALFX_ACCESS_TOKEN')
-        ingest_url = os.getenv('SIGNALFX_INGEST_URL')
-
-        if ingest_url is None:
-            if access_token is None:
-                raise Exception("You must set the SIGNALFX_ACCESS_TOKEN Lambda environment variable to be your token "
-                                "if you don't set SIGNALFX_INGEST_URL to point to your Gateway.")
-            ingest_url = 'https://ingest.signalfx.com/v1/trace'
-
-        # Establish a jaeger-client-python configuration to report spans to SignalFx
-        config = {'sampler': {'type': 'const',
-                              'param': 1},
-                  'jaeger_endpoint': ingest_url,
-                  'reporter_flush_interval': .01,
-                  'logging': False}  # Report helpful span submission statements and errors to log handler
-
-        if access_token is not None:
-            # Required static username for Access Token authentication via Basic Access
-            config.update(dict(jaeger_user='auth', jaeger_password=access_token))
-
-        config = Config(
-            config=config,
-            service_name='signalfx-lambda-python-example',
-            validate=True,  # Have jaeger_client fail quickly on invalid configuration
-        )
-
-        return config.new_tracer()
-
     def get_choice(self, event, span):
         """
         Retrieve a user's spin choice from an API Gateway request.
@@ -165,17 +134,10 @@ def spin_roulette_wheel(self, span):
         span.set_tag('position', position)
         return position
 
-    def wait_for_flushed_spans(self):
-        # Because the Jaeger client's span reporting is asynchronous via tornado, it's not possible to reliably
-        # ensure all spans have been flushed without adding a wait before using an implementation-specific
-        # best attempt.
-        time.sleep(.1)
-        while self.tracer.reporter.queue.qsize() or self.tracer.reporter._sender.span_count:
-            time.sleep(.01)
-        self.tracer.close()
-
 
-# Our registered Lambda handler entrypoint (example.request_handler)
+# Our registered Lambda handler entrypoint (example.request_handler) with the
+# SignalFx Lambda wrapper
+@signalfx_lambda.is_traced
 def request_handler(event, context):
     player = RoulettePlayer()
     return player.handle_request(event, context)

aws-lambda/jaeger-python/requirements.txt

@@ -1 +1 @@
-git+git://github.com/signalfx/jaeger-client-python@http_sender
+signalfx_lambda>=0.1.0