Skip to content

Commit b39471d

Browse files
pglombardopglombardo
committed
Use opentracing.tracer
1 parent 3dda05c commit b39471d

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

‎instana/django.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ class InstanaMiddleware(object):
1313
def __init__(self, get_response):
1414
self.get_response = get_response
1515
opts = options.Options(service="Django")
16-
ot.global_tracer = tracer.InstanaTracer(opts)
16+
ot.tracer = tracer.InstanaTracer(opts)
1717
self
1818

1919
def __call__(self, request):
2020
env = request.environ
2121
if 'HTTP_X_INSTANA_T' in env and 'HTTP_X_INSTANA_S' in env:
22-
ctx = ot.global_tracer.extract(ot.Format.HTTP_HEADERS, env)
23-
span = ot.global_tracer.start_span("django", child_of=ctx)
22+
ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, env)
23+
span = ot.tracer.start_span("django", child_of=ctx)
2424
else:
25-
span = ot.global_tracer.start_span("django")
25+
span = ot.tracer.start_span("django")
2626

2727
span.set_tag(ext.HTTP_URL, env['PATH_INFO'])
2828
span.set_tag("http.params", env['QUERY_STRING'])
@@ -37,7 +37,7 @@ def __call__(self, request):
3737
span.set_tag("ec", ec+1)
3838

3939
span.set_tag(ext.HTTP_STATUS_CODE, response.status_code)
40-
ot.global_tracer.inject(span.context, ot.Format.HTTP_HEADERS, response)
40+
ot.tracer.inject(span.context, ot.Format.HTTP_HEADERS, response)
4141
span.finish()
4242
return response
4343

‎instana/django19.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ class InstanaMiddleware19(object):
1212
""" Django 1.9 Middleware to provide request tracing for Instana """
1313
def __init__(self):
1414
opts = options.Options(service="Django")
15-
ot.global_tracer = tracer.InstanaTracer(opts)
15+
ot.tracer = tracer.InstanaTracer(opts)
1616
self.span = None
1717
self
1818

1919
def process_request(self, request):
2020
env = request.environ
2121
if 'HTTP_X_INSTANA_T' in env and 'HTTP_X_INSTANA_S' in env:
22-
ctx = ot.global_tracer.extract(ot.Format.HTTP_HEADERS, env)
23-
span = ot.global_tracer.start_span("django", child_of=ctx)
22+
ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, env)
23+
span = ot.tracer.start_span("django", child_of=ctx)
2424
else:
25-
span = ot.global_tracer.start_span("django")
25+
span = ot.tracer.start_span("django")
2626

2727
span.set_tag(ext.HTTP_URL, env['PATH_INFO'])
2828
span.set_tag("http.params", env['QUERY_STRING'])
@@ -38,7 +38,7 @@ def process_response(self, request, response):
3838
self.span.set_tag("ec", ec+1)
3939

4040
self.span.set_tag(ext.HTTP_STATUS_CODE, response.status_code)
41-
ot.global_tracer.inject(self.span.context, ot.Format.HTTP_HEADERS, response)
41+
ot.tracer.inject(self.span.context, ot.Format.HTTP_HEADERS, response)
4242
self.span.finish()
4343
self.span = None
4444
return response

‎instana/probe.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# c. Detect and instrument any libraries
1111

1212
opts = options.Options()
13-
ot.global_tracer = tracer.InstanaTracer(opts)
13+
ot.tracer = tracer.InstanaTracer(opts)

‎instana/runtime.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ def hook(module):
1212
print("==========================================================")
1313

1414
opts = options.Options()
15-
ot.global_tracer = tracer.InstanaTracer(opts)
15+
ot.tracer = tracer.InstanaTracer(opts)

‎instana/wsgi.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ class iWSGIMiddleware(object):
99
def __init__(self, app):
1010
self.app = app
1111
opts = options.Options()
12-
ot.global_tracer = tracer.InstanaTracer(opts)
12+
ot.tracer = tracer.InstanaTracer(opts)
1313
self
1414

1515
def __call__(self, environ, start_response):
1616
env = environ
1717

1818
def new_start_response(status, headers, exc_info=None):
1919
"""Modified start response with additional headers."""
20-
ot.global_tracer.inject(span.context, ot.Format.HTTP_HEADERS, headers)
20+
ot.tracer.inject(span.context, ot.Format.HTTP_HEADERS, headers)
2121
res = start_response(status, headers, exc_info)
2222

2323
sc = status.split(' ')[0]
@@ -31,10 +31,10 @@ def new_start_response(status, headers, exc_info=None):
3131
return res
3232

3333
if 'HTTP_X_INSTANA_T' in env and 'HTTP_X_INSTANA_S' in env:
34-
ctx = ot.global_tracer.extract(ot.Format.HTTP_HEADERS, env)
35-
span = ot.global_tracer.start_span("wsgi", child_of=ctx)
34+
ctx = ot.tracer.extract(ot.Format.HTTP_HEADERS, env)
35+
span = ot.tracer.start_span("wsgi", child_of=ctx)
3636
else:
37-
span = ot.global_tracer.start_span("wsgi")
37+
span = ot.tracer.start_span("wsgi")
3838

3939
span.set_tag(tags.HTTP_URL, env['PATH_INFO'])
4040
span.set_tag("http.params", env['QUERY_STRING'])

‎tests/test_ot_propagators.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ def test_basics():
1919

2020
def test_inject():
2121
opts = options.Options()
22-
ot.global_tracer = tracer.InstanaTracer(opts)
22+
ot.tracer = tracer.InstanaTracer(opts)
2323

2424
carrier = {}
25-
span = ot.global_tracer.start_span("nosetests")
26-
ot.global_tracer.inject(span.context, ot.Format.HTTP_HEADERS, carrier)
25+
span = ot.tracer.start_span("nosetests")
26+
ot.tracer.inject(span.context, ot.Format.HTTP_HEADERS, carrier)
2727

2828
assert 'X-Instana-T' in carrier
2929
assert_equals(carrier['X-Instana-T'], util.id_to_header(span.context.trace_id))

‎tests/test_ot_span.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
class TestOTSpan:
77
def setUp(self):
88
""" Clear all spans before a test run """
9-
recorder = opentracing.global_tracer.recorder
9+
recorder = opentracing.tracer.recorder
1010
recorder.clear_spans()
1111

1212
def tearDown(self):
1313
""" Do nothing for now """
1414
return None
1515

1616
def test_span_interface(self):
17-
span = opentracing.global_tracer.start_span("blah")
17+
span = opentracing.tracer.start_span("blah")
1818
assert hasattr(span, "finish")
1919
assert hasattr(span, "set_tag")
2020
assert hasattr(span, "tags")
@@ -28,13 +28,13 @@ def test_span_ids(self):
2828
count = 0
2929
while count <= 1000:
3030
count += 1
31-
span = opentracing.global_tracer.start_span("test_span_ids")
31+
span = opentracing.tracer.start_span("test_span_ids")
3232
context = span.context
3333
assert -9223372036854775808 <= context.span_id <= 9223372036854775807
3434
assert -9223372036854775808 <= context.trace_id <= 9223372036854775807
3535

3636
def test_span_fields(self):
37-
span = opentracing.global_tracer.start_span("mycustom")
37+
span = opentracing.tracer.start_span("mycustom")
3838
assert_equals("mycustom", span.operation_name)
3939
assert span.context
4040

@@ -45,22 +45,22 @@ def test_span_fields(self):
4545
assert_equals(150, span.tags['tagtwo'])
4646

4747
def test_span_queueing(self):
48-
recorder = opentracing.global_tracer.recorder
48+
recorder = opentracing.tracer.recorder
4949

5050
count = 1
5151
while count <= 20:
5252
count += 1
53-
span = opentracing.global_tracer.start_span("queuethisplz")
53+
span = opentracing.tracer.start_span("queuethisplz")
5454
span.set_tag("tagone", "string")
5555
span.set_tag("tagtwo", 150)
5656
span.finish()
5757

5858
assert_equals(20, recorder.queue_size())
5959

6060
def test_sdk_spans(self):
61-
recorder = opentracing.global_tracer.recorder
61+
recorder = opentracing.tracer.recorder
6262

63-
span = opentracing.global_tracer.start_span("custom_sdk_span")
63+
span = opentracing.tracer.start_span("custom_sdk_span")
6464
span.set_tag("tagone", "string")
6565
span.set_tag("tagtwo", 150)
6666
span.set_tag('span.kind', "entry")
@@ -88,25 +88,25 @@ def test_sdk_spans(self):
8888
assert sdk_span.data.sdk.custom.tags
8989

9090
def test_span_kind(self):
91-
recorder = opentracing.global_tracer.recorder
91+
recorder = opentracing.tracer.recorder
9292

93-
span = opentracing.global_tracer.start_span("custom_sdk_span")
93+
span = opentracing.tracer.start_span("custom_sdk_span")
9494
span.set_tag('span.kind', "consumer")
9595
span.finish()
9696

97-
span = opentracing.global_tracer.start_span("custom_sdk_span")
97+
span = opentracing.tracer.start_span("custom_sdk_span")
9898
span.set_tag('span.kind', "server")
9999
span.finish()
100100

101-
span = opentracing.global_tracer.start_span("custom_sdk_span")
101+
span = opentracing.tracer.start_span("custom_sdk_span")
102102
span.set_tag('span.kind', "producer")
103103
span.finish()
104104

105-
span = opentracing.global_tracer.start_span("custom_sdk_span")
105+
span = opentracing.tracer.start_span("custom_sdk_span")
106106
span.set_tag('span.kind', "client")
107107
span.finish()
108108

109-
span = opentracing.global_tracer.start_span("custom_sdk_span")
109+
span = opentracing.tracer.start_span("custom_sdk_span")
110110
span.set_tag('span.kind', "blah")
111111
span.finish()
112112

‎tests/test_ot_tracer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
def test_tracer_basics():
77
assert hasattr(instana.tracer, 'InstanaTracer')
8-
assert hasattr(opentracing.global_tracer, "start_span")
9-
assert hasattr(opentracing.global_tracer, "inject")
10-
assert hasattr(opentracing.global_tracer, "extract")
8+
assert hasattr(opentracing.tracer, "start_span")
9+
assert hasattr(opentracing.tracer, "inject")
10+
assert hasattr(opentracing.tracer, "extract")

0 commit comments

Comments
 (0)