Merge branch '0.24-dev' into remove-nose

Author: jd

.circleci/config.yml

@@ -253,13 +253,11 @@ jobs:
     steps:
       - checkout
       - *restore_cache_step
-      - run: tox -e 'aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl' --result-json /tmp/aiohttp.1.results
-      - run: tox -e 'aiohttp_contrib-{py34,py35,py36}-aiohttp{23}-aiohttp_jinja{015}-yarl10' --result-json /tmp/aiohttp.2.results
+      - run: tox -e 'aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl,aiohttp_contrib-{py34,py35,py36}-aiohttp23-aiohttp_jinja015-yarl10,aiohttp_contrib-{py35,py36}-aiohttp{30,31,32,33,34,35}-aiohttp_jinja015-yarl10' --result-json /tmp/aiohttp.results
       - persist_to_workspace:
           root: /tmp
           paths:
-            - aiohttp.1.results
-            - aiohttp.2.results
+            - aiohttp.results
       - *save_cache_step
 
   tornado:

README.md

@@ -46,29 +46,9 @@ launch them through:
 [docker-compose]: https://www.docker.com/products/docker-compose
 
 
-#### Running the Tests in your local environment
-
-Once docker is up and running you should be able to run the tests. To launch a
-single test manually. For example to run the tests for `redis-py` 2.10 on Python
-3.5 and 3.6:
-
-    $ tox -e '{py35,py36}-redis{210}'
-
-To see the defined test commands see `tox.ini`.
-
-To launch the complete test matrix run:
-
-    $ tox
-
-
 #### Running Tests in docker
 
-If you prefer not to setup your local machine to run tests, we provide a preconfigured docker image.
-Note that this image is the same used in CircleCI to run tests.
-
-You still need docker containers running additional services up and running.
-
-Run the test runner
+Once your docker-compose environment is running, you can run the test runner image:
 
     $ docker-compose run --rm testrunner
 

ddtrace/sampler.py

@@ -38,7 +38,7 @@ def __init__(self, sample_rate=1):
 
         self.set_sample_rate(sample_rate)
 
-        log.info("initialized RateSampler, sample %s%% of traces", 100 * sample_rate)
+        log.debug("initialized RateSampler, sample %s%% of traces", 100 * sample_rate)
 
     def set_sample_rate(self, sample_rate):
         self.sample_rate = sample_rate

tests/contrib/aiohttp/app/web.py

@@ -94,6 +94,7 @@ def delayed_handler(request):
 
 @asyncio.coroutine
 def noop_middleware(app, handler):
+    @asyncio.coroutine
     def middleware_handler(request):
         # noop middleware
         response = yield from handler(request)

tests/contrib/aiohttp/test_request_safety.py

@@ -67,14 +67,13 @@ def make_requests():
         ctx = self.tracer.get_call_context()
         threads = [threading.Thread(target=make_requests) for _ in range(10)]
         for t in threads:
-            t.daemon = True
             t.start()
 
-        # we should yield so that this loop can handle
-        # threads' requests
-        yield from asyncio.sleep(0.5)
         for t in threads:
-            t.join(timeout=0.5)
+            # we should yield so that this loop can handle
+            # threads' requests
+            yield from asyncio.sleep(0.1)
+            t.join(0.1)
 
         # the trace is wrong but the Context is finished
         traces = self.tracer.writer.pop_traces()

tests/opentracer/test_tracer_asyncio.py

@@ -8,37 +8,34 @@
 from ddtrace.opentracer.utils import get_context_provider_for_scope_manager
 
 from tests.contrib.asyncio.utils import AsyncioTestCase, mark_asyncio
-from .conftest import dd_tracer, ot_tracer_factory, writer
+from .conftest import ot_tracer_factory
 
 
 @pytest.fixture()
-def ot_tracer(ot_tracer_factory):
-    return ot_tracer_factory(
+def ot_tracer(request, ot_tracer_factory):
+    # use the dummy asyncio ot tracer
+    request.instance.ot_tracer = ot_tracer_factory(
         "asyncio_svc",
         config={},
         scope_manager=AsyncioScopeManager(),
         context_provider=ddtrace.contrib.asyncio.context_provider,
     )
+    request.instance.ot_writer = request.instance.ot_tracer._dd_tracer.writer
+    request.instance.dd_tracer = request.instance.ot_tracer._dd_tracer
 
-
+@pytest.mark.usefixtures("ot_tracer")
 class TestTracerAsyncio(AsyncioTestCase):
-    def setUp(self):
-        super(TestTracerAsyncio, self).setUp()
-
-        # use the dummy asyncio ot tracer
-        self.tracer = ot_tracer(ot_tracer_factory())
-        self.writer = writer(self.tracer)
 
     def reset(self):
-        self.writer.pop_traces()
+        self.ot_writer.pop_traces()
 
     @mark_asyncio
     def test_trace_coroutine(self):
         # it should use the task context when invoked in a coroutine
-        with self.tracer.start_span("coroutine"):
+        with self.ot_tracer.start_span("coroutine"):
             pass
 
-        traces = self.writer.pop_traces()
+        traces = self.ot_writer.pop_traces()
 
         assert len(traces) == 1
         assert len(traces[0]) == 1
@@ -51,16 +48,16 @@ def test_trace_multiple_coroutines(self):
         @asyncio.coroutine
         def coro():
             # another traced coroutine
-            with self.tracer.start_active_span("coroutine_2"):
+            with self.ot_tracer.start_active_span("coroutine_2"):
                 return 42
 
-        with self.tracer.start_active_span("coroutine_1"):
+        with self.ot_tracer.start_active_span("coroutine_1"):
             value = yield from coro()
 
         # the coroutine has been called correctly
         assert value == 42
         # a single trace has been properly reported
-        traces = self.writer.pop_traces()
+        traces = self.ot_writer.pop_traces()
         assert len(traces) == 1
         assert len(traces[0]) == 2
         assert traces[0][0].name == "coroutine_1"
@@ -73,13 +70,13 @@ def coro():
     def test_exception(self):
         @asyncio.coroutine
         def f1():
-            with self.tracer.start_span("f1"):
+            with self.ot_tracer.start_span("f1"):
                 raise Exception("f1 error")
 
         with pytest.raises(Exception):
             yield from f1()
 
-        traces = self.writer.pop_traces()
+        traces = self.ot_writer.pop_traces()
         assert len(traces) == 1
         spans = traces[0]
         assert len(spans) == 1
@@ -95,29 +92,24 @@ def test_trace_multiple_calls(self):
         @asyncio.coroutine
         def coro():
             # another traced coroutine
-            with self.tracer.start_span("coroutine"):
+            with self.ot_tracer.start_span("coroutine"):
                 yield from asyncio.sleep(0.01)
 
         futures = [asyncio.ensure_future(coro()) for x in range(10)]
         for future in futures:
             yield from future
 
-        traces = self.writer.pop_traces()
+        traces = self.ot_writer.pop_traces()
 
         assert len(traces) == 10
         assert len(traces[0]) == 1
         assert traces[0][0].name == "coroutine"
 
 
+@pytest.mark.usefixtures("ot_tracer")
 class TestTracerAsyncioCompatibility(AsyncioTestCase):
     """Ensure the opentracer works in tandem with the ddtracer and asyncio."""
 
-    def setUp(self):
-        super(TestTracerAsyncioCompatibility, self).setUp()
-        self.ot_tracer = ot_tracer(ot_tracer_factory())
-        self.dd_tracer = dd_tracer(self.ot_tracer)
-        self.writer = writer(self.ot_tracer)
-
     @mark_asyncio
     def test_trace_multiple_coroutines_ot_dd(self):
         """

tox.ini

@@ -38,7 +38,8 @@ envlist =
     aiobotocore_contrib-py34-aiobotocore{02,03,04}
     aiobotocore_contrib-{py35,py36}-aiobotocore{02,03,04,05,07,08,09,010}
     aiohttp_contrib-{py34,py35,py36}-aiohttp{12,13,20,21,22}-aiohttp_jinja{012,013}-yarl
-    aiohttp_contrib-{py34,py35,py36}-aiohttp{23}-aiohttp_jinja{015}-yarl10
+    aiohttp_contrib-{py34,py35,py36}-aiohttp23-aiohttp_jinja{015}-yarl10
+    aiohttp_contrib-{py35,py36}-aiohttp{30,31,32,33,34,35}-aiohttp_jinja{015}-yarl10
     aiopg_contrib-{py34,py35,py36}-aiopg{012,015}
     asyncio_contrib-{py34,py35,py36}
     boto_contrib-{py27,py34}-boto
@@ -127,7 +128,7 @@ deps =
 # distribution build.
     !ddtracerun: wrapt
     !msgpack03-!msgpack04-!msgpack05-!ddtracerun: msgpack-python
-    pytest>=3.0.0,<4.0.0
+    pytest>=3
     opentracing
 # test dependencies installed in all envs
     mock
@@ -155,6 +156,12 @@ deps =
     aiohttp21: aiohttp>=2.1,<2.2
     aiohttp22: aiohttp>=2.2,<2.3
     aiohttp23: aiohttp>=2.3,<2.4
+    aiohttp30: aiohttp>=3.0,<3.1
+    aiohttp31: aiohttp>=3.1,<3.2
+    aiohttp32: aiohttp>=3.2,<3.3
+    aiohttp33: aiohttp>=3.3,<3.4
+    aiohttp34: aiohttp>=3.4,<3.5
+    aiohttp35: aiohttp>=3.5,<3.6
     aiohttp_jinja012: aiohttp_jinja2>=0.12,<0.13
     aiohttp_jinja013: aiohttp_jinja2>=0.13,<0.14
     aiohttp_jinja015: aiohttp_jinja2>=0.15,<0.16