Address additional ruff checks that could not be automatically fixed.

Author: michaelsafyan

opentelemetry-instrumentation/src/opentelemetry/instrumentation/_blobupload/api/__init__.py

@@ -36,14 +36,14 @@
 )
 
 __all__ = [
-    Blob,
-    BlobUploader,
-    NOT_UPLOADED,
-    detect_content_type,
-    generate_labels_for_event,
-    generate_labels_for_span,
-    generate_labels_for_span_event,
-    BlobUploaderProvider,
-    get_blob_uploader,
-    set_blob_uploader_provider,
+    "Blob",
+    "BlobUploader",
+    "NOT_UPLOADED",
+    "detect_content_type",
+    "generate_labels_for_event",
+    "generate_labels_for_span",
+    "generate_labels_for_span_event",
+    "BlobUploaderProvider",
+    "get_blob_uploader",
+    "set_blob_uploader_provider",
 ]

opentelemetry-instrumentation/src/opentelemetry/instrumentation/_blobupload/backend/google/gcs/__init__.py

@@ -17,5 +17,5 @@
 )
 
 __all__ = [
-    GcsBlobUploader
+    "GcsBlobUploader"
 ]

opentelemetry-instrumentation/src/opentelemetry/instrumentation/_blobupload/backend/google/gcs/_gcs_impl.py

@@ -59,7 +59,7 @@ def _path_for_span_event(trace_id, span_id, event_index):
 
 def _path_segment_from_labels(labels):
     """Returns a path segment based on blob label metadata.
-    
+
     This aims to return paths like:
 
        'traces/12345/spans/56789'
@@ -120,7 +120,7 @@ class GcsBlobUploader(BlobUploader):
 
     def __init__(self, prefix: str, client:Optional[GcsClient]=None):
         """Intialize the GcsBlobUploader class.
-        
+
         Args:
          - prefix: a string beginning with "gs://" that includes
            the Google Cloud Storage bucket to which to write as
@@ -132,7 +132,7 @@ def __init__(self, prefix: str, client:Optional[GcsClient]=None):
            Credentials). Supply your own instance if you'd like to
            use non-default configuration (e.g. to use an explicit
            credential other than the one in the environment).
-        
+
         Known Failure Modes:
           - Missing 'google-cloud-storage' library dependency.
           - Failure to construct the client (e.g. absence of a valid
@@ -145,7 +145,7 @@ def __init__(self, prefix: str, client:Optional[GcsClient]=None):
 
     def upload_async(self, blob: Blob) -> str:
         """Upload the specified blob in the background.
-        
+
         Generates a URI from the blob, based on the prefix supplied
         to the constructor as well as the labels of the Blob (may
         also include entropy or other random components). Immediately

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

@@ -22,6 +22,6 @@
 )
 
 __all__ = [
-    blob_uploader_from_simple_blob_uploader,
-    SimpleBlobUploader,
+    "blob_uploader_from_simple_blob_uploader",
+    "SimpleBlobUploader",
 ]

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

@@ -25,7 +25,7 @@ class SimpleBlobUploader(abc.ABC):
     @abc.abstractmethod
     def generate_destination_uri(self, blob: Blob) -> str:
        """Generates a URI of where the blob will get written.
-       
+
        Args:
          blob: the blob which will be uploaded.
 

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

@@ -60,7 +60,7 @@ def __call__(self):
         _logger.debug('Uploading blob to "{}".'.format(self._uri))
         try:
             self._simple_uploader.upload_sync(self._uri, self._blob)
-        except:
+        except Exception:
             _logger.exception('Failed to upload blob to "{}".'.format(self._uri))
 
 
@@ -105,7 +105,7 @@ def _get_or_create_default_executor():
 
 class _SimpleBlobUploaderAdaptor(BlobUploader):
     """Implementation of 'BlobUploader' wrapping a 'SimpleBlobUploader'.
-    
+
     This implements the core of the function 'blob_uploader_from_simple_blob_uploader'.
     """
 
@@ -127,7 +127,7 @@ def _do_in_background(self, action):
 
 def blob_uploader_from_simple_blob_uploader(simple_uploader: SimpleBlobUploader) -> BlobUploader:
     """Implements a 'BlobUploader' using the supplied 'SimpleBlobUploader'.
-    
+
     The purpose of this function is to allow backend implementations/vendors to be able to
     implement their logic much more simply, using synchronous uploading interfaces.
 

opentelemetry-instrumentation/tests/_blobupload/api/test_content_type.py

@@ -13,11 +13,11 @@
 from opentelemetry.instrumentation._blobupload.api import detect_content_type
 
 
-def create_test_image(format):
+def create_test_image(image_format):
     """Helper for creating a PIL Image for verifying image format support."""
     test_img = Image.new("RGB", (2, 2))
     output_buffer = io.BytesIO()
-    test_img.save(output_buffer, format)
+    test_img.save(output_buffer, image_format)
     result = output_buffer.getvalue()
     output_buffer.close()
     test_img.close()
@@ -27,33 +27,33 @@ def create_test_image(format):
 class TestContentType(unittest.TestCase):
 
     def test_handles_empty_correctly(self):
-        input = bytes()
-        output = detect_content_type(input)
-        self.assertEqual(output, "application/octet-stream")
+        data = bytes()
+        content_type = detect_content_type(data)
+        self.assertEqual(content_type, "application/octet-stream")
 
     def test_detects_plaintext(self):
-        input = "this is just regular text"
-        output = detect_content_type(input.encode())
-        self.assertEqual(output, "text/plain")
+        data = "this is just regular text"
+        content_type = detect_content_type(data.encode())
+        self.assertEqual(content_type, "text/plain")
 
     def test_detects_json(self):
-        input = """{
+        data = """{
             "this": {
                 "contains": "json"
             }
         }"""
-        output = detect_content_type(input.encode())
-        self.assertEqual(output, "application/json")
+        content_type = detect_content_type(data.encode())
+        self.assertEqual(content_type, "application/json")
 
     def test_detects_jpeg(self):
-        input = create_test_image("jpeg")
-        output = detect_content_type(input)
-        self.assertEqual(output, "image/jpeg")
+        data = create_test_image("jpeg")
+        content_type = detect_content_type(data)
+        self.assertEqual(content_type, "image/jpeg")
 
     def test_detects_png(self):
-        input = create_test_image("png")
-        output = detect_content_type(input)
-        self.assertEqual(output, "image/png")
+        data = create_test_image("png")
+        content_type = detect_content_type(data)
+        self.assertEqual(content_type, "image/png")
 
 
 if __name__ == "__main__":

opentelemetry-instrumentation/tests/_blobupload/backend/google/gcs/test_gcs_blob_uploader.py

@@ -33,32 +33,32 @@ def __init__(self):
     def reset(self):
         self._storage = {}
 
-    def get(self, id):
-        while id not in self._done:
+    def get(self, gcs_blob_id):
+        while gcs_blob_id not in self._done:
             self._queue.get()
-        return self._storage.get(id)
+        return self._storage.get(gcs_blob_id)
 
-    def upload_from_file(self, id, data, content_type):
+    def upload_from_file(self, gcs_blob_id, data, content_type):
         b = Blob(data.read(), content_type=content_type)
-        self._storage[id] = b
+        self._storage[gcs_blob_id] = b
 
-    def update_metadata(self, id, new_metadata):
-        old = self._storage[id]
+    def update_metadata(self, gcs_blob_id, new_metadata):
+        old = self._storage[gcs_blob_id]
         b = Blob(old.raw_bytes, content_type=old.content_type, labels=new_metadata)
-        self._storage[id] = b
-        self._done.add(id)
-        self._queue.put(id)
+        self._storage[gcs_blob_id] = b
+        self._done.add(gcs_blob_id)
+        self._queue.put(gcs_blob_id)
 
 
 class FakeGcsBlob(object):
 
-    def __init__(self, id, fake_gcs):
-        self._id = id
+    def __init__(self, gcs_blob_id, fake_gcs):
+        self._gcs_blob_id = gcs_blob_id
         self._fake_gcs = fake_gcs
         self._metadata = {}
 
     def upload_from_file(self, iodata, content_type):
-        self._fake_gcs.upload_from_file(self._id, iodata, content_type)
+        self._fake_gcs.upload_from_file(self._gcs_blob_id, iodata, content_type)
 
     @property
     def metadata(self):
@@ -67,7 +67,7 @@ def metadata(self):
     @metadata.setter
     def metadata(self, m):
         self._metadata = m
-        self._fake_gcs.update_metadata(self._id, self._metadata)
+        self._fake_gcs.update_metadata(self._gcs_blob_id, self._metadata)
 
 
 def mocked_blob_from_uri(fake_gcs):
@@ -81,8 +81,8 @@ def gcs_blob_from_uri(uri, client):
 _gcs_client_wrapper.set_gcs_blob_from_uri(mocked_blob_from_uri(_gcs_mock))
 
 
-def get_from_fake_gcs(id):
-    return _gcs_mock.get(id)
+def get_from_fake_gcs(gcs_blob_id):
+    return _gcs_mock.get(gcs_blob_id)
 
 
 class GcsBlobUploaderTestCase(unittest.TestCase):
@@ -92,7 +92,7 @@ def setUp(self):
 
     def test_constructor_throws_if_prefix_not_uri(self):
         with self.assertRaises(ValueError):
-            GcsBlobUploader("not a valid URI")
+            GcsBlobUploader("not a valgcs_blob_id URI")
 
     def test_constructor_throws_if_prefix_not_gs_protocol(self):
         with self.assertRaises(ValueError):