Skip to content

Commit 84a94d4

Browse files
authored
Format & clean up imports via isort (#83)
* Format & clean up imports via isort * Avoid importing self. * More improvements: * continued import cleanup * Move Tracer and Sensor init to tracer and sensor packages respectively * Use SkipTest for API client tests * Use get_distribution to access version number from setup.py
1 parent 5c0a9e4 commit 84a94d4

31 files changed

+160
-100
lines changed

example/opentracing_vanilla.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# encoding=utf-8
2+
import time
3+
24
import opentracing
5+
36
import instana
4-
import time
57

68
# Loop continuously with a 2 second sleep to generate traces
79
while True:

example/simple.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# encoding=utf-8
22
import sys
3-
import opentracing as ot
43
import time
4+
5+
import opentracing as ot
56
import opentracing.ext.tags as ext
67

78
SERVICE = "🦄 Stan ❤️s Python 🦄"

instana/__init__.py

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
from __future__ import absolute_import
2+
23
import os
34
import opentracing
4-
from .sensor import Sensor
5-
from .tracer import InstanaTracer
6-
from .options import Options
5+
from pkg_resources import get_distribution
6+
7+
from . import sensor
8+
from . import tracer
9+
710

811
"""
912
The Instana package has two core components: the sensor and the tracer.
@@ -19,7 +22,7 @@
1922
__copyright__ = 'Copyright 2017 Instana Inc.'
2023
__credits__ = ['Pavlo Baron', 'Peter Giacomo Lombardo']
2124
__license__ = 'MIT'
22-
__version__ = '0.10.1'
25+
__version__ = get_distribution('instana').version
2326
__maintainer__ = 'Peter Giacomo Lombardo'
2427
__email__ = '[email protected]'
2528

@@ -34,30 +37,6 @@ def load(module):
3437
print("Instana: Loading...")
3538
print("==========================================================")
3639

37-
38-
# For any given Python process, we only want one sensor as multiple would
39-
# collect/report metrics in duplicate, triplicate etc..
40-
#
41-
# Usage example:
42-
#
43-
# import instana
44-
# instana.global_sensor
45-
#
46-
global_sensor = Sensor(Options())
47-
48-
# The global OpenTracing compatible tracer used internally by
49-
# this package.
50-
#
51-
# Usage example:
52-
#
53-
# import instana
54-
# instana.internal_tracer.start_span(...)
55-
#
56-
internal_tracer = InstanaTracer()
57-
58-
# Set ourselves as the tracer.
59-
opentracing.tracer = internal_tracer
60-
6140
# Optional application wide service name.
6241
# Can be configured via environment variable or via code:
6342
#

instana/agent.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import json
2-
from instana import log
3-
import instana.fsm as f
4-
import instana.agent_const as a
52
import threading
63
from datetime import datetime
74

5+
import instana.agent_const as a
6+
import instana.fsm as f
7+
from instana import log
8+
89
try:
910
import urllib.request as urllib2
1011
except ImportError:

instana/flaskana.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
from __future__ import print_function
2-
from instana import wsgi
3-
import wrapt
2+
43
import os
54

5+
import wrapt
6+
7+
from instana import wsgi
8+
69

710
def wrapper(wrapped, instance, args, kwargs):
811
rv = wrapped(*args, **kwargs)

instana/fsm.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
from __future__ import absolute_import
2+
13
import os
2-
import sys
34
import socket
45
import subprocess
6+
import sys
57
import threading as t
8+
69
import fysom as f
7-
import instana
8-
from instana import log
9-
import instana.agent_const as a
10+
from pkg_resources import get_distribution
11+
12+
from . import agent_const as a
13+
from . import log
1014

1115

1216
class Discovery(object):
@@ -39,7 +43,7 @@ class Fsm(object):
3943
warnedPeriodic = False
4044

4145
def __init__(self, agent):
42-
log.info("Stan is on the scene. Starting Instana instrumentation version", instana.__version__)
46+
log.info("Stan is on the scene. Starting Instana instrumentation version", get_distribution('instana').version)
4347
log.debug("initializing fsm")
4448

4549
self.agent = agent

instana/helpers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import os
22
from string import Template
3-
from instana import internal_tracer, eum_api_key as global_eum_api_key
3+
4+
from instana import eum_api_key as global_eum_api_key
5+
from instana.tracer import internal_tracer
46
from instana.log import logger
57

68
# Usage:

instana/http_propagator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from __future__ import absolute_import
2+
23
import opentracing as ot
34
from basictracer.context import SpanContext
4-
from instana import util, log
55

6+
from instana import log, util
67

78
# The carrier can be a dict or a list.
89
# Using the trace header as an example, it can be in the following forms

instana/instrumentation/django/middleware.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from __future__ import absolute_import
2+
3+
import sys
4+
25
import opentracing as ot
36
import opentracing.ext.tags as ext
47
import wrapt
5-
import sys
6-
from ...log import logger
7-
from ... import internal_tracer
8-
98

9+
from ...log import logger
10+
from ...tracer import internal_tracer
1011

1112
DJ_INSTANA_MIDDLEWARE = 'instana.instrumentation.django.middleware.InstanaMiddleware'
1213

instana/instrumentation/sudsjurko.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
from __future__ import absolute_import
2+
23
from distutils.version import LooseVersion
4+
35
import opentracing
46
import opentracing.ext.tags as ext
57
import wrapt
6-
from ..log import logger
7-
from .. import internal_tracer
88

9+
from ..tracer import internal_tracer
10+
from ..log import logger
911

1012
try:
1113
import suds # noqa

0 commit comments

Comments
 (0)