Removed os-specific calls out of function so tests can run on any os

Fixed negative look ahead to prevent removing path when it is the only
one.

Author: jeremydvoss

opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py

@@ -25,9 +25,7 @@
 from opentelemetry.instrumentation.environment_variables import (
     OTEL_PYTHON_DISABLED_INSTRUMENTATIONS,
 )
-from opentelemetry.instrumentation.utils import (
-    _python_path_without_current_directory,
-)
+from opentelemetry.instrumentation.utils import _python_path_without_directory
 from opentelemetry.instrumentation.version import __version__
 
 logger = getLogger(__name__)
@@ -113,7 +111,7 @@ def _load_configurators():
 
 def initialize():
     # prevents auto-instrumentation of subprocesses if code execs another python process
-    environ["PYTHONPATH"] = _python_path_without_current_directory(
+    environ["PYTHONPATH"] = _python_path_without_directory(
         environ["PYTHONPATH"], dirname(abspath(__file__)), pathsep
     )
 

opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py

@@ -166,9 +166,9 @@ def _generate_opentelemetry_traceparent(span: Span) -> str:
     return meta
 
 
-def _python_path_without_current_directory(python_path, dir, path_separator):
+def _python_path_without_directory(python_path, dir, path_separator):
     return sub(
-        rf"{escape(dir)}{path_separator}?",
+        rf"{escape(dir)}{path_separator}(?!$)",
         "",
         python_path,
     )

opentelemetry-instrumentation/tests/test_utils.py

@@ -14,7 +14,10 @@
 
 from http import HTTPStatus
 
-from opentelemetry.instrumentation.utils import _python_path_without_current_directory, http_status_to_status_code
+from opentelemetry.instrumentation.utils import (
+    _python_path_without_directory,
+    http_status_to_status_code,
+)
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import StatusCode
 
@@ -113,26 +116,39 @@ def test_http_status_to_status_code_server(self):
                 self.assertEqual(actual, expected, status_code)
 
     def test_remove_current_directory_from_python_path_windows(self):
-        dir = r"c:\users\trayvonmartin\workplace\opentelemetry-python-contrib\opentelemetry-instrumentation\src\opentelemetry\instrumentation\auto_instrumentation"
+        dir = r"c:\users\Trayvon Martin\workplace\opentelemetry-python-contrib\opentelemetry-instrumentation\src\opentelemetry\instrumentation\auto_instrumentation"
         path_separator = r";"
-        python_path = r"c:\users\trayvonmartin\workplace\opentelemetry-python-contrib\opentelemetry-instrumentation\src\opentelemetry\instrumentation\auto_instrumentation;C:\Users\trayvonmartin\workplace"
-        actual_python_path = _python_path_without_current_directory(
-            python_path,
-            dir,
-            path_separator
+        python_path = r"c:\users\Trayvon Martin\workplace\opentelemetry-python-contrib\opentelemetry-instrumentation\src\opentelemetry\instrumentation\auto_instrumentation;C:\Users\trayvonmartin\workplace"
+        actual_python_path = _python_path_without_directory(
+            python_path, dir, path_separator
         )
         expected_python_path = r"C:\Users\trayvonmartin\workplace"
-        assert(expected_python_path == actual_python_path
-        )
+        self.assertEqual(actual_python_path, expected_python_path)
 
     def test_remove_current_directory_from_python_path_linux(self):
         dir = r"/home/georgefloyd/workplace/opentelemetry-python-contrib/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation"
         path_separator = r":"
         python_path = r"/home/georgefloyd/workplace/opentelemetry-python-contrib/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation:/home/georgefloyd/workplace"
-        actual_python_path = _python_path_without_current_directory(
-            python_path,
-            dir,
-            path_separator
+        actual_python_path = _python_path_without_directory(
+            python_path, dir, path_separator
         )
         expected_python_path = r"/home/georgefloyd/workplace"
-        assert(expected_python_path == actual_python_path)
+        self.assertEqual(actual_python_path, expected_python_path)
+
+    def test_remove_current_directory_from_python_path_windows_only_path(self):
+        dir = r"c:\users\Charleena Lyles\workplace\opentelemetry-python-contrib\opentelemetry-instrumentation\src\opentelemetry\instrumentation\auto_instrumentation"
+        path_separator = r";"
+        python_path = r"c:\users\Charleena Lyles\workplace\opentelemetry-python-contrib\opentelemetry-instrumentation\src\opentelemetry\instrumentation\auto_instrumentation"
+        actual_python_path = _python_path_without_directory(
+            python_path, dir, path_separator
+        )
+        self.assertEqual(actual_python_path, python_path)
+
+    def test_remove_current_directory_from_python_path_linux_only_path(self):
+        dir = r"/home/sandranland/workplace/opentelemetry-python-contrib/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation"
+        path_separator = r":"
+        python_path = r"/home/SandraBland/workplace/opentelemetry-python-contrib/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation"
+        actual_python_path = _python_path_without_directory(
+            python_path, dir, path_separator
+        )
+        self.assertEqual(actual_python_path, python_path)