Revert "MySQLdb Instrumentation (mysql-python) (#84)" (#86)

This reverts commit 9424b6a.

Author: pglombardo

.travis.yml

@@ -1,18 +1,9 @@
 language: python
-
 python:
   - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
-
-before_install:
-  - "pip install --upgrade pip"
-  - "pip install --upgrade setuptools"
-  - 'mysql -e 'CREATE DATABASE travis_ci_test;'
-
 install: "pip install -r requirements-test.txt"
-
-
 script: nosetests -v

instana/__init__.py

@@ -56,5 +56,4 @@ def load(module):
     # noqa: ignore=W0611
     from .instrumentation import urllib3  # noqa
     from .instrumentation import sudsjurko  # noqa
-    from .instrumentation import mysqlpython  # noqa
     from .instrumentation.django import middleware  # noqa

instana/instrumentation/mysqlpython.py

@@ -16,7 +16,7 @@ def finish(self, finish_time=None):
         super(InstanaSpan, self).finish(finish_time)
 
     def log_exception(self, e):
-        if hasattr(e, 'message') and len(e.message):
+        if hasattr(e, 'message'):
             self.log_kv({'message': e.message})
         elif hasattr(e, '__str__'):
             self.log_kv({'message': e.__str__()})

instana/instrumentation/pep0249.py

@@ -26,11 +26,10 @@
         'test': [
             'nose>=1.0',
             'flask>=0.12.2',
-            'lxml>=3.4',
-            'MySQL-python>=1.2.5;python_version<="2.7"',
             'requests>=2.17.1',
             'urllib3[secure]>=1.15',
             'spyne>=2.9',
+            'lxml>=3.4',
             'suds-jurko>=0.6'
         ],
       },

instana/span.py

@@ -13,23 +13,23 @@
 # Spawn our background Flask app that the tests will throw
 # requests at.  Don't continue until the test app is fully
 # up and running.
-flask = threading.Thread(target=flaskalino.run)
-flask.daemon = True
-flask.name = "Background Flask app"
+timer = threading.Thread(target=flaskalino.run)
+timer.daemon = True
+timer.name = "Background Flask app"
 print("Starting background Flask app...")
-flask.start()
+timer.start()
 
 
 # Background Soap Server
 #
 # Spawn our background Flask app that the tests will throw
 # requests at.  Don't continue until the test app is fully
 # up and running.
-soap = threading.Thread(target=soapserver.serve_forever)
-soap.daemon = True
-soap.name = "Background Soap server"
+timer = threading.Thread(target=soapserver.serve_forever)
+timer.daemon = True
+timer.name = "Background Soap server"
 print("Starting background Soap server...")
-soap.start()
+timer.start()
 
 
 time.sleep(1)

setup.py

@@ -41,21 +41,18 @@ def client_fault(ctx):
 
 
 
-# logging.basicConfig(level=logging.WARN)
-logging.getLogger('suds').setLevel(logging.WARN)
-logging.getLogger('suds.resolver').setLevel(logging.WARN)
-logging.getLogger('spyne.protocol.xml').setLevel(logging.WARN)
-logging.getLogger('spyne.model.complex').setLevel(logging.WARN)
-logging.getLogger('spyne.interface._base').setLevel(logging.WARN)
-logging.getLogger('spyne.interface.xml').setLevel(logging.WARN)
-logging.getLogger('spyne.util.appreg').setLevel(logging.WARN)
-
 app = Application([StanSoapService], 'instana.tests.app.ask_question',
                   in_protocol=Soap11(validator='lxml'), out_protocol=Soap11())
 
 # Use Instana middleware so we can test context passing and Soap server traces.
 wsgi_app = iWSGIMiddleware(WsgiApplication(app))
 soapserver = make_server('127.0.0.1', 4132, wsgi_app)
 
+logging.basicConfig(level=logging.WARN)
+logging.getLogger('suds').setLevel(logging.WARN)
+logging.getLogger('suds.resolver').setLevel(logging.WARN)
+logging.getLogger('spyne.protocol.xml').setLevel(logging.WARN)
+logging.getLogger('spyne.model.complex').setLevel(logging.WARN)
+
 if __name__ == '__main__':
     soapserver.serve_forever()