Add current working directory

open-telemetry · Apr 26, 2020 · a73dcef · a73dcef
1 parent 1843e46
commit a73dcef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/...metry-auto-instrumentation/src/opentelemetry/auto_instrumentation/auto_instrumentation.py b/...metry-auto-instrumentation/src/opentelemetry/auto_instrumentation/auto_instrumentation.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 from logging import getLogger
-from os import environ, execl
+from os import environ, execl, getcwd
 from os.path import abspath, dirname, pathsep
 from shutil import which
 from sys import argv
@@ -33,6 +33,11 @@ def run() -> None:
     else:
         python_path = python_path.split(pathsep)
 
+    cwd_path = getcwd()
+
+    if cwd_path not in python_path:
+        python_path.insert(0, cwd_path)
+
     filedir_path = dirname(abspath(__file__))
 
     python_path = [path for path in python_path if path != filedir_path]

diff --git a/opentelemetry-auto-instrumentation/tests/test_run.py b/opentelemetry-auto-instrumentation/tests/test_run.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 # type: ignore
 
-from os import environ
+from os import environ, getcwd
 from os.path import abspath, dirname, pathsep
 from unittest import TestCase
 from unittest.mock import patch
@@ -49,14 +49,17 @@ def tearDownClass(cls):
     @patch.dict("os.environ", {"PYTHONPATH": ""})
     def test_empty(self):
         auto_instrumentation.run()
-        self.assertEqual(environ["PYTHONPATH"], self.auto_instrumentation_path)
+        self.assertEqual(
+            environ["PYTHONPATH"],
+            pathsep.join([self.auto_instrumentation_path, getcwd()]),
+        )
 
     @patch.dict("os.environ", {"PYTHONPATH": "abc"})
     def test_non_empty(self):
         auto_instrumentation.run()
         self.assertEqual(
             environ["PYTHONPATH"],
-            pathsep.join([self.auto_instrumentation_path, "abc"]),
+            pathsep.join([self.auto_instrumentation_path, getcwd(), "abc"]),
         )
 
     @patch.dict(
@@ -67,7 +70,7 @@ def test_after_path(self):
         auto_instrumentation.run()
         self.assertEqual(
             environ["PYTHONPATH"],
-            pathsep.join([self.auto_instrumentation_path, "abc"]),
+            pathsep.join([self.auto_instrumentation_path, getcwd(), "abc"]),
         )
 
     @patch.dict(
@@ -82,7 +85,7 @@ def test_single_path(self):
         auto_instrumentation.run()
         self.assertEqual(
             environ["PYTHONPATH"],
-            pathsep.join([self.auto_instrumentation_path, "abc"]),
+            pathsep.join([self.auto_instrumentation_path, getcwd(), "abc"]),
         )