Util package: Reorganize based on function (#289)

* Util package: Reorganized based on function

* Fix typo

* Fix test failures

Author: Peter Giacomo Lombardo

instana/agent/host.py

@@ -17,7 +17,8 @@
 from ..version import VERSION
 from ..options import StandardOptions
 from ..collector.host import HostCollector
-from ..util import to_json, get_py_source
+from ..util import to_json
+from ..util.runtime import get_py_source
 
 
 class AnnounceData(object):

instana/collector/aws_lambda.py

@@ -3,7 +3,8 @@
 """
 from ..log import logger
 from .base import BaseCollector
-from ..util import DictionaryOfStan, normalize_aws_lambda_arn
+from ..util import DictionaryOfStan
+from ..util.aws import normalize_aws_lambda_arn
 
 
 class AWSLambdaCollector(BaseCollector):

instana/collector/helpers/process.py

@@ -3,7 +3,9 @@
 import pwd
 import grp
 from instana.log import logger
-from instana.util import DictionaryOfStan, get_proc_cmdline, contains_secret
+from instana.util import DictionaryOfStan
+from instana.util.runtime import get_proc_cmdline
+from instana.util.secrets import contains_secret
 from .base import BaseHelper
 
 

instana/collector/helpers/runtime.py

@@ -10,7 +10,8 @@
 
 from instana.log import logger
 from instana.version import VERSION
-from instana.util import DictionaryOfStan, determine_service_name
+from instana.util import DictionaryOfStan
+from instana.util.runtime import determine_service_name
 
 from .base import BaseHelper
 

instana/instrumentation/aiohttp/client.py

@@ -5,7 +5,7 @@
 
 from ...log import logger
 from ...singletons import agent, async_tracer
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 
 try:

instana/instrumentation/aiohttp/server.py

@@ -5,7 +5,7 @@
 
 from ...log import logger
 from ...singletons import agent, async_tracer
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 
 try:

instana/instrumentation/asgi.py

@@ -5,7 +5,7 @@
 
 from ..log import logger
 from ..singletons import async_tracer, agent
-from ..util import strip_secrets_from_query
+from ..util.secrets import strip_secrets_from_query
 
 class InstanaASGIMiddleware:
     """

instana/instrumentation/django/middleware.py

@@ -9,7 +9,7 @@
 
 from ...log import logger
 from ...singletons import agent, tracer
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 DJ_INSTANA_MIDDLEWARE = 'instana.instrumentation.django.middleware.InstanaMiddleware'
 

instana/instrumentation/fastapi_inst.py

@@ -10,7 +10,7 @@
     from distutils.version import LooseVersion
 
     from ..log import logger
-    from ..util import running_in_gunicorn
+    from ..util.gunicorn import running_in_gunicorn
     from .asgi import InstanaASGIMiddleware
     from starlette.middleware import Middleware
     from fastapi import HTTPException

instana/instrumentation/flask/vanilla.py

@@ -9,7 +9,7 @@
 
 from ...log import logger
 from ...singletons import agent, tracer
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 path_tpl_re = re.compile('<.*>')
 

instana/instrumentation/flask/with_blinker.py

@@ -6,7 +6,7 @@
 import opentracing.ext.tags as ext
 
 from ...log import logger
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 from ...singletons import agent, tracer
 
 import flask

instana/instrumentation/pep0249.py

@@ -4,7 +4,7 @@
 
 from ..log import logger
 from ..singletons import tracer
-from ..util import sql_sanitizer
+from ..util.sql import sql_sanitizer
 
 
 class CursorWrapper(wrapt.ObjectProxy):

instana/instrumentation/pyramid/tweens.py

@@ -7,7 +7,7 @@
 
 from ...log import logger
 from ...singletons import tracer, agent
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 
 class InstanaTweenFactory(object):

instana/instrumentation/tornado/client.py

@@ -6,7 +6,7 @@
 
 from ...log import logger
 from ...singletons import agent, setup_tornado_tracer, tornado_tracer
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 from distutils.version import LooseVersion
 

instana/instrumentation/tornado/server.py

@@ -5,7 +5,7 @@
 
 from ...log import logger
 from ...singletons import agent, setup_tornado_tracer, tornado_tracer
-from ...util import strip_secrets_from_query
+from ...util.secrets import strip_secrets_from_query
 
 from distutils.version import LooseVersion
 

instana/instrumentation/urllib3.py

@@ -6,7 +6,7 @@
 
 from ..log import logger
 from ..singletons import agent, tracer
-from ..util import strip_secrets_from_query
+from ..util.secrets import strip_secrets_from_query
 
 try:
     import urllib3

instana/instrumentation/webapp2_inst.py

@@ -6,7 +6,7 @@
 
 from ..log import logger
 from ..singletons import agent, tracer
-from ..util import strip_secrets_from_query
+from ..util.secrets import strip_secrets_from_query
 
 
 try:

instana/instrumentation/wsgi.py

@@ -5,7 +5,7 @@
 import opentracing.ext.tags as tags
 
 from ..singletons import agent, tracer
-from ..util import strip_secrets_from_query
+from ..util.secrets import strip_secrets_from_query
 
 
 class InstanaWSGIMiddleware(object):

instana/options.py

@@ -13,7 +13,7 @@
 import logging
 
 from .log import logger
-from .util import determine_service_name
+from .util.runtime import determine_service_name
 
 
 class BaseOptions(object):

instana/propagators/base_propagator.py

@@ -3,7 +3,7 @@
 import sys
 
 from ..log import logger
-from ..util import header_to_id
+from ..util.ids import header_to_id
 from ..span_context import SpanContext
 
 PY2 = sys.version_info[0] == 2

instana/tracer.py

@@ -8,7 +8,7 @@
 import opentracing as ot
 from basictracer import BasicTracer
 
-from .util import generate_id
+from .util.ids import generate_id
 from .span_context import SpanContext
 from .span import InstanaSpan, RegisteredSpan
 from .recorder import StanRecorder, InstanaSampler