Fix more paths

Author: ocelotl

Diff for: exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py

@@ -34,7 +34,8 @@
 
 .. code:: python
 
-    from opentelemetry import propagators, trace
+    from opentelemetry.propagators.util import set_global_textmap
+    from opentelemetry import trace
     from opentelemetry.exporter.datadog import DatadogExportSpanProcessor, DatadogSpanExporter
     from opentelemetry.exporter.datadog.propagator import DatadogFormat
     from opentelemetry.sdk.trace import TracerProvider
@@ -50,7 +51,7 @@
     trace.get_tracer_provider().add_span_processor(span_processor)
 
     # Optional: use Datadog format for propagation in distributed traces
-    propagators.set_global_textmap(DatadogFormat())
+    set_global_textmap(DatadogFormat())
 
     with tracer.start_as_current_span("foo"):
         print("Hello world!")

Diff for: instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -62,15 +62,15 @@ def strip_query_params(url: yarl.URL) -> str:
 ---
 """
 
-import socket
 import types
 import typing
 
 import aiohttp
 import wrapt
 
 from opentelemetry import context as context_api
-from opentelemetry import propagators, trace
+from opentelemetry.propagators.util import inject
+from opentelemetry import trace
 from opentelemetry.instrumentation.aiohttp_client.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
@@ -181,7 +181,7 @@ async def on_request_start(
             trace.set_span_in_context(trace_config_ctx.span)
         )
 
-        propagators.inject(type(params.headers).__setitem__, params.headers)
+        inject(type(params.headers).__setitem__, params.headers)
 
     async def on_request_end(
         unused_session: aiohttp.ClientSession,

Diff for: instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

@@ -25,7 +25,8 @@
 
 from asgiref.compatibility import guarantee_single_callable
 
-from opentelemetry import context, propagators, trace
+from opentelemetry import context, trace
+from opentelemetry.propagators.util import extract
 from opentelemetry.instrumentation.asgi.version import __version__  # noqa
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.trace.propagation.textmap import DictGetter
@@ -185,7 +186,7 @@ async def __call__(self, scope, receive, send):
         if self.excluded_urls and self.excluded_urls.url_disabled(url):
             return await self.app(scope, receive, send)
 
-        token = context.attach(propagators.extract(carrier_getter, scope))
+        token = context.attach(extract(carrier_getter, scope))
         span_name, additional_attributes = self.span_details_callback(scope)
 
         try:

Diff for: instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py

@@ -49,15 +49,14 @@
 import logging
 
 from botocore.client import BaseClient
-from botocore.exceptions import ClientError, ParamValidationError
-from wrapt import ObjectProxy, wrap_function_wrapper
+from botocore.exceptions import ClientError
+from wrapt import wrap_function_wrapper
 
 from opentelemetry import context as context_api
-from opentelemetry import propagators
+from opentelemetry.propagators.util import inject
 from opentelemetry.instrumentation.botocore.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
-from opentelemetry.sdk.trace import Resource
 from opentelemetry.trace import SpanKind, get_tracer
 
 logger = logging.getLogger(__name__)
@@ -67,7 +66,7 @@
 def _patched_endpoint_prepare_request(wrapped, instance, args, kwargs):
     request = args[0]
     headers = request.headers
-    propagators.inject(type(headers).__setitem__, headers)
+    inject(type(headers).__setitem__, headers)
     return wrapped(*args, **kwargs)
 
 

Diff for: instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py

@@ -28,7 +28,9 @@
     mock_xray,
 )
 
-from opentelemetry import propagators
+from opentelemetry.propagators.util import (
+    set_global_textmap, get_global_textmap
+)
 from opentelemetry import trace as trace_api
 from opentelemetry.context import attach, detach, set_value
 from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
@@ -381,14 +383,14 @@ def test_sts_client(self):
     @mock_ec2
     def test_propagator_injects_into_request(self):
         headers = {}
-        previous_propagator = propagators.get_global_textmap()
+        previous_propagator = get_global_textmap()
 
         def check_headers(**kwargs):
             nonlocal headers
             headers = kwargs["request"].headers
 
         try:
-            propagators.set_global_textmap(MockTextMapPropagator())
+            set_global_textmap(MockTextMapPropagator())
 
             ec2 = self.session.create_client("ec2", region_name="us-west-2")
             ec2.meta.events.register_first(
@@ -424,7 +426,7 @@ def check_headers(**kwargs):
             )
 
         finally:
-            propagators.set_global_textmap(previous_propagator)
+            set_global_textmap(previous_propagator)
 
     @mock_xray
     def test_suppress_instrumentation_xray_client(self):

Diff for: instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py

@@ -52,12 +52,12 @@ def add(x, y):
 """
 
 import logging
-import signal
 from collections.abc import Iterable
 
 from celery import signals  # pylint: disable=no-name-in-module
 
-from opentelemetry import propagators, trace
+from opentelemetry.propagators.util import extract, inject
+from opentelemetry import trace
 from opentelemetry.instrumentation.celery import utils
 from opentelemetry.instrumentation.celery.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
@@ -128,7 +128,7 @@ def _trace_prerun(self, *args, **kwargs):
             return
 
         request = task.request
-        tracectx = propagators.extract(carrier_getter, request) or None
+        tracectx = extract(carrier_getter, request) or None
 
         logger.debug("prerun signal start task_id=%s", task_id)
 
@@ -192,7 +192,7 @@ def _trace_before_publish(self, *args, **kwargs):
 
         headers = kwargs.get("headers")
         if headers:
-            propagators.inject(type(headers).__setitem__, headers)
+            inject(type(headers).__setitem__, headers)
 
     @staticmethod
     def _trace_after_publish(*args, **kwargs):

Diff for: instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py

@@ -23,7 +23,7 @@
     carrier_getter,
     collect_request_attributes,
 )
-from opentelemetry.propagators import extract
+from opentelemetry.propagators.util import extract
 from opentelemetry.trace import SpanKind, get_tracer
 from opentelemetry.util.http import get_excluded_urls, get_traced_request_attrs
 

Diff for: instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py

@@ -46,17 +46,13 @@
     ElasticsearchInstrumentor("my-custom-prefix").instrument()
 """
 
-import functools
-import types
 from logging import getLogger
 from os import environ
 
 import elasticsearch
 import elasticsearch.exceptions
-from wrapt import ObjectProxy
 from wrapt import wrap_function_wrapper as _wrap
 
-from opentelemetry import context, propagators, trace
 from opentelemetry.instrumentation.elasticsearch.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap

Diff for: instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/__init__.py

@@ -49,7 +49,8 @@ def on_get(self, req, resp):
 import falcon
 
 import opentelemetry.instrumentation.wsgi as otel_wsgi
-from opentelemetry import context, propagators, trace
+from opentelemetry.propagators.util import extract
+from opentelemetry import context, trace
 from opentelemetry.instrumentation.falcon.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import (
@@ -109,7 +110,7 @@ def __call__(self, env, start_response):
         start_time = time_ns()
 
         token = context.attach(
-            propagators.extract(otel_wsgi.carrier_getter, env)
+            extract(otel_wsgi.carrier_getter, env)
         )
         span = self._tracer.start_span(
             otel_wsgi.get_default_span_name(env),

Diff for: instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py

@@ -52,7 +52,8 @@ def hello():
 import flask
 
 import opentelemetry.instrumentation.wsgi as otel_wsgi
-from opentelemetry import context, propagators, trace
+from opentelemetry import context, trace
+from opentelemetry.propagators.util import extract
 from opentelemetry.instrumentation.flask.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.util.http import get_excluded_urls
@@ -116,7 +117,7 @@ def _before_request():
         flask_request_environ = flask.request.environ
         span_name = name_callback()
         token = context.attach(
-            propagators.extract(
+            extract(
                 otel_wsgi.carrier_getter, flask_request_environ
             )
         )

Diff for: instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py

@@ -24,7 +24,8 @@
 
 import grpc
 
-from opentelemetry import propagators, trace
+from opentelemetry.propagators.util import inject
+from opentelemetry import trace
 from opentelemetry.instrumentation.grpc import grpcext
 from opentelemetry.instrumentation.grpc._utilities import RpcInfo
 from opentelemetry.trace.status import Status, StatusCode
@@ -59,7 +60,7 @@ def append_metadata(
         metadata[key] = value
 
     # Inject current active span from the context
-    propagators.inject(append_metadata, metadata)
+    inject(append_metadata, metadata)
 
 
 def _make_future_done_callback(span, rpc_info):

Diff for: instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py

@@ -26,7 +26,8 @@
 
 import grpc
 
-from opentelemetry import propagators, trace
+from opentelemetry.propagators.util import extract
+from opentelemetry import trace
 from opentelemetry.context import attach, detach
 from opentelemetry.trace.propagation.textmap import DictGetter
 from opentelemetry.trace.status import Status, StatusCode
@@ -181,7 +182,7 @@ def _set_remote_context(self, servicer_context):
         metadata = servicer_context.invocation_metadata()
         if metadata:
             md_dict = {md.key: md.value for md in metadata}
-            ctx = propagators.extract(self._carrier_getter, md_dict)
+            ctx = extract(self._carrier_getter, md_dict)
             token = attach(ctx)
             try:
                 yield

Diff for: instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/callbacks.py

@@ -6,7 +6,8 @@
 from pyramid.tweens import EXCVIEW
 
 import opentelemetry.instrumentation.wsgi as otel_wsgi
-from opentelemetry import context, propagators, trace
+from opentelemetry import context, trace
+from opentelemetry.propagators.util import extract
 from opentelemetry.instrumentation.pyramid.version import __version__
 from opentelemetry.util.http import get_excluded_urls
 from opentelemetry.util.providers import time_ns
@@ -64,7 +65,7 @@ def _before_traversal(event):
     start_time = request_environ.get(_ENVIRON_STARTTIME_KEY)
 
     token = context.attach(
-        propagators.extract(otel_wsgi.carrier_getter, request_environ)
+        extract(otel_wsgi.carrier_getter, request_environ)
     )
     tracer = trace.get_tracer(__name__, __version__)
 

Diff for: instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py

@@ -36,18 +36,17 @@
 import functools
 import types
 
-from requests import Timeout, URLRequired
-from requests.exceptions import InvalidSchema, InvalidURL, MissingSchema
 from requests.models import Response
 from requests.sessions import Session
 from requests.structures import CaseInsensitiveDict
 
-from opentelemetry import context, propagators
+from opentelemetry.propagators.util import inject
+from opentelemetry import context
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.requests.version import __version__
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.trace import SpanKind, get_tracer
-from opentelemetry.trace.status import Status, StatusCode
+from opentelemetry.trace.status import Status
 
 # A key to a context variable to avoid creating duplicate spans when instrumenting
 # both, Session.request and Session.send, since Session.request calls into Session.send
@@ -135,7 +134,7 @@ def _instrumented_requests_call(
                 span.set_attribute("http.url", url)
 
             headers = get_or_create_headers()
-            propagators.inject(type(headers).__setitem__, headers)
+            inject(type(headers).__setitem__, headers)
 
             token = context.attach(
                 context.set_value(_SUPPRESS_REQUESTS_INSTRUMENTATION_KEY, True)

Diff for: instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py

@@ -19,7 +19,10 @@
 import requests
 
 import opentelemetry.instrumentation.requests
-from opentelemetry import context, propagators, trace
+from opentelemetry import context, trace
+from opentelemetry.propagators.util import (
+    get_global_textmap, set_global_textmap
+)
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
 from opentelemetry.sdk import resources
 from opentelemetry.test.mock_textmap import MockTextMapPropagator
@@ -191,9 +194,9 @@ def test_not_recording(self):
             self.assertFalse(mock_span.set_status.called)
 
     def test_distributed_context(self):
-        previous_propagator = propagators.get_global_textmap()
+        previous_propagator = get_global_textmap()
         try:
-            propagators.set_global_textmap(MockTextMapPropagator())
+            set_global_textmap(MockTextMapPropagator())
             result = self.perform_request(self.URL)
             self.assertEqual(result.text, "Hello!")
 
@@ -212,7 +215,7 @@ def test_distributed_context(self):
             )
 
         finally:
-            propagators.set_global_textmap(previous_propagator)
+            set_global_textmap(previous_propagator)
 
     def test_span_callback(self):
         RequestsInstrumentor().uninstrument()

Diff for: instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -43,7 +43,8 @@ def get(self):
 import wrapt
 from wrapt import wrap_function_wrapper
 
-from opentelemetry import context, propagators, trace
+from opentelemetry import context, trace
+from opentelemetry.propagators.util import extract
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.tornado.version import __version__
 from opentelemetry.instrumentation.utils import (
@@ -196,7 +197,7 @@ def _get_operation_name(handler, request):
 
 def _start_span(tracer, handler, start_time) -> _TraceContext:
     token = context.attach(
-        propagators.extract(carrier_getter, handler.request.headers,)
+        extract(carrier_getter, handler.request.headers,)
     )
 
     span = tracer.start_span(

Diff for: instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py

@@ -2,7 +2,8 @@
 
 from tornado.httpclient import HTTPError, HTTPRequest
 
-from opentelemetry import propagators, trace
+from opentelemetry.propagators.util import inject
+from opentelemetry import trace
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.trace.status import Status
 from opentelemetry.util.providers import time_ns
@@ -50,7 +51,7 @@ def fetch_async(tracer, func, _, args, kwargs):
             span.set_attribute(key, value)
 
     with tracer.use_span(span):
-        propagators.inject(type(request.headers).__setitem__, request.headers)
+        inject(type(request.headers).__setitem__, request.headers)
         future = func(*args, **kwargs)
         future.add_done_callback(
             functools.partial(_finish_tracing_callback, span=span)