Skip to content

Fix: Singleton Import Protection #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2020
Merged

Fix: Singleton Import Protection #230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0af4e
Add try block to protect against import failes from sub packages
pglombardo Apr 29, 2020
484e5e4
Linter fixes
pglombardo Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions instana/singletons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import opentracing

from .agent import StandardAgent, AWSLambdaAgent
from .log import logger
from .tracer import InstanaTracer
from .recorder import StandardRecorder, AWSLambdaRecorder

Expand All @@ -18,15 +19,23 @@
span_recorder = StandardRecorder()


# Retrieve the globally configured agent
def get_agent():
"""
Retrieve the globally configured agent
@return: The Instana Agent singleton
"""
global agent
return agent


# Set the global agent for the Instana package. This is used for the
# test suite only currently.
def set_agent(new_agent):
"""
Set the global agent for the Instana package. This is used for the
test suite only currently.

@param new_agent: agent to replace current singleton
@return: None
"""
global agent
agent = new_agent

Expand All @@ -36,8 +45,11 @@ def set_agent(new_agent):
tracer = InstanaTracer(recorder=span_recorder)

if sys.version_info >= (3, 4):
from opentracing.scope_managers.asyncio import AsyncioScopeManager
async_tracer = InstanaTracer(scope_manager=AsyncioScopeManager(), recorder=span_recorder)
try:
from opentracing.scope_managers.asyncio import AsyncioScopeManager
async_tracer = InstanaTracer(scope_manager=AsyncioScopeManager(), recorder=span_recorder)
except Exception:
logger.debug("Error setting up async_tracer:", exc_info=True)


# Mock the tornado tracer until tornado is detected and instrumented first
Expand All @@ -54,14 +66,21 @@ def setup_tornado_tracer():
opentracing.tracer = tracer


# Retrieve the globally configured tracer
def get_tracer():
"""
Retrieve the globally configured tracer
@return: Tracer
"""
global tracer
return tracer


# Set the global tracer for the Instana package. This is used for the
# test suite only currently.
def set_tracer(new_tracer):
"""
Set the global tracer for the Instana package. This is used for the
test suite only currently.
@param new_tracer: The new tracer to replace the singleton
@return: None
"""
global tracer
tracer = new_tracer