utf-queue-client 1.19.2b1__tar.gz → 1.19.2b2__tar.gz

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/.idea/utf_queue_client_python.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (utf_queue_client_python)" jdkType="Python SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.19.2b1
+Version: 1.19.2b2
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "utf-queue-client"
-version = "1.19.2b1"
+version = "1.19.2b2"
 description = "No description provided"
 authors = [
     { name = "Joe Savage", email = "joe.savage@silabs.com" }
@@ -69,4 +69,4 @@ ignore = [
 ]
 
 [tool.ruff.lint.pydocstyle]
-convention = "google"
+convention = "google"

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/test/conftest.py

@@ -14,7 +14,6 @@ from utf_queue_client.clients.async_consumer import AsyncConsumerBase, MessageCo
 from utf_queue_client.models import (
     SqaAppBuildResult,
     SqaTestResult,
-    SqaTestResultApps,
     SqaTestSession,
 )
 from utf_queue_client.models.schemas.utf_queue_models.models.python.generated_models import (
@@ -99,14 +98,6 @@ def sqa_test_result():
     )
 
 
-@pytest.fixture()
-def sqa_test_result_apps():
-    yield SqaTestResultApps(
-        test_case_uuid="23122702-2334-4323-6723-822dee7f8168",
-        artifact_id="d99d8631-8d1e-4b42-8a2c-c586982736as",
-    )
-
-
 @pytest.fixture()
 def sqa_test_session():
     yield SqaTestSession(

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/test/test_sqa_test_result_producer.py

@@ -24,7 +24,6 @@ def test_result_producer_central_queue(
     amqp_url,
     queue_consumer,
     use_http_producer,
-    sqa_test_result_apps,
 ):
     os.environ["UTF_PRODUCER_APP_ID"] = request.node.name
     os.environ["UTF_QUEUE_USE_HTTP_PRODUCER"] = "true" if use_http_producer else "false"
@@ -39,16 +38,11 @@ def test_result_producer_central_queue(
     queue_consumer.expect_messages(3)
     producer.publish_test_result(sqa_test_result)
     queue_consumer.expect_messages(4)
-    producer.publish_test_result_apps(sqa_test_result_apps)
-    queue_consumer.expect_messages(5)
 
 
-def test_dummy_producer(
-    sqa_app_build_result, sqa_test_result, sqa_test_session, sqa_test_result_apps
-):
+def test_dummy_producer(sqa_app_build_result, sqa_test_result, sqa_test_session):
     producer = DummySqaTestResultProducer()
     producer.publish_app_build_result(sqa_app_build_result)
     producer.publish_test_session_start(sqa_test_session)
     producer.publish_test_session_stop(sqa_test_session)
     producer.publish_test_result(sqa_test_result)
-    producer.publish_test_result_apps(sqa_test_result_apps)

utf_queue_client-1.19.2b2/utf_queue_client/__init__.py

@@ -0,0 +1,18 @@
+import logging
+import os
+
+from utf_queue_client.custom_exporter import CustomSpansExporter
+
+DISABLE_SSL_VERIFICATION_DEFAULT = "true"
+disable_utf_queue_client_traces = os.environ.get(
+    "DISABLE_UTF_QUEUE_CLIENT_TRACES", "false"
+).lower()
+if disable_utf_queue_client_traces == "true":
+    logger = logging.getLogger()
+    default_custom_exporter = (
+        f"{CustomSpansExporter.__module__}.{CustomSpansExporter.__name__}"
+    )
+    logger.info(
+        f"Disabling the queue client traces for performance - {default_custom_exporter}"
+    )
+    os.environ["OTEL_EXPORTER_CUSTOM_SPAN_EXPORTER_TYPE"] = default_custom_exporter

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/clients/base_producer.py

@@ -9,7 +9,6 @@ import msgpack
 import pika
 from opentelemetry import trace
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
-from otel_extensions import instrumented
 from pika.adapters.utils.connection_workflow import AMQPConnectorException
 from pika.exceptions import AMQPConnectionError
 from pika.spec import PERSISTENT_DELIVERY_MODE, TRANSIENT_DELIVERY_MODE, BasicProperties
@@ -86,7 +85,6 @@ class BaseProducer(ABC, Loggable):
     def channel(self) -> PikaChannel:
         pass
 
-    @instrumented
     def queue_declare(
         self,
         queue,

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/clients/sqa_test_result_producer.py

@@ -8,13 +8,7 @@ from uuid import uuid4
 
 from otel_extensions import instrumented
 
-from ..models import (
-    QueueMessage,
-    SqaAppBuildResult,
-    SqaTestResult,
-    SqaTestResultApps,
-    SqaTestSession,
-)
+from ..models import QueueMessage, SqaAppBuildResult, SqaTestResult, SqaTestSession
 from ..utils import UTF_QUEUE_SERVER_PATTERN
 from . import Loggable
 from .base_producer import BlockingProducer as AMQPBlockingProducer
@@ -49,10 +43,6 @@ class BaseSqaTestResultProducer(ABC):
     ):
         """publish an SqaAppBuildResult object"""
 
-    @abstractmethod
-    def publish_test_result_apps(self, test_result_apps: SqaTestResultApps):
-        """publish an SqaTestResultApps object"""
-
 
 class SqaTestResultProducer(BaseSqaTestResultProducer):
     RECORD_TYPE = "UTF_TEST_EVENT"
@@ -125,18 +115,6 @@ class SqaTestResultProducer(BaseSqaTestResultProducer):
         )
         self._publish_message(queue_message)
 
-    @instrumented
-    def publish_test_result_apps(self, test_result_apps: SqaTestResultApps):
-        queue_message = QueueMessage(
-            payload=test_result_apps,
-            recordType=self.RECORD_TYPE,
-            recordSubType="TEST_RESULT_APP",
-            tenantKey=self.producer_app_id,
-            recordTimestamp=datetime.now().isoformat(),
-            messageId=str(uuid4()),
-        )
-        self._publish_message(queue_message)
-
 
 class LocalSqaTestResultProducer(SqaTestResultProducer):
     def __init__(self):
@@ -168,10 +146,6 @@ class DummySqaTestResultProducer(BaseSqaTestResultProducer):
         # noqa
         pass
 
-    def publish_test_result_apps(self, test_result_apps: SqaTestResultApps):
-        # noqa
-        pass
-
 
 class SqaTestResultProducerFactory(Loggable):
     @classmethod

utf_queue_client-1.19.2b2/utf_queue_client/custom_exporter.py

@@ -0,0 +1,18 @@
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
+    OTLPSpanExporter as HTTPSpanExporter,
+)
+from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
+
+
+class CustomSpansExporter(SpanExporter):
+    def __init__(self, options):
+        self.exporter = HTTPSpanExporter()
+
+    def export(self, spans):
+        return SpanExportResult.SUCCESS
+
+    def shutdown(self):
+        return self.exporter.shutdown()
+
+    def force_flush(self, timeout_millis: int = 60000):
+        return self.exporter.force_flush(timeout_millis)

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models.py

@@ -26,7 +26,6 @@ if IS_PYDANTIC_V1:
     from .generated_models_pydantic_v1 import XrayTestInfo
     from .generated_models_pydantic_v1 import XrayTestExecUpdate
     from .generated_models_pydantic_v1 import XrayImportTestExecution
-    from .generated_models_pydantic_v1 import SqaTestResultApps
 else:
     from .generated_models_pydantic_v2 import QueueMessage
     from .generated_models_pydantic_v2 import QueueMessageV1
@@ -51,7 +50,6 @@ else:
     from .generated_models_pydantic_v2 import XrayTestInfo
     from .generated_models_pydantic_v2 import XrayTestExecUpdate
     from .generated_models_pydantic_v2 import XrayImportTestExecution
-    from .generated_models_pydantic_v2 import SqaTestResultApps
 
 __all__ = [
     "QueueMessage",
@@ -77,5 +75,4 @@ __all__ = [
     "XrayTestInfo",
     "XrayTestExecUpdate",
     "XrayImportTestExecution",
-    "SqaTestResultApps",
 ]

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v1.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  queue_message.json
-#   timestamp: 2025-04-17T06:59:51+00:00
+#   timestamp: 2025-03-13T06:42:56+00:00
 
 from __future__ import annotations
 
@@ -98,8 +98,6 @@ class SqaAppBuildResult(BaseModel):
     test_duration_sec: float = Field(
         ..., description="Length of time to build the application"
     )
-    package_info: Optional[str] = None
-    artifact_id: Optional[constr(max_length=36)] = None
 
 
 class SqaTestResult(BaseModel):
@@ -295,11 +293,6 @@ class XrayImportTestExecution(BaseModel):
     add_tests_to_plan: Optional[bool] = None
 
 
-class SqaTestResultApps(BaseModel):
-    test_case_uuid: constr(max_length=36)
-    artifact_id: constr(max_length=36)
-
-
 class QueueMessage(BaseModel):
     recordType: Literal[
         "ARTIFACT_UPLOAD_REQUEST",
@@ -318,7 +311,6 @@ class QueueMessage(BaseModel):
             "SESSION_START",
             "SESSION_STOP",
             "TEST_RESULT",
-            "TEST_RESULT_APP",
         ]
     ] = Field(
         None,

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/models/schemas/utf_queue_models/models/python/generated_models_pydantic_v2.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  queue_message.json
-#   timestamp: 2025-04-17T06:59:53+00:00
+#   timestamp: 2025-03-13T06:42:57+00:00
 
 from __future__ import annotations
 
@@ -96,8 +96,6 @@ class SqaAppBuildResult(BaseModel):
     test_duration_sec: float = Field(
         ..., description="Length of time to build the application"
     )
-    package_info: Optional[str] = None
-    artifact_id: Optional[constr(max_length=36)] = None
 
 
 class SqaTestResult(BaseModel):
@@ -292,11 +290,6 @@ class XrayImportTestExecution(BaseModel):
     add_tests_to_plan: Optional[bool] = None
 
 
-class SqaTestResultApps(BaseModel):
-    test_case_uuid: constr(max_length=36)
-    artifact_id: constr(max_length=36)
-
-
 class QueueMessage(BaseModel):
 
     @field_validator("payload", mode="before")
@@ -322,7 +315,6 @@ class QueueMessage(BaseModel):
             "SESSION_START",
             "SESSION_STOP",
             "TEST_RESULT",
-            "TEST_RESULT_APP",
         ]
     ] = Field(
         None,

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/models/schemas/utf_queue_models/schema/queue_message.json

@@ -25,8 +25,7 @@
             "IMPORT_TEST_EXECUTION",
             "SESSION_START",
             "SESSION_STOP",
-            "TEST_RESULT",
-            "TEST_RESULT_APP"
+            "TEST_RESULT"
           ],
           "type": "string"
         },
@@ -324,13 +323,6 @@
         "test_duration_sec": {
           "description": "Length of time to build the application",
           "type": "number"
-        },
-        "package_info": {
-          "type": "string"
-        },
-        "artifact_id": {
-          "maxLength": 36,
-          "type": "string"
         }
       },
       "required": [
@@ -922,23 +914,6 @@
         "test_execution_key",
         "tests"
       ]
-    },
-    "SqaTestResultApps": {
-      "type": "object",
-      "properties": {
-        "test_case_uuid": {
-          "maxLength": 36,
-          "type": "string"
-        },
-        "artifact_id": {
-          "maxLength": 36,
-          "type": "string"
-        }
-      },
-      "required": [
-        "artifact_id",
-        "test_case_uuid"
-      ]
     }
   }
 }

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client/scripts/publish_test_results_cli.py

@@ -2,7 +2,6 @@ import os
 from typing import Iterable, Tuple
 
 import click
-from otel_extensions import instrumented
 from retry import retry
 
 from utf_queue_client.clients.sqa_test_result_producer import (
@@ -79,7 +78,6 @@ def cli(
         retry_wrapper()
 
 
-@instrumented
 def publish_test_results_through_queue(url, data_type: str, data_dict: dict):
     os.environ["UTF_QUEUE_SERVER_URL"] = url
     os.environ["UTF_PRODUCER_APP_ID"] = QUEUE_APP_ID
@@ -114,7 +112,6 @@ def publish_test_results_through_queue(url, data_type: str, data_dict: dict):
         )
 
 
-@instrumented()
 def prepare_session_data(data_dict: dict):
     return SqaTestSession(
         PK_ID=data_dict.get("PK_ID"),

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utf-queue-client
-Version: 1.19.2b1
+Version: 1.19.2b2
 Summary: No description provided
 Author-email: Joe Savage <joe.savage@silabs.com>
 Keywords: UTF

{utf_queue_client-1.19.2b1 → utf_queue_client-1.19.2b2}/utf_queue_client.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ tools/upload_to_nexus.bat
 tools/upload_to_pypi.bat
 tools/upload_to_testpypi.bat
 utf_queue_client/__init__.py
+utf_queue_client/custom_exporter.py
 utf_queue_client.egg-info/PKG-INFO
 utf_queue_client.egg-info/SOURCES.txt
 utf_queue_client.egg-info/dependency_links.txt

utf_queue_client-1.19.2b1/utf_queue_client/__init__.py

@@ -1 +0,0 @@
-DISABLE_SSL_VERIFICATION_DEFAULT = "true"