Revert API subpackage move

docs/index.rst

@@ -15,8 +15,8 @@ abstract types for OpenTelemetry implementations.
    :maxdepth: 1
    :caption: Contents:
 
-   opentelemetry.api.trace
-   opentelemetry.api.loader
+   opentelemetry.trace
+   opentelemetry.loader
 
 
 Indices and tables

docs/opentelemetry.loader.rst

@@ -0,0 +1,4 @@
+opentelemetry.loader module
+===========================
+
+.. automodule:: opentelemetry.loader

docs/opentelemetry.trace.rst

@@ -0,0 +1,4 @@
+opentelemetry.trace package
+===========================
+
+.. automodule:: opentelemetry.trace

opentelemetry-api/setup.py

@@ -16,8 +16,7 @@
 import setuptools
 
 BASE_DIR = os.path.dirname(__file__)
-VERSION_FILENAME = os.path.join(BASE_DIR, "src", "opentelemetry", "api",
-                                "version.py")
+VERSION_FILENAME = os.path.join(BASE_DIR, "src", "opentelemetry", "version.py")
 PACKAGE_INFO = {}
 with open(VERSION_FILENAME) as f:
     exec(f.read(), PACKAGE_INFO)
@@ -48,7 +47,7 @@
     license="Apache-2.0",
     package_dir={"": "src"},
     packages=setuptools.find_namespace_packages(where="src",
-                                                include="opentelemetry.api.*"),
+                                                include="opentelemetry.*"),
     url=("https://github.com/open-telemetry/opentelemetry-python"
          "/tree/master/opentelemetry-api"),
     zip_safe=False,

opentelemetry-api/src/opentelemetry/api/loader.py → opentelemetry-api/src/opentelemetry/loader.py

@@ -15,7 +15,7 @@
 
 """
 The OpenTelemetry loader module is mainly used internally to load the
-implementation for global objects like :func:`opentelemetry.api.trace.tracer`.
+implementation for global objects like :func:`opentelemetry.trace.tracer`.
 
 .. _loader-factory:
 
@@ -27,9 +27,9 @@ def my_factory_for_t(api_type: typing.Type[T]) -> typing.Optional[T]:
 
 That function is called with e.g., the type of the global object it should
 create as an argument (e.g. the type object
-:class:`opentelemetry.api.trace.Tracer`) and should return an instance of that
-type (such that ``instanceof(my_factory_for_t(T), T)`` is true). Alternatively,
-it may return ``None`` to indicate that the no-op default should be used.
+:class:`opentelemetry.trace.Tracer`) and should return an instance of that type
+(such that ``instanceof(my_factory_for_t(T), T)`` is true). Alternatively, it
+may return ``None`` to indicate that the no-op default should be used.
 
 When loading an implementation, the following algorithm is used to find a
 factory function or other means to create the global object:
@@ -43,9 +43,9 @@ def my_factory_for_t(api_type: typing.Type[T]) -> typing.Optional[T]:
        variable ``OPENTELEMETRY_PYTHON_IMPLEMENTATION_DEFAULT``.
     3. Otherwise, if a :samp:`set_preferred_{<type>}_implementation` was
        called (e.g.
-       :func:`opentelemetry.api.trace.set_preferred_tracer_implementation`),
-       the callback set there is used (that is, the environment variables
-       override the callback set in code).
+       :func:`opentelemetry.trace.set_preferred_tracer_implementation`), the
+       callback set there is used (that is, the environment variables override
+       the callback set in code).
     4. Otherwise, if :func:`set_preferred_default_implementation` was called,
        the callback set there is used.
     5. Otherwise, an attempt is made to import and use the OpenTelemetry SDK.

opentelemetry-api/src/opentelemetry/api/trace/__init__.py → opentelemetry-api/src/opentelemetry/trace/__init__.py

@@ -65,7 +65,7 @@
 from contextlib import contextmanager
 import typing
 
-from opentelemetry.api import loader
+from opentelemetry import loader
 
 
 class Span:
@@ -328,7 +328,7 @@ def set_preferred_tracer_implementation(
         ) -> None:
     """Set the factory to be used to create the tracer.
 
-    See :mod:`opentelemetry.api.loader` for details.
+    See :mod:`opentelemetry.loader` for details.
 
     This function may not be called after a tracer is already loaded.
 

opentelemetry-api/tests/test_loader.py

@@ -17,8 +17,8 @@
 import sys
 import unittest
 
-from opentelemetry.api import loader
-from opentelemetry.api import trace
+from opentelemetry import loader
+from opentelemetry import trace
 
 DUMMY_TRACER = None
 

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

@@ -12,9 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from opentelemetry import api
+from opentelemetry import trace as trace_api
 
 
-class Tracer(api.trace.Tracer):
+class Tracer(trace_api.Tracer):
     pass
-

opentelemetry-sdk/tests/trace/test_trace.py

@@ -14,12 +14,12 @@
 
 import unittest
 
-from opentelemetry import api
+from opentelemetry import trace as trace_api
 from opentelemetry.sdk import trace
 
 
 class TestTracer(unittest.TestCase):
 
     def test_extends_api(self):
         tracer = trace.Tracer()
-        self.assertIsInstance(tracer, api.trace.Tracer)
+        self.assertIsInstance(tracer, trace_api.Tracer)