Simplify.

Author: Oberon00

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

@@ -48,37 +48,28 @@ def _add_request_attributes(span, environ):
         host = environ.get("HTTP_HOST")
         if not host:
             host = environ["SERVER_NAME"]
-            if environ["wsgi.url_scheme"] == "https":
-                if environ.get("SERVER_PORT", "443") != "443":
-                    host += ":" + environ["SERVER_PORT"]
-            elif environ.get("SERVER_PORT", "80") != "80":
-                host += ":" + environ["SERVER_PORT"]
-
-        # NOTE: Nonstandard, may (not) include port
+            port = environ.get("SERVER_PORT")
+            if port and (
+                port != "80"
+                and environ["wsgi.url_scheme"] == "http"
+                or port != "443"
+            ):
+                host += ":" + port
+
+        # NOTE: Nonstandard
         span.set_attribute("http.host", host)
 
         url = environ.get("REQUEST_URI") or environ.get("RAW_URI")
 
-        if url:  # We got something, but is absolute?
-            # The simplistic ``"://" in url` is not sufficient,
-            # as that could be contained in the query string.
-            try:
-                urlparts = urlparse(url)
-            except Exception:  # pylint:disable=broad-except
+        if url:
+            if url[0] == "/":
+                # We assume that no scheme-relative URLs will be in url here.
+                # After all, if a request is made to http://myserver//foo, we may get
+                # //foo which looks like scheme-relative but isn't.
+                url = environ["wsgi.url_scheme"] + "://" + host + url
+            elif not url.startswith(environ["wsgi.url_scheme"] + ":"):
+                # Something fishy is in RAW_URL. Let's fall back to request_uri()
                 url = wsgiref_util.request_uri(environ)
-            else:
-                if url.startswith("//"):  # Scheme-relative URL
-                    url = url[2:]
-                if (
-                    not urlparts.netloc and urlparts.scheme
-                ):  # E.g., "http:///?"
-                    scheme, path = url.split("://", 1)
-                    url = scheme + "://" + host + path
-                elif not urlparts.netloc or not urlparts.scheme:
-                    scheme = environ["wsgi.url_scheme"] + "://"
-                    if not urlparts.netloc:
-                        url = host + url
-                    url = scheme + url
         else:
             url = wsgiref_util.request_uri(environ)
 

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

@@ -219,32 +219,40 @@ def test_request_attributes_with_partial_raw_uri_and_nonstandard_port(
         self.environ["SERVER_PORT"] = "8080"
         self.validate_url("http://127.0.0.1:8080/?")
 
+    def test_https_uri_port(self):
+        del self.environ["HTTP_HOST"]
+        self.environ["SERVER_PORT"] = "443"
+        self.environ["wsgi.url_scheme"] = "https"
+        self.validate_url("https://127.0.0.1/")
+
+        self.environ["SERVER_PORT"] = "8080"
+        self.validate_url("https://127.0.0.1:8080/")
+
+        self.environ["SERVER_PORT"] = "80"
+        self.validate_url("https://127.0.0.1:80/")
+
     def test_request_attributes_with_nonstandard_port_and_no_host(self):
         del self.environ["HTTP_HOST"]
         self.environ["SERVER_PORT"] = "8080"
         self.validate_url("http://127.0.0.1:8080/")
 
+        self.environ["SERVER_PORT"] = "443"
+        self.validate_url("http://127.0.0.1:443/")
+
     def test_request_attributes_with_nonstandard_port(self):
         self.environ["HTTP_HOST"] += ":8080"
         self.validate_url("http://127.0.0.1:8080/")
 
-    def test_request_attributes_with_scheme_relative_raw_uri(self):
+    def test_request_attributes_with_faux_scheme_relative_raw_uri(self):
         self.environ["RAW_URI"] = "//127.0.0.1/?"
-        self.validate_url("http://127.0.0.1/?")
-
-    def test_request_attributes_with_netlocless_raw_uri(self):
-        self.environ["RAW_URI"] = "http:///?"
-        self.validate_url("http://127.0.0.1/?")
+        self.validate_url("http://127.0.0.1//127.0.0.1/?")
 
     def test_request_attributes_with_pathless_raw_uri(self):
+        self.environ["PATH_INFO"] = ""
         self.environ["RAW_URI"] = "http://hello"
         self.environ["HTTP_HOST"] = "hello"
         self.validate_url("http://hello")
 
-    def test_request_attributes_with_strange_raw_uri(self):
-        self.environ["RAW_URI"] = "http://?"
-        self.validate_url("http://127.0.0.1?")
-
     def test_request_attributes_with_full_request_uri(self):
         self.environ["HTTP_HOST"] = "127.0.0.1:8080"
         self.environ["REQUEST_URI"] = "http://127.0.0.1:8080/?foo=bar#top"