Refactor moving suppress key to instrumentation package

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py

@@ -18,12 +18,13 @@
 import typing
 
 from opentelemetry.context import Context, attach, detach, set_value
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import get_suppress_instrumentation_key
 from opentelemetry.sdk.trace import Span, SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
 from opentelemetry.trace import INVALID_TRACE_ID
 from opentelemetry.util._time import _time_ns
 
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 logger = logging.getLogger(__name__)
 
 

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -75,7 +75,7 @@ def strip_query_params(url: yarl.URL) -> str:
 from opentelemetry.instrumentation.aiohttp_client.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
+    get_suppress_instrumentation_key,
     http_status_to_status_code,
     unwrap,
 )
@@ -88,6 +88,7 @@ def strip_query_params(url: yarl.URL) -> str:
 _SpanNameT = typing.Optional[
     typing.Union[typing.Callable[[aiohttp.TraceRequestStartParams], str], str]
 ]
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 
 
 def url_path_span_name(params: aiohttp.TraceRequestStartParams) -> str:

instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

@@ -30,11 +30,13 @@
 from opentelemetry.instrumentation.aiohttp_client import (
     AioHttpClientInstrumentor,
 )
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import get_suppress_instrumentation_key
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import StatusCode
 
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
+
 
 def run_with_test_server(
     runnable: typing.Callable, url: str, handler: typing.Callable

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py

@@ -59,13 +59,14 @@
 from opentelemetry.instrumentation.botocore.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
+    get_suppress_instrumentation_key,
     unwrap,
 )
 from opentelemetry.propagate import inject
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import SpanKind, get_tracer
 
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 logger = logging.getLogger(__name__)
 
 

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py

@@ -34,12 +34,14 @@
 from opentelemetry import trace as trace_api
 from opentelemetry.context import attach, detach, set_value
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import get_suppress_instrumentation_key
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.mock_textmap import MockTextMapPropagator
 from opentelemetry.test.test_base import TestBase
 
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
+
 
 def get_as_zip_file(file_name, content):
     zip_output = io.BytesIO()

instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py

@@ -46,7 +46,7 @@
 from opentelemetry.instrumentation.requests.package import _instruments
 from opentelemetry.instrumentation.requests.version import __version__
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
+    get_suppress_instrumentation_key,
     http_status_to_status_code,
 )
 from opentelemetry.propagate import inject
@@ -59,6 +59,7 @@
 _SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key(
     "suppress_http_instrumentation"
 )
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 
 
 # pylint: disable=unused-argument

instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py

@@ -21,14 +21,16 @@
 import opentelemetry.instrumentation.requests
 from opentelemetry import context, trace
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import get_suppress_instrumentation_key
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
 from opentelemetry.sdk import resources
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.mock_textmap import MockTextMapPropagator
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import StatusCode
 
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
+
 
 class InvalidResponseObjectException(Exception):
     def __init__(self):

instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py

@@ -50,7 +50,7 @@
     __version__,
 )
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
+    get_suppress_instrumentation_key,
     http_status_to_status_code,
 )
 from opentelemetry.propagate import inject
@@ -63,6 +63,7 @@
 _SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key(
     "suppress_http_instrumentation"
 )
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 
 
 class URLLibInstrumentor(BaseInstrumentor):

instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py

@@ -28,14 +28,16 @@
 from opentelemetry.instrumentation.urllib import (  # pylint: disable=no-name-in-module,import-error
     URLLibInstrumentor,
 )
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import get_suppress_instrumentation_key
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
 from opentelemetry.sdk import resources
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.mock_textmap import MockTextMapPropagator
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import StatusCode
 
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
+
 
 class RequestsIntegrationTestBase(abc.ABC):
     # pylint: disable=no-member

instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py

@@ -56,7 +56,7 @@ def span_name_callback(method: str, url: str, headers):
 from opentelemetry.instrumentation.urllib3.package import _instruments
 from opentelemetry.instrumentation.urllib3.version import __version__
 from opentelemetry.instrumentation.utils import (
-    _SUPPRESS_INSTRUMENTATION_KEY,
+    get_suppress_instrumentation_key,
     http_status_to_status_code,
     unwrap,
 )
@@ -70,6 +70,7 @@ def span_name_callback(method: str, url: str, headers):
 _SUPPRESS_HTTP_INSTRUMENTATION_KEY = context.create_key(
     "suppress_http_instrumentation"
 )
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 
 _UrlFilterT = typing.Optional[typing.Callable[[str], str]]
 _SpanNameT = typing.Optional[

instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py

@@ -24,13 +24,14 @@
     _SUPPRESS_HTTP_INSTRUMENTATION_KEY,
     URLLib3Instrumentor,
 )
-from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY
+from opentelemetry.instrumentation.utils import get_suppress_instrumentation_key
 from opentelemetry.propagate import get_global_textmap, set_global_textmap
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.mock_textmap import MockTextMapPropagator
 from opentelemetry.test.test_base import TestBase
 
 # pylint: disable=too-many-public-methods
+_SUPPRESS_INSTRUMENTATION_KEY = get_suppress_instrumentation_key()
 
 
 class TestURLLib3Instrumentor(TestBase):

opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py

@@ -63,3 +63,6 @@ def unwrap(obj, attr: str):
     func = getattr(obj, attr, None)
     if func and isinstance(func, ObjectProxy) and hasattr(func, "__wrapped__"):
         setattr(obj, attr, func.__wrapped__)
+
+def get_suppress_instrumentation_key():
+    return _SUPPRESS_INSTRUMENTATION_KEY