Automated commit

Author: Ben Sigelman

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Resonance Labs, Inc
+Copyright (c) 2015-2016 LightStep
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -14,8 +14,8 @@ pip install lightstep
 
 ## Getting Started
 
-Please see the [example programs](examples/) for examples of how to use this library.
-In particular:
+Please see the [example programs](examples/) for examples of how to use this library. In particular:
+
 * [Trivial Example](examples/trivial/main.py) shows how to use the library on a single host.
 * [Context in Headers](examples/http/context_in_headers.py) shows how to pass a `TraceContext` through `HTTP` headers.
 

VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

examples/http/context_in_headers.py

@@ -45,12 +45,9 @@ def before_sending_request(request, parent_span):
     if host:
         span.set_tag(opentracing.ext.tags.PEER_HOST_IPV4, host)
 
-    text_carrier = opentracing.SplitTextCarrier()
-    span.tracer.injector(opentracing.Format.SPLIT_TEXT).inject_span(
-        span, text_carrier)
-    for k, v in text_carrier.tracer_state.iteritems():
-        request.add_header(k, v)
-    for k, v in text_carrier.baggage.iteritems():
+    text_carrier = {}
+    span.tracer.inject(span, opentracing.Format.TEXT_MAP, text_carrier)
+    for k, v in text_carrier.iteritems():
         request.add_header(k, v)
     return span
 
@@ -59,23 +56,19 @@ def before_answering_request(handler, tracer):
     """Context manager creates a Span, using TraceContext encoded in handler if possible.
     """
     operation = 'handle_request:' + handler.path
-    text_carrier = opentracing.SplitTextCarrier()
-    plain_text_map = {}
+    text_carrier = {}
     for k, v in handler.headers.items():
-        plain_text_map[k.lower()] = v  # inefficient and possibly unnecessary...
-    text_carrier.tracer_state = plain_text_map
-    text_carrier.baggage = plain_text_map
-    span = tracer.extractor(opentracing.Format.SPLIT_TEXT).join_trace(
-        operation, text_carrier)
+        text_carrier[k] = v
+    span = tracer.join(operation, opentracing.Format.TEXT_MAP, text_carrier)
 
     if span is None:
         print 'ERROR: Context missing, starting new trace'
         global _exit_code
         _exit_code = errno.ENOMSG
         span = tracer.start_span(operation_name=operation)
         headers = ', '.join({k + '=' + v for k, v in handler.headers.items()})
-        span.log_event('extraction_failed', headers)
-        print 'Could not extract trace context from http headers: ' + headers
+        span.log_event('join_failed', headers)
+        print 'Could not join trace from http headers: ' + headers
 
     host, port = handler.client_address
     if host:

examples/trivial/main.py

@@ -33,12 +33,14 @@ def add_spans():
             child_span.set_tag('span_type', 'child')
             sleep_dot()
 
-            # To connect remote calls, pass a trace context down the wire.
-            split_text_carrier = opentracing.SplitTextCarrier()
-            opentracing.tracer.injector(opentracing.Format.SPLIT_TEXT).inject_span(
-                child_span, split_text_carrier)
-            with opentracing.tracer.extractor(opentracing.Format.SPLIT_TEXT).join_trace(
-                'trivial/remote_span', split_text_carrier) as remote_span:
+            # Play with the propagation APIs... this is not IPC and thus not
+            # where they're intended to be used.
+            text_carrier = {}
+            opentracing.tracer.inject(child_span, opentracing.Format.TEXT_MAP, text_carrier)
+            with opentracing.tracer.join(
+                    'trivia/remote_span',
+                    opentracing.Format.TEXT_MAP,
+                    text_carrier) as remote_span:
                 remote_span.log_event('Remote!')
                 remote_span.set_tag('span_type', 'remote')
                 sleep_dot()
@@ -80,10 +82,7 @@ def lightstep_tracer_from_args():
 
     # Use opentracing's default no-op implementation
     opentracing.tracer = opentracing.Tracer()
-    try:
-        add_spans()
-    finally:
-        opentracing.tracer.flush()
+    add_spans()
 
     # Use LightStep's debug tracer, which logs to the console instead of
     # reporting to LightStep.

lightstep/crouton/ttypes.py

@@ -42,6 +42,11 @@ def __init__(self,
                  max_span_records=constants.DEFAULT_MAX_SPAN_RECORDS,
                  certificate_verification=True,
                  periodic_flush_seconds=constants.FLUSH_PERIOD_SECS):
+
+        # Fail fast on a bad access token
+        if isinstance(access_token, basestring) == False:
+            raise Exception('access_token must be a string')
+
         if certificate_verification is False:
             warnings.warn('SSL CERTIFICATE VERIFICATION turned off. ALL FUTURE HTTPS calls will be unverified.')
             ssl._create_default_https_context = ssl._create_unverified_context
@@ -56,7 +61,9 @@ def __init__(self,
             ttypes.KeyValue("cruntime_version", cruntime_version.CRUNTIME_VERSION),
             ttypes.KeyValue("python_version", version),
         ]
-        self._runtime = ttypes.Runtime(guid, timestamp, group_name, attrs)
+
+        # Thrift is picky about the types being correct, so we're explicit here
+        self._runtime = ttypes.Runtime(str(guid), long(timestamp), str(group_name), attrs)
         self._service_url = util._service_url_from_hostport(secure,
                                                             service_host,
                                                             service_port)