Fix: Fix Unit tests

Author: rajeevpodar

google/cloud/storage/_opentelemetry_tracing.py

@@ -115,8 +115,8 @@ def _set_api_request_attr(request, client):
     if request.get("path"):
         full_url = client._connection.build_api_url(request.get("path"))
         attr.update(_get_opentelemetry_attributes_from_url(full_url, strip_query=True))
-    if request.get("timeout"):
-        attr["connect_timeout,read_timeout"] = request.get("timeout")
+    if "timeout" in request:
+        attr["connect_timeout,read_timeout"] = str(request.get("timeout"))
     return attr
 
 
@@ -131,8 +131,16 @@ def _get_opentelemetry_attributes_from_url(
 ):
     """Helper to assemble OpenTelemetry span attributes from a URL."""
     u = urlparse(url)
+    netloc = u.netloc
+    # u.hostname is always lowercase. We parse netloc to preserve casing.
+    # netloc format: [userinfo@]host[:port]
+    if "@" in netloc:
+        netloc = netloc.split("@", 1)[1]
+    if ":" in netloc and not netloc.endswith("]"):  # Handle IPv6 literal
+        netloc = netloc.split(":", 1)[0]
+
     attributes = {
-        "server.address": u.hostname,
+        "server.address": netloc,
         "server.port": u.port,
         "url.scheme": u.scheme,
         "url.path": u.path,

tests/unit/test__opentelemetry_tracing.py

@@ -148,10 +148,9 @@ def test_get_final_attributes(setup, setup_optin):
         "user_agent.original": f"gcloud-python/{__version__}",
         "http.request.method": "GET",
         "server.address": "testOtel.org",
-        "server.port": None,
         "url.path": "/foo/bar/baz",
         "url.scheme": "https",
-        "http.request.timeout": str((100, 100)),
+        "connect_timeout,read_timeout": str((100, 100)),
         "retry": f"multiplier{retry_obj._multiplier}/deadline{retry_obj._deadline}/max{retry_obj._maximum}/initial{retry_obj._initial}/predicate{retry_obj._predicate}",
     }
     expected_attributes.update(_opentelemetry_tracing._cloud_trace_adoption_attrs)
@@ -219,6 +218,20 @@ def test__get_opentelemetry_attributes_from_url():
     assert attrs == expected
 
 
+def test__get_opentelemetry_attributes_from_url_with_query():
+    url = "https://example.com/path?query=true&another=false"
+    expected = {
+        "server.address": "example.com",
+        "server.port": None,
+        "url.scheme": "https",
+        "url.path": "/path",
+        "url.query": "query=true&another=false",
+    }
+    # Test not stripping query
+    attrs = _opentelemetry_tracing._get_opentelemetry_attributes_from_url(url, strip_query=False)
+    assert attrs == expected
+
+
 def test_set_api_request_attr_with_pii_in_query():
     client = mock.Mock()
     client._connection.build_api_url.return_value = "https://example.com/path?sensitive=true&token=secret"
@@ -230,7 +243,7 @@ def test_set_api_request_attr_with_pii_in_query():
         "server.port": None,
         "url.scheme": "https",
         "url.path": "/path",
-        "http.request.timeout": "60",
+        "connect_timeout,read_timeout": "60",
     }
     attr = _opentelemetry_tracing._set_api_request_attr(request, client)
     assert attr == expected_attributes
@@ -243,4 +256,4 @@ def test_set_api_request_attr_no_timeout():
 
     request = {"method": "GET", "path": "/path"}
     attr = _opentelemetry_tracing._set_api_request_attr(request, client)
-    assert "http.request.timeout" not in attr
+    assert "connect_timeout,read_timeout" not in attr

tests/unit/test_client.py

@@ -684,6 +684,7 @@ def test__list_resource_w_defaults(self):
         credentials = _make_credentials()
         client = self._make_one(project=project, credentials=credentials)
         connection = client._base_connection = _make_connection()
+        connection.build_api_url = mock.Mock(return_value="http://example.com" + path)
 
         iterator = client._list_resource(
             path=path,
@@ -719,6 +720,7 @@ def test__list_resource_w_explicit(self):
         credentials = _make_credentials()
         client = self._make_one(project=project, credentials=credentials)
         connection = client._base_connection = _make_connection()
+        connection.build_api_url = mock.Mock(return_value="http://example.com" + path)
 
         iterator = client._list_resource(
             path=path,