Format with ruff.

Author: michaelsafyan

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

@@ -14,9 +14,8 @@
 
 import base64
 import json
-
 from types import MappingProxyType as _frozendict
-from typing import Mapping, Dict, Optional
+from typing import Mapping, Optional
 
 
 class Blob:
@@ -119,8 +118,8 @@ def __eq__(self, o):
     def __repr__(self):
         params = [repr(self._raw_bytes)]
         if self._content_type is not None:
-            params.append('content_type={}'.format(repr(self._content_type)))
+            params.append("content_type={}".format(repr(self._content_type)))
         if self._labels:
-            params.append('labels={}'.format(json.dumps(self._labels, sort_keys=True)))
-        params_string = ', '.join(params)
-        return 'Blob({})'.format(params_string)
+            params.append("labels={}".format(json.dumps(self._labels, sort_keys=True)))
+        params_string = ", ".join(params)
+        return "Blob({})".format(params_string)

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

@@ -15,4 +15,4 @@
 """Defines constants that are used by the '_blobupload' package."""
 
 # Special constant used to indicate that a BlobUploader did not upload.
-NOT_UPLOADED = '/dev/null'
+NOT_UPLOADED = "/dev/null"

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

@@ -39,5 +39,5 @@ def from_buffer(self, raw_bytes, mime=True):
 def detect_content_type(raw_bytes: bytes) -> str:
     """Attempts to infer the content type of the specified data."""
     if not raw_bytes:
-        return 'application/octet-stream'
+        return "application/octet-stream"
     return _module.from_buffer(raw_bytes, mime=True)

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

@@ -20,8 +20,9 @@
 from opentelemetry.instrumentation._blobupload.api.blob_uploader import (
     BlobUploader,
 )
-from opentelemetry.instrumentation._blobupload.api.constants import NOT_UPLOADED
-
+from opentelemetry.instrumentation._blobupload.api.constants import (
+    NOT_UPLOADED,
+)
 
 _logger = logging.getLogger(__name__)
 

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

@@ -10,4 +10,4 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.

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

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from opentelemetry.instrumentation._blobupload.backend.google.gcs._gcs_impl import GcsBlobUploader
-
+from opentelemetry.instrumentation._blobupload.backend.google.gcs._gcs_impl import (
+    GcsBlobUploader,
+)
 
 __all__ = [
     GcsBlobUploader

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

@@ -16,9 +16,8 @@
 """Isolates calls to 'google-cloud-storage' dependency, simplifying mocking."""
 
 
-from typing import Any, TypeAlias
-
 import logging
+from typing import Any, TypeAlias
 
 _logger = logging.getLogger(__name__)
 
@@ -38,7 +37,7 @@
 # to 'Any' to allow for mocks of the Google Cloud Storage client. It
 # is updated at runtime in 'set_gcs_client_factory', though this
 # means it is not particularly useful for automatic static type
-# checking (it is, however, useful for documenting intended type). 
+# checking (it is, however, useful for documenting intended type).
 GcsClientType: TypeAlias = Any
 
 
@@ -47,7 +46,7 @@ def set_gcs_client_factory(gcs_client_type, client_factory):
     global _gcs_client_factory
     global GcsClientType
     if _gcs_initialized:
-        _logger.warning('Replacing default GCS client factory')
+        _logger.warning("Replacing default GCS client factory")
     GcsClientType = gcs_client_type
     _gcs_client_factory = client_factory
     if _gcs_client_factory and _gcs_blob_from_uri:
@@ -58,7 +57,7 @@ def set_gcs_blob_from_uri(blob_from_uri):
     global _gcs_initialized
     global _gcs_blob_from_uri
     if _gcs_initialized:
-        _logger.warning('Replacing default GCS blob_from_uri method')
+        _logger.warning("Replacing default GCS blob_from_uri method")
     _gcs_blob_from_uri = blob_from_uri
     if _gcs_client_factory and _gcs_blob_from_uri:
         _gcs_initialized = True
@@ -84,7 +83,7 @@ def blob_from_uri(uri, client):
     from google.cloud.storage import Client as _GcsClient
     from google.cloud.storage.blob import Blob as _GcsBlob
     set_gcs_client_factory(_GcsClient, _GcsClient)
-    set_gcs_blob_from_uri(getattr(_GcsBlob, 'from_uri', getattr(_GcsBlob, 'from_string')))
+    set_gcs_blob_from_uri(getattr(_GcsBlob, "from_uri", getattr(_GcsBlob, "from_string")))
     _logger.debug('Found "google-cloud-storage" optional dependency and successfully registered it.')
 except ImportError:
     _logger.warning('Missing optional "google-cloud-storage" dependency.')

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

@@ -15,16 +15,18 @@
 """Provides the 'GcsBlobUploader' class."""
 
 import io
-import uuid
 import logging
-
+import uuid
 from typing import Optional, TypeAlias
 
-from opentelemetry.instrumentation._blobupload.api import Blob
-from opentelemetry.instrumentation._blobupload.api import BlobUploader
-from opentelemetry.instrumentation._blobupload.utils import SimpleBlobUploader
-from opentelemetry.instrumentation._blobupload.utils import blob_uploader_from_simple_blob_uploader
-from opentelemetry.instrumentation._blobupload.backend.google.gcs import _gcs_client_wrapper
+from opentelemetry.instrumentation._blobupload.api import Blob, BlobUploader
+from opentelemetry.instrumentation._blobupload.backend.google.gcs import (
+    _gcs_client_wrapper,
+)
+from opentelemetry.instrumentation._blobupload.utils import (
+    SimpleBlobUploader,
+    blob_uploader_from_simple_blob_uploader,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -33,26 +35,26 @@
 
 def _path_for_span(trace_id, span_id):
     if not trace_id or not span_id:
-        return ''
-    return 'traces/{}/spans/{}'.format(trace_id, span_id)
+        return ""
+    return "traces/{}/spans/{}".format(trace_id, span_id)
 
 
 def _path_for_event(trace_id, span_id, event_name):
     if not event_name:
-        return ''
+        return ""
     span_path = _path_for_span(trace_id, span_id)
     if not span_path:
-        return ''
-    return '{}/events/{}'.format(span_path, event_name)
+        return ""
+    return "{}/events/{}".format(span_path, event_name)
 
 
 def _path_for_span_event(trace_id, span_id, event_index):
     if event_index is None:
-        return ''
+        return ""
     span_path = _path_for_span(trace_id, span_id)
     if not span_path:
-        return ''
-    return '{}/events/{}'.format(span_path, event_index)
+        return ""
+    return "{}/events/{}".format(span_path, event_index)
 
 
 def _path_segment_from_labels(labels):
@@ -67,39 +69,39 @@ def _path_segment_from_labels(labels):
     ...depending on the particular type of signal source.
 
     """
-    signal_type = labels.get('otel_type')
-    if not signal_type or signal_type not in ['span', 'event', 'span_event']:
-        return ''
-    trace_id = labels.get('trace_id')
-    span_id = labels.get('span_id')
-    event_name = labels.get('event_name')
-    event_index = labels.get('event_index')
-    if signal_type == 'span':
+    signal_type = labels.get("otel_type")
+    if not signal_type or signal_type not in ["span", "event", "span_event"]:
+        return ""
+    trace_id = labels.get("trace_id")
+    span_id = labels.get("span_id")
+    event_name = labels.get("event_name")
+    event_index = labels.get("event_index")
+    if signal_type == "span":
         return _path_for_span(trace_id, span_id)
-    elif signal_type == 'event':
+    elif signal_type == "event":
         return _path_for_event(trace_id, span_id, event_name)
-    elif signal_type == 'span_event':
+    elif signal_type == "span_event":
         return _path_for_span_event(trace_id, span_id, event_index)
 
 
 class _SimpleGcsBlobUploader(SimpleBlobUploader):
 
     def __init__(self, prefix: str, client:Optional[GcsClient]=None):
         if not prefix:
-            raise ValueError('Must supply a non-empty prefix.')
-        if not prefix.startswith('gs://'):
+            raise ValueError("Must supply a non-empty prefix.")
+        if not prefix.startswith("gs://"):
             raise ValueError('Invalid prefix; must start with "gs://"; found: "{}".'.format(prefix))
-        if not prefix.endswith('/'):
-            prefix = '{}/'.format(prefix)
+        if not prefix.endswith("/"):
+            prefix = "{}/".format(prefix)
         self._prefix = prefix
         self._client = client or _gcs_client_wrapper.create_gcs_client()
 
     def generate_destination_uri(self, blob: Blob) -> str:
         origin_path = _path_segment_from_labels(blob.labels)
-        if origin_path and not origin_path.endswith('/'):
-            origin_path = '{}/'.format(origin_path)
+        if origin_path and not origin_path.endswith("/"):
+            origin_path = "{}/".format(origin_path)
         upload_id = uuid.uuid4().hex
-        return '{}{}uploads/{}'.format(self._prefix, origin_path, upload_id)
+        return "{}{}uploads/{}".format(self._prefix, origin_path, upload_id)
 
     def upload_sync(self, uri: str, blob: Blob):
         _logger.debug('Uploading blob: size: {} -> "{}"'.format(len(blob.raw_bytes), uri))

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

@@ -14,8 +14,12 @@
 
 """Exposes API methods to callers from the package name."""
 
-from opentelemetry.instrumentation._blobupload.utils.simple_blob_uploader_adaptor import blob_uploader_from_simple_blob_uploader
-from opentelemetry.instrumentation._blobupload.utils.simple_blob_uploader import SimpleBlobUploader
+from opentelemetry.instrumentation._blobupload.utils.simple_blob_uploader import (
+    SimpleBlobUploader,
+)
+from opentelemetry.instrumentation._blobupload.utils.simple_blob_uploader_adaptor import (
+    blob_uploader_from_simple_blob_uploader,
+)
 
 __all__ = [
     blob_uploader_from_simple_blob_uploader,

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

@@ -18,6 +18,7 @@
 
 from opentelemetry.instrumentation._blobupload.api import Blob
 
+
 class SimpleBlobUploader(abc.ABC):
     """Pure abstract base class of a backend implementation that is synchronous."""
 
@@ -31,7 +32,7 @@ def generate_destination_uri(self, blob: Blob) -> str:
        Returns:
          A new, unique URI that represents the target destination of the data.
        """
-       raise NotImplementedError('SimpleBlobUploader.generate_destination_uri')
+       raise NotImplementedError("SimpleBlobUploader.generate_destination_uri")
 
     @abc.abstractmethod
     def upload_sync(self, uri: str, blob: Blob):
@@ -45,4 +46,4 @@ def upload_sync(self, uri: str, blob: Blob):
        Effects:
          Attempts to upload/write the Blob to the specified destination URI.
        """
-       raise NotImplementedError('SimpleBlobUploader.upload_sync')
+       raise NotImplementedError("SimpleBlobUploader.upload_sync")