Revert "[cassandra] Support unicode batched queries" (#739)

Author: Kyle-Verhoog

ddtrace/contrib/cassandra/session.py

@@ -9,7 +9,7 @@
 
 # project
 from ddtrace import Pin
-from ddtrace.compat import stringify, to_unicode
+from ddtrace.compat import stringify
 
 from ...utils.formats import deep_getattr
 from ...utils.deprecation import deprecated
@@ -169,7 +169,7 @@ def traced_execute_async(func, instance, args, kwargs):
 def _start_span_and_set_tags(pin, query, session, cluster):
     service = pin.service
     tracer = pin.tracer
-    span = tracer.trace(cassx.QUERY, service=service, span_type=cassx.TYPE)
+    span = tracer.trace("cassandra.query", service=service, span_type=cassx.TYPE)
     _sanitize_query(span, query)
     span.set_tags(_extract_session_metas(session))     # FIXME[matt] do once?
     span.set_tags(_extract_cluster_metas(cluster))
@@ -241,8 +241,8 @@ def _sanitize_query(span, query):
     elif t == 'BatchStatement':
         resource = 'BatchStatement'
         q = "; ".join(q[1] for q in query._statements_and_parameters[:2])
-        span.set_tag(cassx.QUERY, to_unicode(q))
-        span.set_metric(cassx.BATCH_SIZE, len(query._statements_and_parameters))
+        span.set_tag("cassandra.query", q)
+        span.set_metric("cassandra.batch_size", len(query._statements_and_parameters))
     elif t == 'BoundStatement':
         ps = getattr(query, 'prepared_statement', None)
         if ps:

ddtrace/ext/cassandra.py

@@ -9,5 +9,3 @@
 PAGINATED = "cassandra.paginated"
 ROW_COUNT = "cassandra.row_count"
 PAGE_NUMBER = "cassandra.page_number"
-QUERY = "cassandra.query"
-BATCH_SIZE = "cassandra.batch_size"

tests/contrib/cassandra/test.py

@@ -1,23 +1,21 @@
-# -*- coding: utf-8 -*-
 # stdlib
 import logging
 import unittest
 from threading import Event
 
 # 3p
+from nose.tools import eq_, ok_
+from nose.plugins.attrib import attr
 from cassandra.cluster import Cluster, ResultSet
 from cassandra.query import BatchStatement, SimpleStatement
 
 # project
-from ddtrace.compat import to_unicode
 from ddtrace.contrib.cassandra.patch import patch, unpatch
 from ddtrace.contrib.cassandra.session import get_traced_cassandra, SERVICE
 from ddtrace.ext import net, cassandra as cassx, errors
 from ddtrace import Pin
 
 # testing
-from nose.tools import eq_, ok_
-from nose.plugins.attrib import attr
 from tests.contrib.config import CASSANDRA_CONFIG
 from tests.opentracer.utils import init_tracer
 from tests.test_tracer import get_dummy_tracer
@@ -32,7 +30,6 @@
 
 logging.getLogger('cassandra').setLevel(logging.INFO)
 
-
 def setUpModule():
     # skip all the modules if the Cluster is not available
     if not Cluster:
@@ -49,7 +46,6 @@ def setUpModule():
     session.execute("INSERT INTO test.person (name, age, description) VALUES ('Athena', 100, 'Whose shield is thunder')")
     session.execute("INSERT INTO test.person (name, age, description) VALUES ('Calypso', 100, 'Softly-braided nymph')")
 
-
 def tearDownModule():
     # destroy the KEYSPACE
     cluster = Cluster(port=CASSANDRA_CONFIG['port'], connect_timeout=CONNECTION_TIMEOUT_SECS)
@@ -156,7 +152,6 @@ def execute_fn(session, query):
             event = Event()
             result = []
             future = session.execute_async(query)
-
             def callback(results):
                 result.append(ResultSet(future, results))
                 event.set()
@@ -184,7 +179,7 @@ def test_paginated_query(self):
         writer = tracer.writer
         statement = SimpleStatement(self.TEST_QUERY_PAGINATED, fetch_size=1)
         result = session.execute(statement)
-        # iterate over all pages
+        #iterate over all pages
         results = list(result)
         eq_(len(results), 3)
 
@@ -209,7 +204,7 @@ def test_paginated_query(self):
                 eq_(query.get_tag(cassx.ROW_COUNT), '1')
             eq_(query.get_tag(net.TARGET_HOST), '127.0.0.1')
             eq_(query.get_tag(cassx.PAGINATED), 'True')
-            eq_(query.get_tag(cassx.PAGE_NUMBER), str(i + 1))
+            eq_(query.get_tag(cassx.PAGE_NUMBER), str(i+1))
 
     def test_trace_with_service(self):
         session, tracer = self._traced_session()
@@ -221,22 +216,6 @@ def test_trace_with_service(self):
         query = spans[0]
         eq_(query.service, self.TEST_SERVICE)
 
-    def test_unicode_batch_statement(self):
-        # ensure that unicode included in queries is properly handled
-        session, tracer = self._traced_session()
-
-        batch = BatchStatement()
-        query = 'INSERT INTO test.person_write (name, age, description) VALUES (%s, %s, %s)'
-        batch.add(SimpleStatement(query), ('Joe', 1, '好'))
-        session.execute(batch)
-
-        spans = tracer.writer.pop()
-        eq_(len(spans), 1)
-        s = spans[0]
-        eq_(s.resource, 'BatchStatement')
-        eq_(s.get_metric('cassandra.batch_size'), 1)
-        eq_(s.get_tag(cassx.QUERY), to_unicode('INSERT INTO test.person_write (name, age, description) VALUES (\'Joe\', 1, \'好\')'))
-
     def test_trace_error(self):
         session, tracer = self._traced_session()
         writer = tracer.writer

tests/test_compat.py

@@ -6,7 +6,7 @@
 from nose.tools import eq_, ok_, assert_raises
 
 # Project
-from ddtrace.compat import to_unicode, PY2, reraise, get_connection_response, stringify
+from ddtrace.compat import to_unicode, PY2, reraise, get_connection_response
 
 
 # Use different test suites for each Python version, this allows us to test the expected
@@ -71,12 +71,6 @@ def getresponse(self, *args, **kwargs):
             mock = MockConn()
             get_connection_response(mock)
 
-        def test_stringify_unicode(self):
-            # ensure stringify can handle decoding strings that have been to_unicode()'d
-            stringify(to_unicode('€'))
-            stringify(to_unicode('\xc3\xbf'))
-            stringify(to_unicode('好'))
-
 else:
     class TestCompatPY3(object):
         def test_to_unicode_string(self):
@@ -130,7 +124,7 @@ def test_reraise(self):
         with assert_raises(Exception) as ex:
             try:
                 raise Exception('Ouch!')
-            except Exception:
+            except Exception as e:
                 # original exception we want to re-raise
                 (typ, val, tb) = sys.exc_info()
                 try: