Several fixes

open-telemetry · Feb 17, 2020 · 23e6c7e · 23e6c7e
1 parent 643db19
commit 23e6c7e
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 102 deletions.
diff --git a/opentelemetry-api/setup.py b/opentelemetry-api/setup.py
@@ -40,13 +40,6 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
     ],
-    entry_points={
-        "console_scripts": [
-            "opentelemetry-auto-instrument = "
-            "opentelemetry.auto_instrument.auto_instrument:run"
-        ],
-        "opentelemetry_patcher": [],
-    },
     description="OpenTelemetry Python API",
     include_package_data=True,
     long_description=open("README.rst").read(),

diff --git a/opentelemetry-api/src/opentelemetry/patcher/__init__.py b/opentelemetry-api/src/opentelemetry/patcher/__init__.py
diff --git a/examples/auto_instrumentation/README.md → ...y-auto-instrumentation/examples/README.md b/examples/auto_instrumentation/README.md → ...y-auto-instrumentation/examples/README.md
diff --git a/examples/auto_instrumentation/formatter.py → ...uto-instrumentation/examples/formatter.py b/examples/auto_instrumentation/formatter.py → ...uto-instrumentation/examples/formatter.py
diff --git a/examples/auto_instrumentation/hello.py → ...ry-auto-instrumentation/examples/hello.py b/examples/auto_instrumentation/hello.py → ...ry-auto-instrumentation/examples/hello.py
diff --git a/...instrumentation/publisher_instrumented.py → ...tation/examples/publisher_instrumented.py b/...instrumentation/publisher_instrumented.py → ...tation/examples/publisher_instrumented.py
diff --git a/...strumentation/publisher_uninstrumented.py → ...tion/examples/publisher_uninstrumented.py b/...strumentation/publisher_uninstrumented.py → ...tion/examples/publisher_uninstrumented.py
diff --git a/examples/auto_instrumentation/utils.py → ...ry-auto-instrumentation/examples/utils.py b/examples/auto_instrumentation/utils.py → ...ry-auto-instrumentation/examples/utils.py
diff --git a/opentelemetry-auto-instrumentation/setup.py b/opentelemetry-auto-instrumentation/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2020, OpenTelemetry Authors
+# Copyright 2019, OpenTelemetry Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 BASE_DIR = os.path.dirname(__file__)
 VERSION_FILENAME = os.path.join(
-    BASE_DIR, "src", "opentelemetry", , "version.py"
+    BASE_DIR, "src", "opentelemetry", "auto_instrumentation", "version.py"
 )
 PACKAGE_INFO = {}
 with open(VERSION_FILENAME) as f:
@@ -40,23 +40,16 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
     ],
-    entry_points={
-        "console_scripts": [
-            "opentelemetry-auto-instrument = "
-            "opentelemetry.auto_instrument.auto_instrument:run"
-        ],
-        "opentelemetry_patcher": [],
-    },
     description="OpenTelemetry Python Auto Instrumentation",
     include_package_data=True,
     long_description=open("README.rst").read(),
     long_description_content_type="text/x-rst",
-    install_requires=["typing; python_version<'3.5'"],
+    install_requires=["opentelemetry-api==0.4.dev0"],
     extras_require={},
     license="Apache-2.0",
     package_dir={"": "src"},
     packages=setuptools.find_namespace_packages(
-        where="src", include="opentelemetry.*"
+        where="src", include="opentelemetry.auto_instrumentation.*"
     ),
     url=(
         "https://github.com/open-telemetry/opentelemetry-python"

diff --git a/opentelemetry-auto-instrumentation/src/opentelemetry/auto_instrumentation/auto_instrument.py b/opentelemetry-auto-instrumentation/src/opentelemetry/auto_instrumentation/auto_instrument.py
@@ -25,12 +25,10 @@ def run() -> None:
     bootstrap_dir = dirname(__file__)
     python_path = environ.get("PYTHONPATH", None)
 
-    # Add our bootstrap directory to the head of $PYTHONPATH to ensure
-    # it is loaded before program code
-    if python_path is not None:
-        environ["PYTHONPATH"] = join(bootstrap_dir, python_path)
-    else:
+    if python_path is None:
         environ["PYTHONPATH"] = bootstrap_dir
+    else:
+        environ["PYTHONPATH"] = join(bootstrap_dir, python_path)
 
     python3 = which(argv[1])
     execl(python3, python3, *argv[2:])  # type: ignore

diff --git a/...instrumentation/tests/patcher/__init__.py → ...tation/tests/test_auto_instrumentation.py b/...instrumentation/tests/patcher/__init__.py → ...tation/tests/test_auto_instrumentation.py
@@ -11,3 +11,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# type: ignore
+
+from unittest import TestCase
+from unittest.mock import patch
+import sys
+
+from opentelemetry.auto_instrumentation.auto_instrument import run
+
+
+class TestAutoInstrumentation(TestCase):
+    def test_auto_instrumentation(self):
+
+        with patch.object(sys, "argv", ["python3", "hello.py"]):
+            auto_instrument.run()
diff --git a/...rumentation/tests/patcher/test_patcher.py → ...uto-instrumentation/tests/test_patcher.py b/...rumentation/tests/patcher/test_patcher.py → ...uto-instrumentation/tests/test_patcher.py
@@ -16,7 +16,7 @@
 from logging import WARNING
 from unittest import TestCase
 
-from opentelemetry.patcher import BasePatcher
+from opentelemetry.auto_instrumentation.patcher import BasePatcher
 
 
 class TestPatcher(TestCase):