remove opentracing tests

Author: mauriciovasquezbernal

.circleci/config.yml

@@ -99,17 +99,6 @@ jobs:
       - *persist_to_workspace_step
       - *save_cache_step
 
-  opentracer:
-    docker:
-      - *test_runner
-    resource_class: *resource_class
-    steps:
-      - checkout
-      - *restore_cache_step
-      - run: scripts/run-tox-scenario '^py..-opentracer'
-      - *persist_to_workspace_step
-      - *save_cache_step
-
   integration:
     docker:
       - <<: *test_runner
@@ -917,9 +906,6 @@ workflows:
       - mysqlpython:
           requires:
             - flake8
-      - opentracer:
-          requires:
-            - flake8
       - psycopg:
           requires:
             - flake8
@@ -1016,7 +1002,6 @@ workflows:
             - mysqlconnector
             - mysqldb
             - mysqlpython
-            - opentracer
             - psycopg
             - pylibmc
             - pylons

setup.py

@@ -90,11 +90,6 @@ def run_tests(self):
 )
 
 
-# The following from here to the end of the file is borrowed from wrapt's and msgpack's `setup.py`:
-#   https://github.com/GrahamDumpleton/wrapt/blob/4ee35415a4b0d570ee6a9b3a14a6931441aeab4b/setup.py
-#   https://github.com/msgpack/msgpack-python/blob/381c2eff5f8ee0b8669fd6daf1fd1ecaffe7c931/setup.py
-# These helpers are useful for attempting build a C-extension and then retrying without it if it fails
-
 libraries = []
 if sys.platform == 'win32':
     libraries.append('ws2_32')

tests/contrib/aiobotocore/test.py

@@ -236,82 +236,3 @@ def test_double_patch(self):
         traces = self.tracer.writer.pop_traces()
         self.assertEqual(len(traces), 1)
         self.assertEqual(len(traces[0]), 1)
-
-    @mark_asyncio
-    def test_opentraced_client(self):
-        from tests.opentracer.utils import init_tracer
-
-        ot_tracer = init_tracer('my_svc', self.tracer)
-
-        with ot_tracer.start_active_span('ot_outer_span'):
-            with aiobotocore_client('ec2', self.tracer) as ec2:
-                yield from ec2.describe_instances()
-
-        traces = self.tracer.writer.pop_traces()
-        print(traces)
-        self.assertEqual(len(traces), 1)
-        self.assertEqual(len(traces[0]), 2)
-        ot_span = traces[0][0]
-        dd_span = traces[0][1]
-
-        self.assertEqual(ot_span.resource, 'ot_outer_span')
-        self.assertEqual(ot_span.service, 'my_svc')
-
-        # confirm the parenting
-        self.assertEqual(ot_span.parent_id, None)
-        self.assertEqual(dd_span.parent_id, ot_span.span_id)
-
-        self.assertEqual(dd_span.get_tag('aws.agent'), 'aiobotocore')
-        self.assertEqual(dd_span.get_tag('aws.region'), 'us-west-2')
-        self.assertEqual(dd_span.get_tag('aws.operation'), 'DescribeInstances')
-        self.assertEqual(dd_span.get_tag('http.status_code'), '200')
-        self.assertEqual(dd_span.get_tag('retry_attempts'), '0')
-        self.assertEqual(dd_span.service, 'aws.ec2')
-        self.assertEqual(dd_span.resource, 'ec2.describeinstances')
-        self.assertEqual(dd_span.name, 'ec2.command')
-
-    @mark_asyncio
-    def test_opentraced_s3_client(self):
-        from tests.opentracer.utils import init_tracer
-
-        ot_tracer = init_tracer('my_svc', self.tracer)
-
-        with ot_tracer.start_active_span('ot_outer_span'):
-            with aiobotocore_client('s3', self.tracer) as s3:
-                yield from s3.list_buckets()
-                with ot_tracer.start_active_span('ot_inner_span1'):
-                    yield from s3.list_buckets()
-                with ot_tracer.start_active_span('ot_inner_span2'):
-                    pass
-
-        traces = self.tracer.writer.pop_traces()
-        self.assertEqual(len(traces), 1)
-        self.assertEqual(len(traces[0]), 5)
-        ot_outer_span = traces[0][0]
-        dd_span = traces[0][1]
-        ot_inner_span = traces[0][2]
-        dd_span2 = traces[0][3]
-        ot_inner_span2 = traces[0][4]
-
-        self.assertEqual(ot_outer_span.resource, 'ot_outer_span')
-        self.assertEqual(ot_inner_span.resource, 'ot_inner_span1')
-        self.assertEqual(ot_inner_span2.resource, 'ot_inner_span2')
-
-        # confirm the parenting
-        self.assertEqual(ot_outer_span.parent_id, None)
-        self.assertEqual(dd_span.parent_id, ot_outer_span.span_id)
-        self.assertEqual(ot_inner_span.parent_id, ot_outer_span.span_id)
-        self.assertEqual(dd_span2.parent_id, ot_inner_span.span_id)
-        self.assertEqual(ot_inner_span2.parent_id, ot_outer_span.span_id)
-
-        self.assertEqual(dd_span.get_tag('aws.operation'), 'ListBuckets')
-        self.assertEqual(dd_span.get_tag('http.status_code'), '200')
-        self.assertEqual(dd_span.service, 'aws.s3')
-        self.assertEqual(dd_span.resource, 's3.listbuckets')
-        self.assertEqual(dd_span.name, 's3.command')
-
-        self.assertEqual(dd_span2.get_tag('aws.operation'), 'ListBuckets')
-        self.assertEqual(dd_span2.get_tag('http.status_code'), '200')
-        self.assertEqual(dd_span2.service, 'aws.s3')
-        self.assertEqual(dd_span2.resource, 's3.listbuckets')
-        self.assertEqual(dd_span2.name, 's3.command')

tests/contrib/aiohttp/test_middleware.py

@@ -7,8 +7,6 @@
 from ddtrace.sampler import RateSampler
 from ddtrace.constants import SAMPLING_PRIORITY_KEY, ANALYTICS_SAMPLE_RATE_KEY
 
-from opentracing.scope_managers.asyncio import AsyncioScopeManager
-from tests.opentracer.utils import init_tracer
 from .utils import TraceTestCase
 from .app.web import setup_app, noop_middleware
 
@@ -436,21 +434,6 @@ def test_parenting_200_dd(self):
         traces = self.tracer.writer.pop_traces()
         self._assert_200_parenting(traces)
 
-    @unittest_run_loop
-    @asyncio.coroutine
-    def test_parenting_200_ot(self):
-        """OpenTracing version of test_handler."""
-        ot_tracer = init_tracer('aiohttp_svc', self.tracer, scope_manager=AsyncioScopeManager())
-
-        with ot_tracer.start_active_span('aiohttp_op'):
-            request = yield from self.client.request('GET', '/')
-            assert 200 == request.status
-            text = yield from request.text()
-
-        assert "What's tracing?" == text
-        traces = self.tracer.writer.pop_traces()
-        self._assert_200_parenting(traces)
-
     @unittest_run_loop
     @asyncio.coroutine
     def test_analytics_integration_enabled(self):

tests/contrib/aiopg/test.py

@@ -12,7 +12,6 @@
 from ddtrace import Pin
 
 # testing
-from tests.opentracer.utils import init_tracer
 from tests.contrib.config import POSTGRES_CONFIG
 from tests.test_tracer import get_dummy_tracer
 from tests.contrib.asyncio.utils import AsyncioTestCase, mark_asyncio
@@ -77,28 +76,6 @@ def assert_conn_is_traced(self, tracer, db, service):
         assert start <= span.start <= end
         assert span.duration <= end - start
 
-        # Ensure OpenTracing compatibility
-        ot_tracer = init_tracer('aiopg_svc', tracer)
-        with ot_tracer.start_active_span('aiopg_op'):
-            cursor = yield from db.cursor()
-            yield from cursor.execute(q)
-            rows = yield from cursor.fetchall()
-            assert rows == [('foobarblah',)]
-        spans = writer.pop()
-        assert len(spans) == 2
-        ot_span, dd_span = spans
-        # confirm the parenting
-        assert ot_span.parent_id is None
-        assert dd_span.parent_id == ot_span.span_id
-        assert ot_span.name == 'aiopg_op'
-        assert ot_span.service == 'aiopg_svc'
-        assert dd_span.name == 'postgres.query'
-        assert dd_span.resource == q
-        assert dd_span.service == service
-        assert dd_span.meta['sql.query'] == q
-        assert dd_span.error == 0
-        assert dd_span.span_type == 'sql'
-
         # run a query with an error and ensure all is well
         q = 'select * from some_non_existant_table'
         cur = yield from db.cursor()

tests/contrib/asyncio/test_tracer.py

@@ -9,7 +9,6 @@
 from ddtrace.contrib.asyncio.patch import patch, unpatch
 from ddtrace.contrib.asyncio.helpers import set_call_context
 
-from tests.opentracer.utils import init_tracer
 from .utils import AsyncioTestCase, mark_asyncio
 
 
@@ -336,57 +335,3 @@ def test_event_loop_double_patch(self):
         # the event loop
         patch()
         self.test_tasks_chaining()
-
-    @mark_asyncio
-    def test_trace_multiple_coroutines_ot_outer(self):
-        """OpenTracing version of test_trace_multiple_coroutines."""
-        # if multiple coroutines have nested tracing, they must belong
-        # to the same trace
-        @asyncio.coroutine
-        def coro():
-            # another traced coroutine
-            with self.tracer.trace('coroutine_2'):
-                return 42
-
-        ot_tracer = init_tracer('asyncio_svc', self.tracer)
-        with ot_tracer.start_active_span('coroutine_1'):
-            value = yield from coro()
-
-        # the coroutine has been called correctly
-        assert 42 == value
-        # a single trace has been properly reported
-        traces = self.tracer.writer.pop_traces()
-        assert 1 == len(traces)
-        assert 2 == len(traces[0])
-        assert 'coroutine_1' == traces[0][0].name
-        assert 'coroutine_2' == traces[0][1].name
-        # the parenting is correct
-        assert traces[0][0] == traces[0][1]._parent
-        assert traces[0][0].trace_id == traces[0][1].trace_id
-
-    @mark_asyncio
-    def test_trace_multiple_coroutines_ot_inner(self):
-        """OpenTracing version of test_trace_multiple_coroutines."""
-        # if multiple coroutines have nested tracing, they must belong
-        # to the same trace
-        ot_tracer = init_tracer('asyncio_svc', self.tracer)
-        @asyncio.coroutine
-        def coro():
-            # another traced coroutine
-            with ot_tracer.start_active_span('coroutine_2'):
-                return 42
-
-        with self.tracer.trace('coroutine_1'):
-            value = yield from coro()
-
-        # the coroutine has been called correctly
-        assert 42 == value
-        # a single trace has been properly reported
-        traces = self.tracer.writer.pop_traces()
-        assert 1 == len(traces)
-        assert 2 == len(traces[0])
-        assert 'coroutine_1' == traces[0][0].name
-        assert 'coroutine_2' == traces[0][1].name
-        # the parenting is correct
-        assert traces[0][0] == traces[0][1]._parent
-        assert traces[0][0].trace_id == traces[0][1].trace_id

tests/contrib/boto/test.py

@@ -16,7 +16,6 @@
 
 # testing
 from unittest import skipUnless
-from tests.opentracer.utils import init_tracer
 from ...base import BaseTracerTestCase
 
 
@@ -261,49 +260,3 @@ def test_elasticache_client(self):
         self.assertEqual(span.get_tag('aws.region'), 'us-west-2')
         self.assertEqual(span.service, 'test-boto-tracing.elasticache')
         self.assertEqual(span.resource, 'elasticache')
-
-    @mock_ec2
-    def test_ec2_client_ot(self):
-        """OpenTracing compatibility check of the test_ec2_client test."""
-
-        ec2 = boto.ec2.connect_to_region('us-west-2')
-
-        ot_tracer = init_tracer('my_svc', self.tracer)
-        writer = self.tracer.writer
-        Pin(service=self.TEST_SERVICE, tracer=self.tracer).onto(ec2)
-
-        with ot_tracer.start_active_span('ot_span'):
-            ec2.get_all_instances()
-        spans = writer.pop()
-        assert spans
-        self.assertEqual(len(spans), 2)
-        ot_span, dd_span = spans
-
-        # confirm the parenting
-        self.assertIsNone(ot_span.parent_id)
-        self.assertEqual(dd_span.parent_id, ot_span.span_id)
-
-        self.assertEqual(ot_span.resource, 'ot_span')
-        self.assertEqual(dd_span.get_tag('aws.operation'), 'DescribeInstances')
-        self.assertEqual(dd_span.get_tag(http.STATUS_CODE), '200')
-        self.assertEqual(dd_span.get_tag(http.METHOD), 'POST')
-        self.assertEqual(dd_span.get_tag('aws.region'), 'us-west-2')
-
-        with ot_tracer.start_active_span('ot_span'):
-            ec2.run_instances(21)
-        spans = writer.pop()
-        assert spans
-        self.assertEqual(len(spans), 2)
-        ot_span, dd_span = spans
-
-        # confirm the parenting
-        self.assertIsNone(ot_span.parent_id)
-        self.assertEqual(dd_span.parent_id, ot_span.span_id)
-
-        self.assertEqual(dd_span.get_tag('aws.operation'), 'RunInstances')
-        self.assertEqual(dd_span.get_tag(http.STATUS_CODE), '200')
-        self.assertEqual(dd_span.get_tag(http.METHOD), 'POST')
-        self.assertEqual(dd_span.get_tag('aws.region'), 'us-west-2')
-        self.assertEqual(dd_span.service, 'test-boto-tracing.ec2')
-        self.assertEqual(dd_span.resource, 'ec2.runinstances')
-        self.assertEqual(dd_span.name, 'ec2.command')

tests/contrib/botocore/test.py

@@ -10,7 +10,6 @@
 from ddtrace.compat import stringify
 
 # testing
-from tests.opentracer.utils import init_tracer
 from ...base import BaseTracerTestCase
 
 
@@ -215,35 +214,3 @@ def test_kms_client(self):
 
         # checking for protection on sts against security leak
         self.assertIsNone(span.get_tag('params'))
-
-    @mock_ec2
-    def test_traced_client_ot(self):
-        """OpenTracing version of test_traced_client."""
-        ot_tracer = init_tracer('ec2_svc', self.tracer)
-
-        with ot_tracer.start_active_span('ec2_op'):
-            ec2 = self.session.create_client('ec2', region_name='us-west-2')
-            Pin(service=self.TEST_SERVICE, tracer=self.tracer).onto(ec2)
-            ec2.describe_instances()
-
-        spans = self.get_spans()
-        assert spans
-        self.assertEqual(len(spans), 2)
-
-        ot_span, dd_span = spans
-
-        # confirm the parenting
-        self.assertIsNone(ot_span.parent_id)
-        self.assertEqual(dd_span.parent_id, ot_span.span_id)
-
-        self.assertEqual(ot_span.name, 'ec2_op')
-        self.assertEqual(ot_span.service, 'ec2_svc')
-
-        self.assertEqual(dd_span.get_tag('aws.agent'), 'botocore')
-        self.assertEqual(dd_span.get_tag('aws.region'), 'us-west-2')
-        self.assertEqual(dd_span.get_tag('aws.operation'), 'DescribeInstances')
-        self.assertEqual(dd_span.get_tag(http.STATUS_CODE), '200')
-        self.assertEqual(dd_span.get_tag('retry_attempts'), '0')
-        self.assertEqual(dd_span.service, 'test-botocore-tracing.ec2')
-        self.assertEqual(dd_span.resource, 'ec2.describeinstances')
-        self.assertEqual(dd_span.name, 'ec2.command')