Merge pull request #835 from DataDog/0.22-dev

Release 0.22.0

Author: brettlangdon

ddtrace/__init__.py

@@ -4,7 +4,7 @@
 from .tracer import Tracer
 from .settings import config
 
-__version__ = '0.21.1'
+__version__ = '0.22.0'
 
 # a global tracer instance with integration settings
 tracer = Tracer()

ddtrace/compat.py

@@ -2,7 +2,7 @@
 import sys
 import textwrap
 
-import six
+from ddtrace.vendor import six
 
 __all__ = [
     'httplib',

ddtrace/constants.py

@@ -1,6 +1,7 @@
 FILTERS_KEY = 'FILTERS'
 SAMPLE_RATE_METRIC_KEY = '_sample_rate'
 SAMPLING_PRIORITY_KEY = '_sampling_priority_v1'
+ORIGIN_KEY = '_dd.origin'
 EVENT_SAMPLE_RATE_KEY = '_dd1.sr.eausr'
 
 NUMERIC_TAGS = (EVENT_SAMPLE_RATE_KEY, )

ddtrace/context.py

@@ -1,7 +1,7 @@
 import logging
 import threading
 
-from .constants import SAMPLING_PRIORITY_KEY
+from .constants import SAMPLING_PRIORITY_KEY, ORIGIN_KEY
 from .utils.formats import asbool, get_env
 
 log = logging.getLogger(__name__)
@@ -25,7 +25,7 @@ class Context(object):
     _partial_flush_enabled = asbool(get_env('tracer', 'partial_flush_enabled', 'false'))
     _partial_flush_min_spans = int(get_env('tracer', 'partial_flush_min_spans', 500))
 
-    def __init__(self, trace_id=None, span_id=None, sampled=True, sampling_priority=None):
+    def __init__(self, trace_id=None, span_id=None, sampled=True, sampling_priority=None, _dd_origin=None):
         """
         Initialize a new thread-safe ``Context``.
 
@@ -41,6 +41,7 @@ def __init__(self, trace_id=None, span_id=None, sampled=True, sampling_priority=
         self._parent_span_id = span_id
         self._sampled = sampled
         self._sampling_priority = sampling_priority
+        self._dd_origin = _dd_origin
 
     @property
     def trace_id(self):
@@ -184,6 +185,10 @@ def get(self):
                 # attach the sampling priority to the context root span
                 if sampled and sampling_priority is not None and trace:
                     trace[0].set_metric(SAMPLING_PRIORITY_KEY, sampling_priority)
+                origin = self._dd_origin
+                # attach the origin to the root span tag
+                if sampled and origin is not None and trace:
+                    trace[0].set_tag(ORIGIN_KEY, origin)
 
                 # clean the current state
                 self._trace = []
@@ -202,6 +207,10 @@ def get(self):
                 # attach the sampling priority to the context root span
                 if sampled and sampling_priority is not None and trace:
                     trace[0].set_metric(SAMPLING_PRIORITY_KEY, sampling_priority)
+                origin = self._dd_origin
+                # attach the origin to the root span tag
+                if sampled and origin is not None and trace:
+                    trace[0].set_tag(ORIGIN_KEY, origin)
 
                 # Any open spans will remain as `self._trace`
                 # Any finished spans will get returned to be flushed

ddtrace/contrib/aiobotocore/patch.py

@@ -1,5 +1,5 @@
 import asyncio
-import wrapt
+from ddtrace.vendor import wrapt
 import aiobotocore.client
 
 from aiobotocore.endpoint import ClientResponseContentProxy

ddtrace/contrib/aiohttp/patch.py

@@ -1,4 +1,4 @@
-import wrapt
+from ddtrace.vendor import wrapt
 
 from ...pin import Pin
 from ...utils.wrappers import unwrap

ddtrace/contrib/aiopg/connection.py

@@ -1,5 +1,5 @@
 import asyncio
-import wrapt
+from ddtrace.vendor import wrapt
 
 from aiopg.utils import _ContextManager
 

ddtrace/contrib/aiopg/patch.py

@@ -3,7 +3,7 @@
 
 import aiopg.connection
 import psycopg2.extensions
-import wrapt
+from ddtrace.vendor import wrapt
 
 from .connection import AIOTracedConnection
 from ..psycopg.patch import _patch_extensions, \

ddtrace/contrib/asyncio/patch.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from wrapt import wrap_function_wrapper as _w
+from ddtrace.vendor.wrapt import wrap_function_wrapper as _w
 
 from .helpers import _wrapped_create_task
 from ...utils.wrappers import unwrap as _u

ddtrace/contrib/boto/patch.py

@@ -1,5 +1,5 @@
 import boto.connection
-import wrapt
+from ddtrace.vendor import wrapt
 import inspect
 
 from ...pin import Pin
@@ -105,10 +105,15 @@ def patched_auth_request(original_func, instance, args, kwargs):
 
     # Catching the name of the operation that called make_request()
     operation_name = None
+
+    # Go up the stack until we get the first non-ddtrace module
+    # DEV: For `lambda.list_functions()` this should be:
+    #        - ddtrace.contrib.boto.patch
+    #        - ddtrace.vendor.wrapt.wrappers
+    #        - boto.awslambda.layer1 (make_request)
+    #        - boto.awslambda.layer1 (list_functions)
     frame = inspect.currentframe()
-    # go up the call stack twice to get into the boto frame
-    boto_frame = frame.f_back.f_back
-    operation_name = boto_frame.f_code.co_name
+    operation_name = frame.f_back.f_back.f_back.f_code.co_name
 
     pin = Pin.get_from(instance)
     if not pin or not pin.enabled():