omnata-plugin-runtime 0.8.0a193__py3-none-any.whl → 0.8.0a195__py3-none-any.whl

omnata_plugin_runtime/configuration.py

@@ -11,7 +11,7 @@ from enum import Enum
 
 from abc import ABC
 from pydantic import BaseModel, Field, PrivateAttr, SerializationInfo, TypeAdapter, field_validator, model_serializer, validator  # pylint: disable=no-name-in-module
-from .logging import logger
+from .logging import logger, tracer
 
 if tuple(sys.version_info[:2]) >= (3, 9):
     # Python 3.9 and above
@@ -19,9 +19,6 @@ if tuple(sys.version_info[:2]) >= (3, 9):
 else:
     # Python 3.8 and below
     from typing_extensions import Annotated
-from opentelemetry import trace
-
-tracer = trace.get_tracer(__name__)
 
 class MapperType(str, Enum):
     FIELD_MAPPING_SELECTOR = "field_mapping_selector"

omnata_plugin_runtime/logging.py

@@ -11,6 +11,7 @@ from pydantic import ValidationError
 from snowflake import telemetry
 from opentelemetry import trace
 
+tracer = trace.get_tracer('omnata_plugin_runtime')
 
 class CustomLoggerAdapter(logging.LoggerAdapter):
     """

omnata_plugin_runtime/omnata_plugin.py

@@ -47,7 +47,7 @@ from snowflake.snowpark import Session
 from snowflake.snowpark.functions import col
 from tenacity import Retrying, stop_after_attempt, wait_fixed, retry_if_exception_message
 
-from .logging import OmnataPluginLogHandler
+from .logging import OmnataPluginLogHandler, logger, tracer
 
 from .api import (
     PluginMessage,
@@ -88,7 +88,6 @@ from .rate_limiting import (
     RateLimitedSession
 )
 
-logger = getLogger(__name__)
 SortDirectionType = Literal["asc", "desc"]
 
 
@@ -810,22 +809,23 @@ class OutboundSyncRequest(SyncRequest):
         logger.debug("applying results to table")
         # use a random table name with a random string to avoid collisions
         with self._snowflake_query_lock:
-            for attempt in Retrying(stop=stop_after_attempt(30),wait=wait_fixed(2),reraise=True,retry=retry_if_exception_message(match=".*(is being|was) committed.*")):
-                with attempt:
-                    success, nchunks, nrows, _ = write_pandas(
-                        conn=self._session._conn._cursor.connection,  # pylint: disable=protected-access
-                        df=self._preprocess_results_dataframe(results_df),
-                        quote_identifiers=False,
-                        table_name=self._full_results_table_name,
-                        auto_create_table=False
-                    )
-                    if not success:
-                        raise ValueError(
-                            f"Failed to write results to table {self._full_results_table_name}"
+            with tracer.start_as_current_span("apply_results"):
+                for attempt in Retrying(stop=stop_after_attempt(30),wait=wait_fixed(2),reraise=True,retry=retry_if_exception_message(match=".*(is being|was) committed.*")):
+                    with attempt:
+                        success, nchunks, nrows, _ = write_pandas(
+                            conn=self._session._conn._cursor.connection,  # pylint: disable=protected-access
+                            df=self._preprocess_results_dataframe(results_df),
+                            quote_identifiers=False,
+                            table_name=self._full_results_table_name,
+                            auto_create_table=False
+                        )
+                        if not success:
+                            raise ValueError(
+                                f"Failed to write results to table {self._full_results_table_name}"
+                            )
+                        logger.debug(
+                            f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}"
                         )
-                    logger.debug(
-                        f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}"
-                    )
 
     def __dataframe_wrapper(
         self, data_frame: pandas.DataFrame, render_jinja: bool = True
@@ -1465,36 +1465,37 @@ class InboundSyncRequest(SyncRequest):
         """
         if len(results_df) > 0:
             with self._snowflake_query_lock:
-                for attempt in Retrying(stop=stop_after_attempt(30),wait=wait_fixed(2),reraise=True,retry=retry_if_exception_message(match=".*(is being|was) committed.*")):
-                    with attempt:
-                        logger.debug(
-                            f"Applying {len(results_df)} results to {self._full_results_table_name}"
-                        )
-                        # try setting parquet engine here, since the engine parameter does not seem to make it through to the write_pandas function
-                        success, nchunks, nrows, _ = write_pandas(
-                            conn=self._session._conn._cursor.connection,  # pylint: disable=protected-access
-                            df=results_df,
-                            table_name=self._full_results_table_name,
-                            quote_identifiers=False,  # already done in get_temp_table_name
-                            # schema='INBOUND_RAW', # it seems to be ok to provide schema in the table name
-                            table_type="transient"
-                        )
-                        if not success:
-                            raise ValueError(
-                                f"Failed to write results to table {self._full_results_table_name}"
+                with tracer.start_as_current_span("apply_results"):
+                    for attempt in Retrying(stop=stop_after_attempt(30),wait=wait_fixed(2),reraise=True,retry=retry_if_exception_message(match=".*(is being|was) committed.*")):
+                        with attempt:
+                            logger.debug(
+                                f"Applying {len(results_df)} results to {self._full_results_table_name}"
                             )
-                        logger.debug(
-                            f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}"
-                        )
-                        # temp tables aren't allowed
-                        # snowflake_df = self._session.create_dataframe(results_df)
-                        # snowflake_df.write.save_as_table(table_name=temp_table,
-                        #                                mode='append',
-                        #                                column_order='index',
-                        #                                #create_temp_table=True
-                        #                                )
-                        for stream_name in stream_names:
-                            self._results_exist[stream_name] = True
+                            # try setting parquet engine here, since the engine parameter does not seem to make it through to the write_pandas function
+                            success, nchunks, nrows, _ = write_pandas(
+                                conn=self._session._conn._cursor.connection,  # pylint: disable=protected-access
+                                df=results_df,
+                                table_name=self._full_results_table_name,
+                                quote_identifiers=False,  # already done in get_temp_table_name
+                                # schema='INBOUND_RAW', # it seems to be ok to provide schema in the table name
+                                table_type="transient"
+                            )
+                            if not success:
+                                raise ValueError(
+                                    f"Failed to write results to table {self._full_results_table_name}"
+                                )
+                            logger.debug(
+                                f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}"
+                            )
+                            # temp tables aren't allowed
+                            # snowflake_df = self._session.create_dataframe(results_df)
+                            # snowflake_df.write.save_as_table(table_name=temp_table,
+                            #                                mode='append',
+                            #                                column_order='index',
+                            #                                #create_temp_table=True
+                            #                                )
+                            for stream_name in stream_names:
+                                self._results_exist[stream_name] = True
         else:
             logger.debug("Results dataframe is empty, not applying")
 
@@ -2137,14 +2138,16 @@ def __managed_inbound_processing_worker(
             logger.debug(f"stream returned from queue: {stream}")
             # restore the first argument, was originally the dataframe/generator but now it's the appropriately sized dataframe
             try:
-                logger.debug(f"worker {worker_index} processing stream {stream.stream_name}, invoking plugin class method {method.__name__}")
-                result = method(plugin_class_obj, *(stream, *method_args), **method_kwargs)
-                logger.debug(f"worker {worker_index} completed processing stream {stream.stream_name}")
-                if result is not None and result is False:
-                    logger.info(f"worker {worker_index} requested that {stream.stream_name} be not marked as complete")
-                else:
-                    logger.info(f"worker {worker_index} marking stream {stream.stream_name} as complete")
-                    plugin_class_obj._sync_request.mark_stream_complete(stream.stream_name)
+                with tracer.start_as_current_span("managed_inbound_processing") as managed_inbound_processing_span:
+                    logger.debug(f"worker {worker_index} processing stream {stream.stream_name}, invoking plugin class method {method.__name__}")
+                    managed_inbound_processing_span.set_attribute("stream_name", stream.stream_name)
+                    result = method(plugin_class_obj, *(stream, *method_args), **method_kwargs)
+                    logger.debug(f"worker {worker_index} completed processing stream {stream.stream_name}")
+                    if result is not None and result is False:
+                        logger.info(f"worker {worker_index} requested that {stream.stream_name} be not marked as complete")
+                    else:
+                        logger.info(f"worker {worker_index} marking stream {stream.stream_name} as complete")
+                        plugin_class_obj._sync_request.mark_stream_complete(stream.stream_name)
             except InterruptedWhileWaitingException:
                 # If an inbound run is cancelled while waiting for rate limiting, this should mean that
                 # the cancellation is handled elsewhere, so we don't need to do anything special here other than stop waiting

omnata_plugin_runtime/plugin_entrypoints.py

@@ -24,7 +24,7 @@ from .configuration import (
     ConnectivityOption
 )
 from .forms import ConnectionMethod, FormInputField, FormOption
-from .logging import OmnataPluginLogHandler, logger
+from .logging import OmnataPluginLogHandler, logger, tracer
 from .omnata_plugin import (
     SnowflakeBillingEvent,
     BillingEventRequest,
@@ -39,7 +39,6 @@ from .rate_limiting import ApiLimits, RateLimitState
 from opentelemetry import trace
 
 IMPORT_DIRECTORY_NAME = "snowflake_import_directory"
-tracer = trace.get_tracer(__name__)
 
 class PluginEntrypoint:
     """

{omnata_plugin_runtime-0.8.0a193.dist-info → omnata_plugin_runtime-0.8.0a195.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.8.0a193
+Version: 0.8.0a195
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com

omnata_plugin_runtime-0.8.0a195.dist-info/RECORD

@@ -0,0 +1,12 @@
+omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
+omnata_plugin_runtime/api.py,sha256=tVi4KLL0v5N3yz3Ie0kSyFemryu572gCbtSRfWN6wBU,6523
+omnata_plugin_runtime/configuration.py,sha256=6JmgE4SL3F5cGlDYqt17A1vTFu6nB74yWgEpQ5qV9ho,38380
+omnata_plugin_runtime/forms.py,sha256=ueodN2GIMS5N9fqebpY4uNGJnjEb9HcuaVQVfWH-cGg,19838
+omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
+omnata_plugin_runtime/omnata_plugin.py,sha256=ZMoF5ef9GT0ri8nof_3JaJT4dTQ9oDRf22zw-5UryjI,130600
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=3nqIWOlUdNVkBu7YBqC73Gb5G_xvMUzmlZf838N0JSg,32728
+omnata_plugin_runtime/rate_limiting.py,sha256=6fn_h2vxcHbqqiW-OZ6FKfNYv_XlNvorsrCknVce2PA,25929
+omnata_plugin_runtime-0.8.0a195.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.8.0a195.dist-info/METADATA,sha256=JW6TXPXIu60cr3BLAydTSegpjml5vFKFJQuRWZbmP8M,2148
+omnata_plugin_runtime-0.8.0a195.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+omnata_plugin_runtime-0.8.0a195.dist-info/RECORD,,

omnata_plugin_runtime-0.8.0a193.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
-omnata_plugin_runtime/api.py,sha256=tVi4KLL0v5N3yz3Ie0kSyFemryu572gCbtSRfWN6wBU,6523
-omnata_plugin_runtime/configuration.py,sha256=uMGMqKYy4XmntX1ROungUwTJXeY2ciczAb_PtRCFZZI,38441
-omnata_plugin_runtime/forms.py,sha256=ueodN2GIMS5N9fqebpY4uNGJnjEb9HcuaVQVfWH-cGg,19838
-omnata_plugin_runtime/logging.py,sha256=-8BqjgIOhmAFlHz0U_n4YPPme_YvjXyFDjtpbkbS9c8,4410
-omnata_plugin_runtime/omnata_plugin.py,sha256=aggjb_CTTjhgqjS8CHPOm4ENU0jNcYoT6LC8yI1IeF4,130048
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=LZHwOsacZmS6JtzNM3OsLvpYyVo_UP0DaCWDWDxrJ0w,32756
-omnata_plugin_runtime/rate_limiting.py,sha256=6fn_h2vxcHbqqiW-OZ6FKfNYv_XlNvorsrCknVce2PA,25929
-omnata_plugin_runtime-0.8.0a193.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.8.0a193.dist-info/METADATA,sha256=oMhjg3-Ms9WMHfnSk-IMhpUDbdNOvPhy2gVd0OHYTgE,2148
-omnata_plugin_runtime-0.8.0a193.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-omnata_plugin_runtime-0.8.0a193.dist-info/RECORD,,