resolve pylint and changed return type to str

resolve pylint

Fixed linting and changed return type to str

Author: Ryo Kather

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -172,13 +172,13 @@ async def on_request_start(
         )
 
         if trace_config_ctx.span.is_recording():
-            url = remove_url_credentials(params.url)
-
             attributes = {
                 SpanAttributes.HTTP_METHOD: http_method,
-                SpanAttributes.HTTP_URL: trace_config_ctx.url_filter(url)
+                SpanAttributes.HTTP_URL: remove_url_credentials(
+                    trace_config_ctx.url_filter(params.url)
+                )
                 if callable(trace_config_ctx.url_filter)
-                else str(url),
+                else remove_url_credentials(str(params.url)),
             }
             for key, value in attributes.items():
                 trace_config_ctx.span.set_attribute(key, value)

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

@@ -89,7 +89,7 @@ def collect_request_attributes(scope):
         SpanAttributes.NET_HOST_PORT: port,
         SpanAttributes.HTTP_FLAVOR: scope.get("http_version"),
         SpanAttributes.HTTP_TARGET: scope.get("path"),
-        SpanAttributes.HTTP_URL: str(remove_url_credentials(http_url)),
+        SpanAttributes.HTTP_URL: remove_url_credentials(http_url),
     }
     http_method = scope.get("method")
     if http_method:

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

@@ -127,7 +127,7 @@ def _instrumented_requests_call(
         if not span_name or not isinstance(span_name, str):
             span_name = get_default_span_name(method)
 
-        url = str(remove_url_credentials(url))
+        url = remove_url_credentials(url)
 
         labels = {}
         labels[SpanAttributes.HTTP_METHOD] = method

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py

@@ -64,7 +64,7 @@ def fetch_async(tracer, request_hook, response_hook, func, _, args, kwargs):
 
     if span.is_recording():
         attributes = {
-            SpanAttributes.HTTP_URL: str(remove_url_credentials(request.url)),
+            SpanAttributes.HTTP_URL: remove_url_credentials(request.url),
             SpanAttributes.HTTP_METHOD: request.method,
         }
         for key, value in attributes.items():

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

@@ -145,7 +145,7 @@ def _instrumented_open_call(
         if not span_name or not isinstance(span_name, str):
             span_name = get_default_span_name(method)
 
-        url = str(remove_url_credentials(url))
+        url = remove_url_credentials(url)
 
         labels = {
             SpanAttributes.HTTP_METHOD: method,

instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py

@@ -36,6 +36,8 @@
 from opentelemetry.trace import StatusCode
 
 # pylint: disable=too-many-public-methods
+
+
 class RequestsIntegrationTestBase(abc.ABC):
     # pylint: disable=no-member
 

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

@@ -131,8 +131,8 @@ def collect_request_attributes(environ):
     if target is not None:
         result[SpanAttributes.HTTP_TARGET] = target
     else:
-        result[SpanAttributes.HTTP_URL] = str(
-            remove_url_credentials(wsgiref_util.request_uri(environ))
+        result[SpanAttributes.HTTP_URL] = remove_url_credentials(
+            wsgiref_util.request_uri(environ)
         )
 
     remote_addr = environ.get("REMOTE_ADDR")

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

@@ -63,10 +63,10 @@ def unwrap(obj, attr: str):
         setattr(obj, attr, func.__wrapped__)
 
 
-def remove_url_credentials(url: str) -> URL:
+def remove_url_credentials(url: str) -> str:
     """Given a string url, attempt to remove the username and password"""
     try:
-        url = URL(url).with_user(None)
+        url = str(URL(url).with_user(None))
     except ValueError:  # invalid url was passed
         pass
     return url