diff --git a/django_opentracing/middleware.py b/django_opentracing/middleware.py index bcfba42..87ce0f8 100644 --- a/django_opentracing/middleware.py +++ b/django_opentracing/middleware.py @@ -1,5 +1,9 @@ from django.conf import settings -from django.utils.module_loading import import_string +try: + from django.utils.module_loading import import_string +except ImportError: + # For django<1.7 + from django.utils.module_loading import import_by_path as import_string from .tracing import DjangoTracing from .tracing import initialize_global_tracer @@ -18,6 +22,7 @@ class OpenTracingMiddleware(MiddlewareMixin): __init__() is only called once, no arguments, when the Web server responds to the first request ''' + def __init__(self, get_response=None): ''' TODO: ANSWER Qs diff --git a/django_opentracing/tracing.py b/django_opentracing/tracing.py index c2c746a..da97bce 100644 --- a/django_opentracing/tracing.py +++ b/django_opentracing/tracing.py @@ -8,6 +8,7 @@ class DjangoTracing(object): @param tracer the OpenTracing tracer to be used to trace requests using this DjangoTracing ''' + def __init__(self, tracer=None, start_span_cb=None): if start_span_cb is not None and not callable(start_span_cb): raise ValueError('start_span_cb is not callable') @@ -162,4 +163,5 @@ def initialize_global_tracer(tracing): initialize_global_tracer.complete = True + initialize_global_tracer.complete = False