Fix wsgi invalid request uri

instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py

@@ -262,7 +262,6 @@ def response_hook(span: Span, environ: WSGIEnvironment, status: str, response_he
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE,
     SanitizeValue,
-    _parse_url_query,
     detect_synthetic_user_agent,
     get_custom_headers,
     normalise_request_header_name,
@@ -360,7 +359,8 @@ def collect_request_attributes(
     if target is None:  # Note: `"" or None is None`
         target = environ.get("REQUEST_URI")
     if target:
-        path, query = _parse_url_query(target)
+        path = environ.get("PATH_INFO")
+        query = environ.get("QUERY_STRING")
         _set_http_target(result, target, path, query, sem_conv_opt_in_mode)
     else:
         # old semconv v1.20.0

instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py

@@ -810,8 +810,7 @@ def test_request_attributes_with_full_request_uri(self):
             HTTP_TARGET: "http://docs.python.org:80/3/library/urllib.parse.html?highlight=params#url-parsing",
         }
         expected_new = {
-            URL_PATH: "/3/library/urllib.parse.html",
-            URL_QUERY: "highlight=params",
+            URL_PATH: self.environ["PATH_INFO"],
         }
         self.assertGreaterEqual(
             otel_wsgi.collect_request_attributes(self.environ).items(),
@@ -825,6 +824,32 @@ def test_request_attributes_with_full_request_uri(self):
             expected_new.items(),
         )
 
+    def test_request_attributes_with_invalid_request_uri_uses_wsgi_environ(self):
+        # Previously raised ValueError when REQUEST_URI was parsed.
+        self.environ["REQUEST_URI"] = "http://example.com[invalid"
+        self.environ["PATH_INFO"] = "/safe/path"
+        self.environ["QUERY_STRING"] = "a=b"
+
+        expected_old = {
+            HTTP_TARGET: self.environ["REQUEST_URI"],
+        }
+        expected_new = {
+            URL_PATH: "/safe/path",
+            URL_QUERY: "a=b",
+        }
+
+        self.assertGreaterEqual(
+            otel_wsgi.collect_request_attributes(self.environ).items(),
+            expected_old.items(),
+        )
+        self.assertGreaterEqual(
+            otel_wsgi.collect_request_attributes(
+                self.environ,
+                _StabilityMode.HTTP,
+            ).items(),
+            expected_new.items(),
+        )
+
     def test_http_user_agent_attribute(self):
         self.environ["HTTP_USER_AGENT"] = "test-useragent"
         expected = {HTTP_USER_AGENT: "test-useragent"}