Make propagators a namespace

Fixes open-telemetry#1590

Author: ocelotl

opentelemetry-api/src/opentelemetry/propagators/__init__.py

@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import typing
 import unittest
 
 from opentelemetry import baggage, trace
-from opentelemetry.propagators import extract, inject
+from opentelemetry.propagators.util import extract, inject
 from opentelemetry.trace import get_current_span, set_span_in_context
 from opentelemetry.trace.propagation.textmap import DictGetter
 

opentelemetry-api/tests/propagators/test_global_httptextformat.py

@@ -40,9 +40,9 @@ def test_propagators(propagators):
             **{"side_effect": test_propagators}
         )
 
-        import opentelemetry.propagators
+        import opentelemetry.propagators.util
 
-        reload(opentelemetry.propagators)
+        reload(opentelemetry.propagators.util)
 
     @patch.dict(environ, {OTEL_PROPAGATORS: "a,b,c"})
     @patch("opentelemetry.propagators.composite.CompositeHTTPPropagator")
@@ -75,6 +75,6 @@ def test_propagators(propagators):
             **{"side_effect": test_propagators}
         )
 
-        import opentelemetry.propagators
+        import opentelemetry.propagators.util
 
-        reload(opentelemetry.propagators)
+        reload(opentelemetry.propagators.util)