hexkit 4.3.0__tar.gz → 4.4.0__tar.gz

{hexkit-4.3.0/src/hexkit.egg-info → hexkit-4.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexkit
-Version: 4.3.0
+Version: 4.4.0
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0
@@ -31,6 +31,16 @@ Requires-Dist: boto3<2,>=1.37; extra == "s3"
 Requires-Dist: botocore<2,>=1.37; extra == "s3"
 Provides-Extra: mongodb
 Requires-Dist: motor<4,>=3.7; extra == "mongodb"
+Provides-Extra: opentelemetry
+Requires-Dist: opentelemetry-sdk<2,>=1.31.1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http<2,>=1.31.1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-distro>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-aiokafka>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-botocore>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-fastapi>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-httpx>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-pymongo>=0.52b1; extra == "opentelemetry"
 Provides-Extra: test-akafka
 Requires-Dist: hexkit[akafka]; extra == "test-akafka"
 Requires-Dist: testcontainers[kafka]<5,>=4.9; extra == "test-akafka"
@@ -44,6 +54,7 @@ Provides-Extra: test
 Requires-Dist: hexkit[test-akafka,test-mongodb,test-s3]; extra == "test"
 Provides-Extra: all
 Requires-Dist: hexkit[test]; extra == "all"
+Requires-Dist: hexkit[opentelemetry]; extra == "all"
 Dynamic: license-file
 
 ![tests](https://github.com/ghga-de/hexkit/actions/workflows/tests.yaml/badge.svg)

{hexkit-4.3.0 → hexkit-4.4.0}/pyproject.toml

@@ -24,10 +24,10 @@ classifiers = [
     "Intended Audience :: Developers",
 ]
 name = "hexkit"
-version = "4.3.0"
+version = "4.4.0"
 description = "A Toolkit for Building Microservices using the Hexagonal Architecture"
 dependencies = [
-    "opentelemetry-api>=1.31.1, <2",
+    "opentelemetry-api >=1.31.1, <2",
     "pydantic >=2.10, <3",
     "pydantic_settings >=2.8, <3",
     "PyYAML >=6, <7",
@@ -48,6 +48,17 @@ s3 = [
 mongodb = [
     "motor >=3.7, <4",
 ]
+opentelemetry = [
+    "opentelemetry-sdk >=1.31.1, <2",
+    "opentelemetry-exporter-otlp-proto-http >=1.31.1, <2",
+    "opentelemetry-distro >=0.52b1",
+    "opentelemetry-instrumentation >=0.52b1",
+    "opentelemetry-instrumentation-aiokafka >=0.52b1",
+    "opentelemetry-instrumentation-botocore >=0.52b1",
+    "opentelemetry-instrumentation-fastapi >=0.52b1",
+    "opentelemetry-instrumentation-httpx >=0.52b1",
+    "opentelemetry-instrumentation-pymongo >=0.52b1",
+]
 test-akafka = [
     "hexkit[akafka]",
     "testcontainers[kafka] >=4.9, <5",
@@ -65,6 +76,7 @@ test = [
 ]
 all = [
     "hexkit[test]",
+    "hexkit[opentelemetry]",
 ]
 
 [project.urls]

hexkit-4.4.0/src/hexkit/opentelemetry_setup.py

@@ -0,0 +1,30 @@
+# Copyright 2021 - 2025 Universität Tübingen, DKFZ, EMBL, and Universität zu Köln
+# for the German Human Genome-Phenome Archive (GHGA)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.
+"""OpenTelemetry specific configuration code. This is gated behind the opentelemetry extra."""
+
+from opentelemetry import trace
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+
+
+def configure_tracer(service_name: str):
+    """Set up a global tracer for a specific service."""
+    resource = Resource(attributes={SERVICE_NAME: service_name})
+    trace_provider = TracerProvider(resource=resource)
+    processor = BatchSpanProcessor(OTLPSpanExporter())
+    trace_provider.add_span_processor(processor)
+    trace.set_tracer_provider(trace_provider)

{hexkit-4.3.0 → hexkit-4.4.0}/src/hexkit/providers/akafka/provider/eventsub.py

@@ -390,9 +390,7 @@ class KafkaEventSubscriber(InboundProviderBase):
 
         if config.kafka_enable_dlq:
             if using_dlq_protocol:
-                updated_config = config.model_dump()
-                updated_config["kafka_enable_dlq"] = False
-                config = KafkaConfig(**updated_config)
+                config = config.model_copy(update={"kafka_enable_dlq": False})
                 logging.warning(
                     "Can't enable DLQ when using DLQSubscriberProtocol. Disabling DLQ."
                 )

{hexkit-4.3.0 → hexkit-4.4.0}/src/hexkit/providers/s3/provider.py

@@ -409,20 +409,26 @@ class S3ObjectStorage(ObjectStorageProtocol):
 
         (S3 allows multiple ongoing multi-part uploads.)
         """
+        uploads = []
         try:
-            uploads_info = await asyncio.to_thread(
-                self._client.list_multipart_uploads,
+            response_iter = await asyncio.to_thread(
+                self._client.get_paginator("list_multipart_uploads").paginate,
                 Bucket=bucket_id,
             )
+            for response_page in response_iter:
+                uploads.extend(
+                    [
+                        upload["UploadId"]
+                        for upload in response_page.get("Uploads", [])
+                        if upload["Key"] == object_id
+                    ]
+                )
         except botocore.exceptions.ClientError as error:
             raise self._translate_s3_client_errors(
                 error, bucket_id=bucket_id, object_id=object_id
             ) from error
 
-        upload_list = uploads_info.get("Uploads", [])
-        return [
-            upload["UploadId"] for upload in upload_list if upload["Key"] == object_id
-        ]
+        return uploads
 
     async def _assert_no_multipart_upload(self, *, bucket_id: str, object_id: str):
         """Ensure that there are no active multi-part uploads for the given object."""

{hexkit-4.3.0 → hexkit-4.4.0/src/hexkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hexkit
-Version: 4.3.0
+Version: 4.4.0
 Summary: A Toolkit for Building Microservices using the Hexagonal Architecture
 Author-email: "German Human Genome Phenome Archive (GHGA)" <contact@ghga.de>
 License: Apache 2.0
@@ -31,6 +31,16 @@ Requires-Dist: boto3<2,>=1.37; extra == "s3"
 Requires-Dist: botocore<2,>=1.37; extra == "s3"
 Provides-Extra: mongodb
 Requires-Dist: motor<4,>=3.7; extra == "mongodb"
+Provides-Extra: opentelemetry
+Requires-Dist: opentelemetry-sdk<2,>=1.31.1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-exporter-otlp-proto-http<2,>=1.31.1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-distro>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-aiokafka>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-botocore>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-fastapi>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-httpx>=0.52b1; extra == "opentelemetry"
+Requires-Dist: opentelemetry-instrumentation-pymongo>=0.52b1; extra == "opentelemetry"
 Provides-Extra: test-akafka
 Requires-Dist: hexkit[akafka]; extra == "test-akafka"
 Requires-Dist: testcontainers[kafka]<5,>=4.9; extra == "test-akafka"
@@ -44,6 +54,7 @@ Provides-Extra: test
 Requires-Dist: hexkit[test-akafka,test-mongodb,test-s3]; extra == "test"
 Provides-Extra: all
 Requires-Dist: hexkit[test]; extra == "all"
+Requires-Dist: hexkit[opentelemetry]; extra == "all"
 Dynamic: license-file
 
 ![tests](https://github.com/ghga-de/hexkit/actions/workflows/tests.yaml/badge.svg)

{hexkit-4.3.0 → hexkit-4.4.0}/src/hexkit.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/hexkit/config.py
 src/hexkit/correlation.py
 src/hexkit/custom_types.py
 src/hexkit/log.py
+src/hexkit/opentelemetry_setup.py
 src/hexkit/py.typed
 src/hexkit/utils.py
 src/hexkit.egg-info/PKG-INFO

{hexkit-4.3.0 → hexkit-4.4.0}/src/hexkit.egg-info/requires.txt

@@ -9,10 +9,22 @@ jsonschema<5,>=4.23
 
 [all]
 hexkit[test]
+hexkit[opentelemetry]
 
 [mongodb]
 motor<4,>=3.7
 
+[opentelemetry]
+opentelemetry-sdk<2,>=1.31.1
+opentelemetry-exporter-otlp-proto-http<2,>=1.31.1
+opentelemetry-distro>=0.52b1
+opentelemetry-instrumentation>=0.52b1
+opentelemetry-instrumentation-aiokafka>=0.52b1
+opentelemetry-instrumentation-botocore>=0.52b1
+opentelemetry-instrumentation-fastapi>=0.52b1
+opentelemetry-instrumentation-httpx>=0.52b1
+opentelemetry-instrumentation-pymongo>=0.52b1
+
 [s3]
 boto3<2,>=1.37
 botocore<2,>=1.37