Have instrumentation always use internal_tracer

Author: pglombardo

instana/django.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 import opentracing as ot
-from instana import tracer, options
+from instana import internal_tracer
 import opentracing.ext.tags as ext
 import os
 
@@ -12,17 +12,15 @@ class InstanaMiddleware(object):
     """ Django Middleware to provide request tracing for Instana """
     def __init__(self, get_response):
         self.get_response = get_response
-        opts = options.Options(service="Django")
-        ot.tracer = tracer.InstanaTracer(opts)
         self
 
     def __call__(self, request):
         env = request.environ
         if 'HTTP_X_INSTANA_T' in env and 'HTTP_X_INSTANA_S' in env:
-            ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, env)
-            span = ot.tracer.start_span("django", child_of=ctx)
+            ctx = internal_tracer.extract(ot.Format.HTTP_HEADERS, env)
+            span = internal_tracer.start_span("django", child_of=ctx)
         else:
-            span = ot.tracer.start_span("django")
+            span = internal_tracer.start_span("django")
 
         span.set_tag(ext.HTTP_URL, env['PATH_INFO'])
         span.set_tag("http.params", env['QUERY_STRING'])
@@ -37,7 +35,7 @@ def __call__(self, request):
             span.set_tag("ec", ec+1)
 
         span.set_tag(ext.HTTP_STATUS_CODE, response.status_code)
-        ot.tracer.inject(span.context, ot.Format.HTTP_HEADERS, response)
+        internal_tracer.inject(span.context, ot.Format.HTTP_HEADERS, response)
         span.finish()
         return response
 

instana/django19.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 import opentracing as ot
-from instana import tracer, options
+from instana import internal_tracer
 import opentracing.ext.tags as ext
 import os
 
@@ -11,18 +11,16 @@
 class InstanaMiddleware19(object):
     """ Django 1.9 Middleware to provide request tracing for Instana """
     def __init__(self):
-        opts = options.Options(service="Django")
-        ot.tracer = tracer.InstanaTracer(opts)
         self.span = None
         self
 
     def process_request(self, request):
         env = request.environ
         if 'HTTP_X_INSTANA_T' in env and 'HTTP_X_INSTANA_S' in env:
-            ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, env)
-            span = ot.tracer.start_span("django", child_of=ctx)
+            ctx = internal_tracer.extract(ot.Format.HTTP_HEADERS, env)
+            span = internal_tracer.start_span("django", child_of=ctx)
         else:
-            span = ot.tracer.start_span("django")
+            span = internal_tracer.start_span("django")
 
         span.set_tag(ext.HTTP_URL, env['PATH_INFO'])
         span.set_tag("http.params", env['QUERY_STRING'])
@@ -38,7 +36,7 @@ def process_response(self, request, response):
                 self.span.set_tag("ec", ec+1)
 
             self.span.set_tag(ext.HTTP_STATUS_CODE, response.status_code)
-            ot.tracer.inject(self.span.context, ot.Format.HTTP_HEADERS, response)
+            internal_tracer.inject(self.span.context, ot.Format.HTTP_HEADERS, response)
             self.span.finish()
             self.span = None
         return response

instana/wsgi.py

@@ -1,5 +1,5 @@
 import opentracing as ot
-from instana import tracer, options
+from instana import internal_tracer
 import opentracing.ext.tags as tags
 
 
@@ -8,16 +8,14 @@ class iWSGIMiddleware(object):
 
     def __init__(self, app):
         self.app = app
-        opts = options.Options()
-        ot.tracer = tracer.InstanaTracer(opts)
         self
 
     def __call__(self, environ, start_response):
         env = environ
 
         def new_start_response(status, headers, exc_info=None):
             """Modified start response with additional headers."""
-            ot.tracer.inject(span.context, ot.Format.HTTP_HEADERS, headers)
+            internal_tracer.inject(span.context, ot.Format.HTTP_HEADERS, headers)
             res = start_response(status, headers, exc_info)
 
             sc = status.split(' ')[0]
@@ -31,10 +29,10 @@ def new_start_response(status, headers, exc_info=None):
             return res
 
         if 'HTTP_X_INSTANA_T' in env and 'HTTP_X_INSTANA_S' in env:
-            ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, env)
-            span = ot.tracer.start_span("wsgi", child_of=ctx)
+            ctx = internal_tracer.extract(ot.Format.HTTP_HEADERS, env)
+            span = internal_tracer.start_span("wsgi", child_of=ctx)
         else:
-            span = ot.tracer.start_span("wsgi")
+            span = internal_tracer.start_span("wsgi")
 
         span.set_tag(tags.HTTP_URL, env['PATH_INFO'])
         span.set_tag("http.params", env['QUERY_STRING'])